[chore]: enable gofumpt linter in connector, consumer, exporter, exte…

…nsion and featuregate (open-telemetry#11854) #### Description [gofumpt](https://golangci-lint.run/usage/linters/#gofumpt) is a stricter format than gofmt, while being backwards compatible. Signed-off-by: Matthieu MOREL <[email protected]>
fidelity-contributions · Dec 12, 2024 · 0b97830 · 0b97830
1 parent 824c9f7
commit 0b97830
Show file tree

Hide file tree

Showing 39 changed files with 139 additions and 86 deletions.
diff --git a/connector/connector_test.go b/connector/connector_test.go
@@ -228,29 +228,35 @@ type nopConnector struct {
 func createTracesToTraces(context.Context, Settings, component.Config, consumer.Traces) (Traces, error) {
 	return nopInstance, nil
 }
+
 func createTracesToMetrics(context.Context, Settings, component.Config, consumer.Metrics) (Traces, error) {
 	return nopInstance, nil
 }
+
 func createTracesToLogs(context.Context, Settings, component.Config, consumer.Logs) (Traces, error) {
 	return nopInstance, nil
 }
 
 func createMetricsToTraces(context.Context, Settings, component.Config, consumer.Traces) (Metrics, error) {
 	return nopInstance, nil
 }
+
 func createMetricsToMetrics(context.Context, Settings, component.Config, consumer.Metrics) (Metrics, error) {
 	return nopInstance, nil
 }
+
 func createMetricsToLogs(context.Context, Settings, component.Config, consumer.Logs) (Metrics, error) {
 	return nopInstance, nil
 }
 
 func createLogsToTraces(context.Context, Settings, component.Config, consumer.Traces) (Logs, error) {
 	return nopInstance, nil
 }
+
 func createLogsToMetrics(context.Context, Settings, component.Config, consumer.Metrics) (Logs, error) {
 	return nopInstance, nil
 }
+
 func createLogsToLogs(context.Context, Settings, component.Config, consumer.Logs) (Logs, error) {
 	return nopInstance, nil
 }
diff --git a/connector/connectorprofiles/connector_test.go b/connector/connectorprofiles/connector_test.go
@@ -138,9 +138,11 @@ func createProfilesToProfiles(context.Context, connector.Settings, component.Con
 func createProfilesToTraces(context.Context, connector.Settings, component.Config, consumer.Traces) (Profiles, error) {
 	return nopInstance, nil
 }
+
 func createProfilesToMetrics(context.Context, connector.Settings, component.Config, consumer.Metrics) (Profiles, error) {
 	return nopInstance, nil
 }
+
 func createProfilesToLogs(context.Context, connector.Settings, component.Config, consumer.Logs) (Profiles, error) {
 	return nopInstance, nil
 }
diff --git a/connector/connectorprofiles/profiles_router_test.go b/connector/connectorprofiles/profiles_router_test.go
@@ -30,7 +30,7 @@ func (mts *mutatingProfilesSink) Capabilities() consumer.Capabilities {
 }
 
 func TestProfilesRouterMultiplexing(t *testing.T) {
-	var num = 20
+	num := 20
 	for numIDs := 1; numIDs < num; numIDs++ {
 		for numCons := 1; numCons < num; numCons++ {
 			for numProfiles := 1; numProfiles < num; numProfiles++ {

diff --git a/connector/connectortest/connector.go b/connector/connectortest/connector.go
@@ -83,6 +83,7 @@ func createMetricsToMetricsConnector(context.Context, connector.Settings, compon
 func createMetricsToLogsConnector(context.Context, connector.Settings, component.Config, consumer.Logs) (connector.Metrics, error) {
 	return &nopConnector{Consumer: consumertest.NewNop()}, nil
 }
+
 func createMetricsToProfilesConnector(context.Context, connector.Settings, component.Config, consumerprofiles.Profiles) (connector.Metrics, error) {
 	return &nopConnector{Consumer: consumertest.NewNop()}, nil
 }
@@ -98,6 +99,7 @@ func createLogsToMetricsConnector(context.Context, connector.Settings, component
 func createLogsToLogsConnector(context.Context, connector.Settings, component.Config, consumer.Logs) (connector.Logs, error) {
 	return &nopConnector{Consumer: consumertest.NewNop()}, nil
 }
+
 func createLogsToProfilesConnector(context.Context, connector.Settings, component.Config, consumerprofiles.Profiles) (connector.Logs, error) {
 	return &nopConnector{Consumer: consumertest.NewNop()}, nil
 }
@@ -113,6 +115,7 @@ func createProfilesToMetricsConnector(context.Context, connector.Settings, compo
 func createProfilesToLogsConnector(context.Context, connector.Settings, component.Config, consumer.Logs) (connectorprofiles.Profiles, error) {
 	return &nopConnector{Consumer: consumertest.NewNop()}, nil
 }
+
 func createProfilesToProfilesConnector(context.Context, connector.Settings, component.Config, consumerprofiles.Profiles) (connectorprofiles.Profiles, error) {
 	return &nopConnector{Consumer: consumertest.NewNop()}, nil
 }

diff --git a/connector/logs_router_test.go b/connector/logs_router_test.go
@@ -28,7 +28,7 @@ func (mts *mutatingLogsSink) Capabilities() consumer.Capabilities {
 }
 
 func TestLogsRouterMultiplexing(t *testing.T) {
-	var num = 20
+	num := 20
 	for numIDs := 1; numIDs < num; numIDs++ {
 		for numCons := 1; numCons < num; numCons++ {
 			for numLogs := 1; numLogs < num; numLogs++ {

diff --git a/connector/metrics_router_test.go b/connector/metrics_router_test.go
@@ -28,7 +28,7 @@ func (mts *mutatingMetricsSink) Capabilities() consumer.Capabilities {
 }
 
 func TestMetricsRouterMultiplexing(t *testing.T) {
-	var num = 20
+	num := 20
 	for numIDs := 1; numIDs < num; numIDs++ {
 		for numCons := 1; numCons < num; numCons++ {
 			for numMetrics := 1; numMetrics < num; numMetrics++ {

diff --git a/connector/traces_router_test.go b/connector/traces_router_test.go
@@ -28,7 +28,7 @@ func (mts *mutatingTracesSink) Capabilities() consumer.Capabilities {
 }
 
 func TestTracesRouterMultiplexing(t *testing.T) {
-	var num = 20
+	num := 20
 	for numIDs := 1; numIDs < num; numIDs++ {
 		for numCons := 1; numCons < num; numCons++ {
 			for numTraces := 1; numTraces < num; numTraces++ {

diff --git a/consumer/consumertest/consumer.go b/consumer/consumertest/consumer.go
@@ -37,10 +37,12 @@ type Consumer interface {
 	unexported()
 }
 
-var _ consumer.Logs = (Consumer)(nil)
-var _ consumer.Metrics = (Consumer)(nil)
-var _ consumer.Traces = (Consumer)(nil)
-var _ consumerprofiles.Profiles = (Consumer)(nil)
+var (
+	_ consumer.Logs             = (Consumer)(nil)
+	_ consumer.Metrics          = (Consumer)(nil)
+	_ consumer.Traces           = (Consumer)(nil)
+	_ consumerprofiles.Profiles = (Consumer)(nil)
+)
 
 type nonMutatingConsumer struct{}
 

diff --git a/exporter/debugexporter/config.go b/exporter/debugexporter/config.go
@@ -10,15 +10,13 @@ import (
 	"go.opentelemetry.io/collector/config/configtelemetry"
 )
 
-var (
-	// supportedLevels in this exporter's configuration.
-	// configtelemetry.LevelNone and other future values are not supported.
-	supportedLevels map[configtelemetry.Level]struct{} = map[configtelemetry.Level]struct{}{
-		configtelemetry.LevelBasic:    {},
-		configtelemetry.LevelNormal:   {},
-		configtelemetry.LevelDetailed: {},
-	}
-)
+// supportedLevels in this exporter's configuration.
+// configtelemetry.LevelNone and other future values are not supported.
+var supportedLevels map[configtelemetry.Level]struct{} = map[configtelemetry.Level]struct{}{
+	configtelemetry.LevelBasic:    {},
+	configtelemetry.LevelNormal:   {},
+	configtelemetry.LevelDetailed: {},
+}
 
 // Config defines configuration for debug exporter.
 type Config struct {

diff --git a/exporter/exporter_test.go b/exporter/exporter_test.go
@@ -16,7 +16,7 @@ import (
 )
 
 func TestNewFactory(t *testing.T) {
-	var testType = component.MustNewType("test")
+	testType := component.MustNewType("test")
 	defaultCfg := struct{}{}
 	f := NewFactory(
 		testType,
@@ -32,7 +32,7 @@ func TestNewFactory(t *testing.T) {
 }
 
 func TestNewFactoryWithOptions(t *testing.T) {
-	var testType = component.MustNewType("test")
+	testType := component.MustNewType("test")
 	defaultCfg := struct{}{}
 	f := NewFactory(
 		testType,

diff --git a/exporter/exporterhelper/exporterhelperprofiles/profiles.go b/exporter/exporterhelper/exporterhelperprofiles/profiles.go
@@ -22,8 +22,10 @@ import (
 	"go.opentelemetry.io/collector/pipeline/pipelineprofiles"
 )
 
-var profilesMarshaler = &pprofile.ProtoMarshaler{}
-var profilesUnmarshaler = &pprofile.ProtoUnmarshaler{}
+var (
+	profilesMarshaler   = &pprofile.ProtoMarshaler{}
+	profilesUnmarshaler = &pprofile.ProtoUnmarshaler{}
+)
 
 type profilesRequest struct {
 	pd     pprofile.Profiles

diff --git a/exporter/exporterhelper/exporterhelperprofiles/profiles_batch_test.go b/exporter/exporterhelper/exporterhelperprofiles/profiles_batch_test.go
@@ -144,8 +144,7 @@ func TestExtractProfiles(t *testing.T) {
 }
 
 // dummyRequest implements Request. It is for checking that merging two request types would fail
-type dummyRequest struct {
-}
+type dummyRequest struct{}
 
 func (req *dummyRequest) Export(_ context.Context) error {
 	return nil
@@ -160,6 +159,7 @@ func (req *dummyRequest) Merge(_ context.Context, _ exporterhelper.Request) (exp
 }
 
 func (req *dummyRequest) MergeSplit(_ context.Context, _ exporterbatcher.MaxSizeConfig, _ exporterhelper.Request) (
-	[]exporterhelper.Request, error) {
+	[]exporterhelper.Request, error,
+) {
 	return nil, nil
 }
diff --git a/exporter/exporterhelper/exporterhelperprofiles/profiles_test.go b/exporter/exporterhelper/exporterhelperprofiles/profiles_test.go
@@ -40,9 +40,7 @@ const (
 	fakeProfilesParentSpanName = "fake_profiles_parent_span_name"
 )
 
-var (
-	fakeProfilesExporterConfig = struct{}{}
-)
+var fakeProfilesExporterConfig = struct{}{}
 
 func TestProfilesRequest(t *testing.T) {
 	lr := newProfilesRequest(testdata.GenerateProfiles(1), nil)
@@ -301,8 +299,10 @@ func generateProfilesTraffic(t *testing.T, tracer trace.Tracer, le exporterprofi
 	}
 }
 
+// nolint: unparam
 func checkWrapSpanForProfilesExporter(t *testing.T, sr *tracetest.SpanRecorder, tracer trace.Tracer, le exporterprofiles.Profiles,
-	wantError error, numSampleRecords int64) { // nolint: unparam
+	wantError error, numSampleRecords int64,
+) {
 	const numRequests = 5
 	generateProfilesTraffic(t, tracer, le, numRequests, wantError)
 

diff --git a/exporter/exporterhelper/internal/batch_sender_test.go b/exporter/exporterhelper/internal/batch_sender_test.go
@@ -49,7 +49,8 @@ func TestBatchSender_Merge(t *testing.T) {
 	runTest := func(testName string, enableQueueBatcher bool, tt struct {
 		name          string
 		batcherOption Option
-	}) {
+	},
+	) {
 		t.Run(testName, func(t *testing.T) {
 			resetFeatureGate := setFeatureGateForTest(t, usePullingBasedExporterQueueBatcher, enableQueueBatcher)
 			be := queueBatchExporter(t, tt.batcherOption)
@@ -78,8 +79,10 @@ func TestBatchSender_Merge(t *testing.T) {
 			time.Sleep(50 * time.Millisecond)
 
 			// should be ignored because of the merge error.
-			require.NoError(t, be.Send(context.Background(), &fakeRequest{items: 3, sink: sink,
-				mergeErr: errors.New("merge error")}))
+			require.NoError(t, be.Send(context.Background(), &fakeRequest{
+				items: 3, sink: sink,
+				mergeErr: errors.New("merge error"),
+			}))
 
 			assert.Equal(t, int64(1), sink.requestsCount.Load())
 			assert.Eventually(t, func() bool {
@@ -130,7 +133,8 @@ func TestBatchSender_BatchExportError(t *testing.T) {
 		batcherOption    Option
 		expectedRequests int64
 		expectedItems    int64
-	}) {
+	},
+	) {
 		t.Run(testName, func(t *testing.T) {
 			resetFeatureGate := setFeatureGateForTest(t, usePullingBasedExporterQueueBatcher, enableQueueBatcher)
 			be := queueBatchExporter(t, tt.batcherOption)
@@ -200,8 +204,10 @@ func TestBatchSender_MergeOrSplit(t *testing.T) {
 			}, 50*time.Millisecond, 10*time.Millisecond)
 
 			// request that cannot be split should be dropped.
-			require.NoError(t, be.Send(context.Background(), &fakeRequest{items: 11, sink: sink,
-				mergeErr: errors.New("split error")}))
+			require.NoError(t, be.Send(context.Background(), &fakeRequest{
+				items: 11, sink: sink,
+				mergeErr: errors.New("split error"),
+			}))
 
 			// big request should be broken down into two requests, both are sent right away.
 			require.NoError(t, be.Send(context.Background(), &fakeRequest{items: 13, sink: sink}))

diff --git a/exporter/exporterhelper/internal/queue_sender.go b/exporter/exporterhelper/internal/queue_sender.go
@@ -86,7 +86,8 @@ func NewQueueSender(
 	numConsumers int,
 	exportFailureMessage string,
 	obsrep *ObsReport,
-	batcherCfg exporterbatcher.Config) *QueueSender {
+	batcherCfg exporterbatcher.Config,
+) *QueueSender {
 	qs := &QueueSender{
 		queue:          q,
 		numConsumers:   numConsumers,

diff --git a/exporter/exporterhelper/internal/queue_sender_test.go b/exporter/exporterhelper/internal/queue_sender_test.go
@@ -192,7 +192,8 @@ func TestQueuedRetryHappyPath(t *testing.T) {
 	runTest := func(testName string, enableQueueBatcher bool, tt struct {
 		name         string
 		queueOptions []Option
-	}) {
+	},
+	) {
 		t.Run(testName, func(t *testing.T) {
 			resetFeatureGate := setFeatureGateForTest(t, usePullingBasedExporterQueueBatcher, enableQueueBatcher)
 			tel, err := componenttest.SetupTelemetry(defaultID)
@@ -361,7 +362,8 @@ func TestQueueRetryWithDisabledQueue(t *testing.T) {
 	runTest := func(testName string, enableQueueBatcher bool, tt struct {
 		name         string
 		queueOptions []Option
-	}) {
+	},
+	) {
 		t.Run(testName, func(t *testing.T) {
 			defer setFeatureGateForTest(t, usePullingBasedExporterQueueBatcher, enableQueueBatcher)
 			set := exportertest.NewNopSettings()
@@ -432,7 +434,7 @@ func TestQueuedRetryPersistenceEnabled(t *testing.T) {
 				WithRetry(rCfg), WithQueue(qCfg))
 			require.NoError(t, err)
 
-			var extensions = map[component.ID]component.Component{
+			extensions := map[component.ID]component.Component{
 				storageID: queue.NewMockStorageExtension(nil),
 			}
 			host := &MockHost{Ext: extensions}
@@ -465,7 +467,7 @@ func TestQueuedRetryPersistenceEnabledStorageError(t *testing.T) {
 				WithUnmarshaler(mockRequestUnmarshaler(&mockRequest{})), WithRetry(rCfg), WithQueue(qCfg))
 			require.NoError(t, err)
 
-			var extensions = map[component.ID]component.Component{
+			extensions := map[component.ID]component.Component{
 				storageID: queue.NewMockStorageExtension(storageError),
 			}
 			host := &MockHost{Ext: extensions}
@@ -497,7 +499,7 @@ func TestQueuedRetryPersistentEnabled_NoDataLossOnShutdown(t *testing.T) {
 				WithUnmarshaler(mockRequestUnmarshaler(mockReq)), WithRetry(rCfg), WithQueue(qCfg))
 			require.NoError(t, err)
 
-			var extensions = map[component.ID]component.Component{
+			extensions := map[component.ID]component.Component{
 				storageID: queue.NewMockStorageExtension(nil),
 			}
 			host := &MockHost{Ext: extensions}

diff --git a/exporter/exporterhelper/internal/request.go b/exporter/exporterhelper/internal/request.go
@@ -57,7 +57,8 @@ func (r *fakeRequest) ItemsCount() int {
 }
 
 func (r *fakeRequest) Merge(_ context.Context,
-	r2 internal.Request) (internal.Request, error) {
+	r2 internal.Request,
+) (internal.Request, error) {
 	if r == nil {
 		return r2, nil
 	}
@@ -74,7 +75,8 @@ func (r *fakeRequest) Merge(_ context.Context,
 }
 
 func (r *fakeRequest) MergeSplit(ctx context.Context, cfg exporterbatcher.MaxSizeConfig,
-	r2 internal.Request) ([]internal.Request, error) {
+	r2 internal.Request,
+) ([]internal.Request, error) {
 	if r.mergeErr != nil {
 		return nil, r.mergeErr
 	}

diff --git a/exporter/exporterhelper/logs.go b/exporter/exporterhelper/logs.go
@@ -20,8 +20,10 @@ import (
 	"go.opentelemetry.io/collector/pipeline"
 )
 
-var logsMarshaler = &plog.ProtoMarshaler{}
-var logsUnmarshaler = &plog.ProtoUnmarshaler{}
+var (
+	logsMarshaler   = &plog.ProtoMarshaler{}
+	logsUnmarshaler = &plog.ProtoUnmarshaler{}
+)
 
 type logsRequest struct {
 	ld     plog.Logs

diff --git a/exporter/exporterhelper/logs_test.go b/exporter/exporterhelper/logs_test.go
@@ -413,8 +413,10 @@ func generateLogsTraffic(t *testing.T, tracer trace.Tracer, le exporter.Logs, nu
 	}
 }
 
+// nolint: unparam
 func checkWrapSpanForLogs(t *testing.T, sr *tracetest.SpanRecorder, tracer trace.Tracer, le exporter.Logs,
-	wantError error, numLogRecords int64) { // nolint: unparam
+	wantError error, numLogRecords int64,
+) {
 	const numRequests = 5
 	generateLogsTraffic(t, tracer, le, numRequests, wantError)
 

diff --git a/exporter/exporterhelper/metrics.go b/exporter/exporterhelper/metrics.go
@@ -20,8 +20,10 @@ import (
 	"go.opentelemetry.io/collector/pipeline"
 )
 
-var metricsMarshaler = &pmetric.ProtoMarshaler{}
-var metricsUnmarshaler = &pmetric.ProtoUnmarshaler{}
+var (
+	metricsMarshaler   = &pmetric.ProtoMarshaler{}
+	metricsUnmarshaler = &pmetric.ProtoUnmarshaler{}
+)
 
 type metricsRequest struct {
 	md     pmetric.Metrics