[chore]: fix staticcheck rules (connector) (#39191)

mmorel-35 · web-flow · commit 140edfbf47a7 · 2025-04-07T08:21:06.000-07:00
#### Description

This fixes staticcheck issues in connector discovered after
golangci-lint@v2 upgrade

Signed-off-by: Matthieu MOREL &lt;matthieu.morel35@gmail.com&gt;
diff --git a/connector/datadogconnector/connector_native_test.go b/connector/datadogconnector/connector_native_test.go
@@ -102,10 +102,7 @@ func TestContainerTagsNative(t *testing.T) {
 	err = connector.ConsumeTraces(context.Background(), trace2)
 	assert.NoError(t, err)
 
-	for {
-		if len(metricsSink.AllMetrics()) > 0 {
-			break
-		}
+	for len(metricsSink.AllMetrics()) == 0 {
 		time.Sleep(100 * time.Millisecond)
 	}
 
diff --git a/connector/datadogconnector/connector_test.go b/connector/datadogconnector/connector_test.go
@@ -169,10 +169,7 @@ func TestContainerTags(t *testing.T) {
 	})
 	assert.Equal(t, 3, count)
 
-	for {
-		if len(metricsSink.AllMetrics()) > 0 {
-			break
-		}
+	for len(metricsSink.AllMetrics()) == 0 {
 		time.Sleep(100 * time.Millisecond)
 	}
 
@@ -228,10 +225,7 @@ func testReceiveResourceSpansV2(t *testing.T, enableReceiveResourceSpansV2 bool)
 	err = connector.ConsumeTraces(context.Background(), trace)
 	assert.NoError(t, err)
 
-	for {
-		if len(metricsSink.AllMetrics()) > 0 {
-			break
-		}
+	for len(metricsSink.AllMetrics()) == 0 {
 		time.Sleep(100 * time.Millisecond)
 	}
 
@@ -287,10 +281,7 @@ func testOperationAndResourceNameV2(t *testing.T, enableOperationAndResourceName
 	err = connector.ConsumeTraces(context.Background(), trace)
 	assert.NoError(t, err)
 
-	for {
-		if len(metricsSink.AllMetrics()) > 0 {
-			break
-		}
+	for len(metricsSink.AllMetrics()) == 0 {
 		time.Sleep(100 * time.Millisecond)
 	}
 
diff --git a/connector/failoverconnector/logs.go b/connector/failoverconnector/logs.go
@@ -109,6 +109,6 @@ func newLogsToLogs(set connector.Settings, cfg component.Config, logs consumer.L
 	return &logsFailover{
 		config:   config,
 		failover: failover,
-		logger:   set.TelemetrySettings.Logger,
+		logger:   set.Logger,
 	}, nil
 }
diff --git a/connector/failoverconnector/metrics.go b/connector/failoverconnector/metrics.go
@@ -109,6 +109,6 @@ func newMetricsToMetrics(set connector.Settings, cfg component.Config, metrics c
 	return &metricsFailover{
 		config:   config,
 		failover: failover,
-		logger:   set.TelemetrySettings.Logger,
+		logger:   set.Logger,
 	}, nil
 }
diff --git a/connector/failoverconnector/traces.go b/connector/failoverconnector/traces.go
@@ -110,6 +110,6 @@ func newTracesToTraces(set connector.Settings, cfg component.Config, traces cons
 	return &tracesFailover{
 		config:   config,
 		failover: failover,
-		logger:   set.TelemetrySettings.Logger,
+		logger:   set.Logger,
 	}, nil
 }
diff --git a/connector/otlpjsonconnector/logs.go b/connector/otlpjsonconnector/logs.go
@@ -24,12 +24,12 @@ type connectorLogs struct {
 
 // newLogsConnector is a function to create a new connector for logs extraction
 func newLogsConnector(set connector.Settings, config component.Config, logsConsumer consumer.Logs) *connectorLogs {
-	set.TelemetrySettings.Logger.Info("Building otlpjson connector for logs")
+	set.Logger.Info("Building otlpjson connector for logs")
 	cfg := config.(*Config)
 
 	return &connectorLogs{
 		config:       *cfg,
-		logger:       set.TelemetrySettings.Logger,
+		logger:       set.Logger,
 		logsConsumer: logsConsumer,
 	}
 }
diff --git a/connector/otlpjsonconnector/metrics.go b/connector/otlpjsonconnector/metrics.go
@@ -25,12 +25,12 @@ type connectorMetrics struct {
 
 // newMetricsConnector is a function to create a new connector for metrics extraction
 func newMetricsConnector(set connector.Settings, config component.Config, metricsConsumer consumer.Metrics) *connectorMetrics {
-	set.TelemetrySettings.Logger.Info("Building otlpjson connector for metrics")
+	set.Logger.Info("Building otlpjson connector for metrics")
 	cfg := config.(*Config)
 
 	return &connectorMetrics{
 		config:          *cfg,
-		logger:          set.TelemetrySettings.Logger,
+		logger:          set.Logger,
 		metricsConsumer: metricsConsumer,
 	}
 }
diff --git a/connector/otlpjsonconnector/traces.go b/connector/otlpjsonconnector/traces.go
@@ -25,12 +25,12 @@ type connectorTraces struct {
 
 // newTracesConnector is a function to create a new connector for traces extraction
 func newTracesConnector(set connector.Settings, config component.Config, tracesConsumer consumer.Traces) *connectorTraces {
-	set.TelemetrySettings.Logger.Info("Building otlpjson connector for traces")
+	set.Logger.Info("Building otlpjson connector for traces")
 	cfg := config.(*Config)
 
 	return &connectorTraces{
 		config:         *cfg,
-		logger:         set.TelemetrySettings.Logger,
+		logger:         set.Logger,
 		tracesConsumer: tracesConsumer,
 	}
 }
diff --git a/connector/routingconnector/logs.go b/connector/routingconnector/logs.go
@@ -49,7 +49,7 @@ func newLogsConnector(
 	}
 
 	return &logsConnector{
-		logger: set.TelemetrySettings.Logger,
+		logger: set.Logger,
 		config: cfg,
 		router: r,
 	}, nil
diff --git a/connector/routingconnector/metrics.go b/connector/routingconnector/metrics.go
@@ -50,7 +50,7 @@ func newMetricsConnector(
 	}
 
 	return &metricsConnector{
-		logger: set.TelemetrySettings.Logger,
+		logger: set.Logger,
 		config: cfg,
 		router: r,
 	}, nil
diff --git a/connector/routingconnector/traces.go b/connector/routingconnector/traces.go
@@ -49,7 +49,7 @@ func newTracesConnector(
 	}
 
 	return &tracesConnector{
-		logger: set.TelemetrySettings.Logger,
+		logger: set.Logger,
 		config: cfg,
 		router: r,
 	}, nil
diff --git a/connector/signaltometricsconnector/connector_test.go b/connector/signaltometricsconnector/connector_test.go
@@ -131,7 +131,7 @@ func TestConnectorWithLogs(t *testing.T) {
 func BenchmarkConnectorWithTraces(b *testing.B) {
 	factory := NewFactory()
 	settings := connectortest.NewNopSettings(metadata.Type)
-	settings.TelemetrySettings.Logger = zaptest.NewLogger(b, zaptest.Level(zapcore.DebugLevel))
+	settings.Logger = zaptest.NewLogger(b, zaptest.Level(zapcore.DebugLevel))
 	next, err := consumer.NewMetrics(func(context.Context, pmetric.Metrics) error {
 		return nil
 	})
@@ -157,7 +157,7 @@ func BenchmarkConnectorWithTraces(b *testing.B) {
 func BenchmarkConnectorWithMetrics(b *testing.B) {
 	factory := NewFactory()
 	settings := connectortest.NewNopSettings(metadata.Type)
-	settings.TelemetrySettings.Logger = zaptest.NewLogger(b, zaptest.Level(zapcore.DebugLevel))
+	settings.Logger = zaptest.NewLogger(b, zaptest.Level(zapcore.DebugLevel))
 	next, err := consumer.NewMetrics(func(context.Context, pmetric.Metrics) error {
 		return nil
 	})
@@ -183,7 +183,7 @@ func BenchmarkConnectorWithMetrics(b *testing.B) {
 func BenchmarkConnectorWithLogs(b *testing.B) {
 	factory := NewFactory()
 	settings := connectortest.NewNopSettings(metadata.Type)
-	settings.TelemetrySettings.Logger = zaptest.NewLogger(b, zaptest.Level(zapcore.DebugLevel))
+	settings.Logger = zaptest.NewLogger(b, zaptest.Level(zapcore.DebugLevel))
 	next, err := consumer.NewMetrics(func(context.Context, pmetric.Metrics) error {
 		return nil
 	})
@@ -289,8 +289,8 @@ func setupConnector(
 	t.Helper()
 	factory := NewFactory()
 	settings := connectortest.NewNopSettings(metadata.Type)
-	telemetryResource(t).CopyTo(settings.TelemetrySettings.Resource)
-	settings.TelemetrySettings.Logger = zaptest.NewLogger(t, zaptest.Level(zapcore.DebugLevel))
+	telemetryResource(t).CopyTo(settings.Resource)
+	settings.Logger = zaptest.NewLogger(t, zaptest.Level(zapcore.DebugLevel))
 
 	cfg := createDefaultConfig()
 	cm, err := confmaptest.LoadConf(filepath.Join(testFilePath, "config.yaml"))
diff --git a/connector/spanmetricsconnector/connector_test.go b/connector/spanmetricsconnector/connector_test.go
@@ -163,9 +163,10 @@ func verifyConsumeMetricsInput(tb testing.TB, input pmetric.Metrics, expectedTem
 		val, ok := rm.Resource().Attributes().Get(serviceNameKey)
 		require.True(tb, ok)
 		serviceName := val.AsString()
-		if serviceName == "service-a" {
+		switch serviceName {
+		case "service-a":
 			numDataPoints = 2
-		} else if serviceName == "service-b" {
+		case "service-b":
 			numDataPoints = 1
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,6 @@ func newLogsToLogs(set connector.Settings, cfg component.Config, logs consumer.L`
`109`	`109`	`return &logsFailover{`
`110`	`110`	`config: config,`
`111`	`111`	`failover: failover,`
`112`		`- logger: set.TelemetrySettings.Logger,`
	`112`	`+ logger: set.Logger,`
`113`	`113`	`}, nil`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,6 @@ func newMetricsToMetrics(set connector.Settings, cfg component.Config, metrics c`
`109`	`109`	`return &metricsFailover{`
`110`	`110`	`config: config,`
`111`	`111`	`failover: failover,`
`112`		`- logger: set.TelemetrySettings.Logger,`
	`112`	`+ logger: set.Logger,`
`113`	`113`	`}, nil`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,6 @@ func newTracesToTraces(set connector.Settings, cfg component.Config, traces cons`
`110`	`110`	`return &tracesFailover{`
`111`	`111`	`config: config,`
`112`	`112`	`failover: failover,`
`113`		`- logger: set.TelemetrySettings.Logger,`
	`113`	`+ logger: set.Logger,`
`114`	`114`	`}, nil`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ type connectorLogs struct {`
`24`	`24`
`25`	`25`	`// newLogsConnector is a function to create a new connector for logs extraction`
`26`	`26`	`func newLogsConnector(set connector.Settings, config component.Config, logsConsumer consumer.Logs) *connectorLogs {`
`27`		`- set.TelemetrySettings.Logger.Info("Building otlpjson connector for logs")`
	`27`	`+ set.Logger.Info("Building otlpjson connector for logs")`
`28`	`28`	`cfg := config.(*Config)`
`29`	`29`
`30`	`30`	`return &connectorLogs{`
`31`	`31`	`config: *cfg,`
`32`		`- logger: set.TelemetrySettings.Logger,`
	`32`	`+ logger: set.Logger,`
`33`	`33`	`logsConsumer: logsConsumer,`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@ type connectorMetrics struct {`
`25`	`25`
`26`	`26`	`// newMetricsConnector is a function to create a new connector for metrics extraction`
`27`	`27`	`func newMetricsConnector(set connector.Settings, config component.Config, metricsConsumer consumer.Metrics) *connectorMetrics {`
`28`		`- set.TelemetrySettings.Logger.Info("Building otlpjson connector for metrics")`
	`28`	`+ set.Logger.Info("Building otlpjson connector for metrics")`
`29`	`29`	`cfg := config.(*Config)`
`30`	`30`
`31`	`31`	`return &connectorMetrics{`
`32`	`32`	`config: *cfg,`
`33`		`- logger: set.TelemetrySettings.Logger,`
	`33`	`+ logger: set.Logger,`
`34`	`34`	`metricsConsumer: metricsConsumer,`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@ type connectorTraces struct {`
`25`	`25`
`26`	`26`	`// newTracesConnector is a function to create a new connector for traces extraction`
`27`	`27`	`func newTracesConnector(set connector.Settings, config component.Config, tracesConsumer consumer.Traces) *connectorTraces {`
`28`		`- set.TelemetrySettings.Logger.Info("Building otlpjson connector for traces")`
	`28`	`+ set.Logger.Info("Building otlpjson connector for traces")`
`29`	`29`	`cfg := config.(*Config)`
`30`	`30`
`31`	`31`	`return &connectorTraces{`
`32`	`32`	`config: *cfg,`
`33`		`- logger: set.TelemetrySettings.Logger,`
	`33`	`+ logger: set.Logger,`
`34`	`34`	`tracesConsumer: tracesConsumer,`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func newLogsConnector(`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`return &logsConnector{`
`52`		`- logger: set.TelemetrySettings.Logger,`
	`52`	`+ logger: set.Logger,`
`53`	`53`	`config: cfg,`
`54`	`54`	`router: r,`
`55`	`55`	`}, nil`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func newMetricsConnector(`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`return &metricsConnector{`
`53`		`- logger: set.TelemetrySettings.Logger,`
	`53`	`+ logger: set.Logger,`
`54`	`54`	`config: cfg,`
`55`	`55`	`router: r,`
`56`	`56`	`}, nil`