chore: lint and format OpenTelemetry code

- Fix errcheck warnings in test files (check tp.Shutdown errors)
- Fix errcheck warnings for os.Setenv/Unsetenv in tests
- Run go fmt on modified files

Co-authored-by: Ona <no-reply@ona.com>

Author: corneliusludmann

cmd/build.go

@@ -329,18 +329,18 @@ func getBuildOpts(cmd *cobra.Command) ([]leeway.BuildOption, cache.LocalCache, f
 		if os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT") == "" {
 			os.Setenv("OTEL_EXPORTER_OTLP_ENDPOINT", otelEndpoint)
 		}
-		
+
 		// Initialize tracer
 		tp, err := telemetry.InitTracer(context.Background())
 		if err != nil {
 			log.WithError(err).Warn("failed to initialize OpenTelemetry tracer")
 		} else {
 			tracerProvider = tp
-			
+
 			// Parse trace context if provided
 			traceParent, _ := cmd.Flags().GetString("trace-parent")
 			traceState, _ := cmd.Flags().GetString("trace-state")
-			
+
 			parentCtx := context.Background()
 			if traceParent != "" {
 				if err := telemetry.ValidateTraceParent(traceParent); err != nil {
@@ -354,11 +354,11 @@ func getBuildOpts(cmd *cobra.Command) ([]leeway.BuildOption, cache.LocalCache, f
 					}
 				}
 			}
-			
+
 			// Create OTel reporter
 			tracer := otel.Tracer("leeway")
 			reporter = append(reporter, leeway.NewOTelReporter(tracer, parentCtx))
-			
+
 			// Create shutdown function
 			otelShutdown = func() {
 				shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@@ -436,7 +436,7 @@ func getBuildOpts(cmd *cobra.Command) ([]leeway.BuildOption, cache.LocalCache, f
 	if otelShutdown == nil {
 		otelShutdown = func() {}
 	}
-	
+
 	return []leeway.BuildOption{
 		leeway.WithLocalCache(localCache),
 		leeway.WithRemoteCache(remoteCache),
@@ -515,7 +515,7 @@ func parseSLSAConfig(cmd *cobra.Command) (*cache.SLSAConfig, error) {
 	slsaVerificationEnabled := os.Getenv(EnvvarSLSACacheVerification) == "true"
 	slsaSourceURI := os.Getenv(EnvvarSLSASourceURI)
 	requireAttestation := os.Getenv(EnvvarSLSARequireAttestation) == "true"
-	
+
 	// CLI flags override environment variables (if cmd is provided)
 	if cmd != nil {
 		if cmd.Flags().Changed("slsa-cache-verification") {
@@ -534,17 +534,17 @@ func parseSLSAConfig(cmd *cobra.Command) (*cache.SLSAConfig, error) {
 			}
 		}
 	}
-	
+
 	// If verification is disabled, return nil
 	if !slsaVerificationEnabled {
 		return nil, nil
 	}
-	
+
 	// Validation: source URI is required when verification is enabled
 	if slsaSourceURI == "" {
 		return nil, fmt.Errorf("--slsa-source-uri is required when using --slsa-cache-verification")
 	}
-	
+
 	return &cache.SLSAConfig{
 		Verification:       true,
 		SourceURI:          slsaSourceURI,
@@ -556,19 +556,19 @@ func parseSLSAConfig(cmd *cobra.Command) (*cache.SLSAConfig, error) {
 func getRemoteCache(cmd *cobra.Command) cache.RemoteCache {
 	remoteCacheBucket := os.Getenv(EnvvarRemoteCacheBucket)
 	remoteStorage := os.Getenv(EnvvarRemoteCacheStorage)
-	
+
 	// Parse SLSA configuration
 	slsaConfig, err := parseSLSAConfig(cmd)
 	if err != nil {
 		log.Fatalf("SLSA configuration error: %v", err)
 	}
-	
+
 	if remoteCacheBucket != "" {
 		config := &cache.RemoteConfig{
 			BucketName: remoteCacheBucket,
 			SLSA:       slsaConfig,
 		}
-		
+
 		switch remoteStorage {
 		case "GCP":
 			if slsaConfig != nil && slsaConfig.Verification {

pkg/leeway/reporter.go

@@ -40,7 +40,7 @@ type Reporter interface {
 	// The root package will also be passed into PackageBuildFinished once it's been built.
 	BuildFinished(pkg *Package, err error)
 
-		// PackageBuildStarted is called when a package build actually gets underway. At this point
+	// PackageBuildStarted is called when a package build actually gets underway. At this point
 	// all transitive dependencies of the package have been built.
 	PackageBuildStarted(pkg *Package, builddir string)
 
@@ -695,13 +695,13 @@ func (sr *GitHubActionReporter) PackageBuildFinished(pkg *Package, rep *PackageB
 type OTelReporter struct {
 	NoopReporter
 
-	tracer      trace.Tracer
-	parentCtx   context.Context
-	rootCtx     context.Context
-	rootSpan    trace.Span
-	packageCtxs map[string]context.Context
+	tracer       trace.Tracer
+	parentCtx    context.Context
+	rootCtx      context.Context
+	rootSpan     trace.Span
+	packageCtxs  map[string]context.Context
 	packageSpans map[string]trace.Span
-	mu          sync.RWMutex
+	mu           sync.RWMutex
 }
 
 // NewOTelReporter creates a new OpenTelemetry reporter with the given tracer and parent context
@@ -751,10 +751,10 @@ func (r *OTelReporter) BuildStarted(pkg *Package, status map[*Package]PackageBui
 
 	// Add build status summary
 	var (
-		cached    int
-		remote    int
-		download  int
-		toBuild   int
+		cached   int
+		remote   int
+		download int
+		toBuild  int
 	)
 	for _, s := range status {
 		switch s {

pkg/leeway/reporter_otel_test.go

@@ -15,7 +15,9 @@ func TestOTelReporter_BuildLifecycle(t *testing.T) {
 	tp := trace.NewTracerProvider(
 		trace.WithSyncer(exporter),
 	)
-	defer tp.Shutdown(context.Background())
+	defer func() {
+		_ = tp.Shutdown(context.Background())
+	}()
 
 	tracer := tp.Tracer("test")
 	reporter := NewOTelReporter(tracer, context.Background())
@@ -76,7 +78,9 @@ func TestOTelReporter_PackageLifecycle(t *testing.T) {
 	tp := trace.NewTracerProvider(
 		trace.WithSyncer(exporter),
 	)
-	defer tp.Shutdown(context.Background())
+	defer func() {
+		_ = tp.Shutdown(context.Background())
+	}()
 
 	tracer := tp.Tracer("test")
 	reporter := NewOTelReporter(tracer, context.Background())
@@ -193,7 +197,9 @@ func TestOTelReporter_ConcurrentPackages(t *testing.T) {
 	tp := trace.NewTracerProvider(
 		trace.WithSyncer(exporter),
 	)
-	defer tp.Shutdown(context.Background())
+	defer func() {
+		_ = tp.Shutdown(context.Background())
+	}()
 
 	tracer := tp.Tracer("test")
 	reporter := NewOTelReporter(tracer, context.Background())
@@ -281,7 +287,9 @@ func TestOTelReporter_WithParentContext(t *testing.T) {
 	tp := trace.NewTracerProvider(
 		trace.WithSyncer(exporter),
 	)
-	defer tp.Shutdown(context.Background())
+	defer func() {
+		_ = tp.Shutdown(context.Background())
+	}()
 
 	// Create parent span
 	tracer := tp.Tracer("test")
@@ -310,7 +318,7 @@ func TestOTelReporter_WithParentContext(t *testing.T) {
 
 	reporter.BuildStarted(pkg, status)
 	reporter.BuildFinished(pkg, nil)
-	
+
 	// End parent span so it appears in exporter
 	parentSpan.End()
 

pkg/leeway/telemetry/tracer_test.go

@@ -170,9 +170,11 @@ func TestFormatTraceContext_Invalid(t *testing.T) {
 func TestInitTracer_NoEndpoint(t *testing.T) {
 	// Save and restore environment
 	oldEndpoint := os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT")
-	defer os.Setenv("OTEL_EXPORTER_OTLP_ENDPOINT", oldEndpoint)
+	defer func() {
+		_ = os.Setenv("OTEL_EXPORTER_OTLP_ENDPOINT", oldEndpoint)
+	}()
 
-	os.Unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT")
+	_ = os.Unsetenv("OTEL_EXPORTER_OTLP_ENDPOINT")
 
 	_, err := InitTracer(context.Background())
 	if err == nil {