From 0b978307c2a0bd89605584475367cea529971d08 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Thu, 12 Dec 2024 20:25:06 +0100 Subject: [PATCH] [chore]: enable gofumpt linter in connector, consumer, exporter, extension and featuregate (#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 --- connector/connector_test.go | 6 ++++++ connector/connectorprofiles/connector_test.go | 2 ++ .../connectorprofiles/profiles_router_test.go | 2 +- connector/connectortest/connector.go | 3 +++ connector/logs_router_test.go | 2 +- connector/metrics_router_test.go | 2 +- connector/traces_router_test.go | 2 +- consumer/consumertest/consumer.go | 10 ++++++---- exporter/debugexporter/config.go | 16 +++++++--------- exporter/exporter_test.go | 4 ++-- .../exporterhelperprofiles/profiles.go | 6 ++++-- .../profiles_batch_test.go | 6 +++--- .../exporterhelperprofiles/profiles_test.go | 8 ++++---- .../internal/batch_sender_test.go | 18 ++++++++++++------ .../exporterhelper/internal/queue_sender.go | 3 ++- .../internal/queue_sender_test.go | 12 +++++++----- exporter/exporterhelper/internal/request.go | 6 ++++-- exporter/exporterhelper/logs.go | 6 ++++-- exporter/exporterhelper/logs_test.go | 4 +++- exporter/exporterhelper/metrics.go | 6 ++++-- exporter/exporterhelper/metrics_test.go | 5 ++++- exporter/exporterhelper/traces.go | 6 ++++-- exporter/exporterhelper/traces_test.go | 4 +++- exporter/exporterprofiles/exporter_test.go | 2 +- exporter/exportertest/contract_checker.go | 3 ++- exporter/exportertest/mock_consumer.go | 6 ++++-- exporter/exportertest/mock_consumer_test.go | 1 + exporter/internal/queue/batcher.go | 3 ++- exporter/internal/queue/default_batcher.go | 12 ++++++++---- exporter/internal/queue/disabled_batcher.go | 3 ++- exporter/internal/queue/fake_request_test.go | 6 ++++-- .../internal/queue/persistent_queue_test.go | 16 ++++++++++------ exporter/internal/queue/queue.go | 6 ++---- exporter/otlphttpexporter/otlp_test.go | 10 ++++++---- extension/experimental/storage/storage.go | 1 - extension/extension.go | 3 ++- extension/extension_test.go | 2 +- .../zpagesextension/zpagesextension_test.go | 6 ++++-- featuregate/registry.go | 6 ++---- 39 files changed, 139 insertions(+), 86 deletions(-) diff --git a/connector/connector_test.go b/connector/connector_test.go index 6dcff6d6a9..e190f5a4c3 100644 --- a/connector/connector_test.go +++ b/connector/connector_test.go @@ -228,9 +228,11 @@ 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 } @@ -238,9 +240,11 @@ func createTracesToLogs(context.Context, Settings, component.Config, consumer.Lo 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 } @@ -248,9 +252,11 @@ func createMetricsToLogs(context.Context, Settings, component.Config, consumer.L 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 index 9e351b7f46..0a1a9851d9 100644 --- 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 index e3d7649946..68b8aa2795 100644 --- 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 index 2905ce80f7..bbedb7e262 100644 --- 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 index dd59ce5a55..4b9c0c53e5 100644 --- 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 index c0bf7eb0df..942e27d499 100644 --- 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 index 70b798c226..7438d4aa9a 100644 --- 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 index 4b699b9449..1d9d4051af 100644 --- 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 index 3ddf8434df..e9407eafd5 100644 --- 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 index 21f5479479..d363e2af66 100644 --- 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 index 069613dbed..bb6aa00de5 100644 --- 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 index 288b4c3579..96531becbe 100644 --- 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 index 3c7d74efab..da6aa3126c 100644 --- 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 index 020b2a8d16..cc9fb4f07c 100644 --- 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 index 728ad8547e..509c747115 100644 --- 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 index 112b9bcc4b..95b536cc05 100644 --- 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 index 87952c1e8f..85bbf3311b 100644 --- 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 index fc04e6d738..55652dd7b4 100644 --- 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 index 6b565fafbd..db527e1be8 100644 --- 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 index 9fc1ed3836..f84ed8c226 100644 --- 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 diff --git a/exporter/exporterhelper/metrics_test.go b/exporter/exporterhelper/metrics_test.go index 5d89c3bee6..d6d38e9a3b 100644 --- a/exporter/exporterhelper/metrics_test.go +++ b/exporter/exporterhelper/metrics_test.go @@ -387,6 +387,7 @@ func newPushMetricsData(retError error) consumer.ConsumeMetricsFunc { return retError } } + func newPushMetricsDataModifiedDownstream(retError error) consumer.ConsumeMetricsFunc { return func(_ context.Context, metric pmetric.Metrics) error { metric.ResourceMetrics().MoveAndAppendTo(pmetric.NewResourceMetricsSlice()) @@ -419,8 +420,10 @@ func generateMetricsTraffic(t *testing.T, tracer trace.Tracer, me exporter.Metri } } +// nolint: unparam func checkWrapSpanForMetrics(t *testing.T, sr *tracetest.SpanRecorder, tracer trace.Tracer, - me exporter.Metrics, wantError error, numMetricPoints int64) { // nolint: unparam + me exporter.Metrics, wantError error, numMetricPoints int64, +) { const numRequests = 5 generateMetricsTraffic(t, tracer, me, numRequests, wantError) diff --git a/exporter/exporterhelper/traces.go b/exporter/exporterhelper/traces.go index ee05a547d8..2924eea111 100644 --- a/exporter/exporterhelper/traces.go +++ b/exporter/exporterhelper/traces.go @@ -20,8 +20,10 @@ import ( "go.opentelemetry.io/collector/pipeline" ) -var tracesMarshaler = &ptrace.ProtoMarshaler{} -var tracesUnmarshaler = &ptrace.ProtoUnmarshaler{} +var ( + tracesMarshaler = &ptrace.ProtoMarshaler{} + tracesUnmarshaler = &ptrace.ProtoUnmarshaler{} +) type tracesRequest struct { td ptrace.Traces diff --git a/exporter/exporterhelper/traces_test.go b/exporter/exporterhelper/traces_test.go index 7b22e8dbbf..fe1d1390e6 100644 --- a/exporter/exporterhelper/traces_test.go +++ b/exporter/exporterhelper/traces_test.go @@ -421,8 +421,10 @@ func generateTraceTraffic(t *testing.T, tracer trace.Tracer, te exporter.Traces, } } +// nolint: unparam func checkWrapSpanForTraces(t *testing.T, sr *tracetest.SpanRecorder, tracer trace.Tracer, - te exporter.Traces, wantError error, numSpans int64) { // nolint: unparam + te exporter.Traces, wantError error, numSpans int64, +) { const numRequests = 5 generateTraceTraffic(t, tracer, te, numRequests, wantError) diff --git a/exporter/exporterprofiles/exporter_test.go b/exporter/exporterprofiles/exporter_test.go index 06b18f527d..ab30682e3a 100644 --- a/exporter/exporterprofiles/exporter_test.go +++ b/exporter/exporterprofiles/exporter_test.go @@ -15,7 +15,7 @@ import ( ) func TestNewFactoryWithProfiles(t *testing.T) { - var testType = component.MustNewType("test") + testType := component.MustNewType("test") defaultCfg := struct{}{} factory := NewFactory( testType, diff --git a/exporter/exportertest/contract_checker.go b/exporter/exportertest/contract_checker.go index ac44eedc71..d708c097a6 100644 --- a/exporter/exportertest/contract_checker.go +++ b/exporter/exportertest/contract_checker.go @@ -106,7 +106,8 @@ func checkConsumeContractScenario(t *testing.T, params CheckConsumeContractParam } func checkMetrics(t *testing.T, params CheckConsumeContractParams, mockReceiver component.Component, - mockConsumer *mockConsumer, checkIfTestPassed func(*testing.T, int, requestCounter)) { + mockConsumer *mockConsumer, checkIfTestPassed func(*testing.T, int, requestCounter), +) { ctx := context.Background() var exp exporter.Metrics var err error diff --git a/exporter/exportertest/mock_consumer.go b/exporter/exportertest/mock_consumer.go index 6781f68e78..0290ed6951 100644 --- a/exporter/exportertest/mock_consumer.go +++ b/exporter/exportertest/mock_consumer.go @@ -19,8 +19,10 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace" ) -var errNonPermanent = status.Error(codes.DeadlineExceeded, "non Permanent error") -var errPermanent = status.Error(codes.Internal, "Permanent error") +var ( + errNonPermanent = status.Error(codes.DeadlineExceeded, "non Permanent error") + errPermanent = status.Error(codes.Internal, "Permanent error") +) // // randomNonPermanentErrorConsumeDecision is a decision function that succeeds approximately // // half of the time and fails with a non-permanent error the rest of the time. diff --git a/exporter/exportertest/mock_consumer_test.go b/exporter/exportertest/mock_consumer_test.go index a5e297abf4..830813c61a 100644 --- a/exporter/exportertest/mock_consumer_test.go +++ b/exporter/exportertest/mock_consumer_test.go @@ -195,6 +195,7 @@ func TestConsumeTracesSuccess(t *testing.T) { assert.Equal(t, 1, mc.reqCounter.success) assert.Equal(t, 1, mc.reqCounter.total) } + func TestConsumeMetricsNonPermanent(t *testing.T) { mc := newMockConsumer(returnNonPermanentError) validData := createMetric("metricId") diff --git a/exporter/internal/queue/batcher.go b/exporter/internal/queue/batcher.go index 08d51aa83d..2250b27d1b 100644 --- a/exporter/internal/queue/batcher.go +++ b/exporter/internal/queue/batcher.go @@ -35,7 +35,8 @@ type BaseBatcher struct { func NewBatcher(batchCfg exporterbatcher.Config, queue Queue[internal.Request], exportFunc func(ctx context.Context, req internal.Request) error, - maxWorkers int) (Batcher, error) { + maxWorkers int, +) (Batcher, error) { if !batchCfg.Enabled { return &DisabledBatcher{ BaseBatcher{ diff --git a/exporter/internal/queue/default_batcher.go b/exporter/internal/queue/default_batcher.go index 2884159341..3023fa4df4 100644 --- a/exporter/internal/queue/default_batcher.go +++ b/exporter/internal/queue/default_batcher.go @@ -67,7 +67,8 @@ func (qb *DefaultBatcher) startReadingFlushingGoroutine() { qb.flushAsync(batch{ req: reqList[i], ctx: ctx, - idxList: []uint64{idx}}) + idxList: []uint64{idx}, + }) // TODO: handle partial failure } qb.resetTimer() @@ -75,7 +76,8 @@ func (qb *DefaultBatcher) startReadingFlushingGoroutine() { qb.currentBatch = &batch{ req: reqList[0], ctx: ctx, - idxList: []uint64{idx}} + idxList: []uint64{idx}, + } qb.currentBatchMu.Unlock() } } else { @@ -84,7 +86,8 @@ func (qb *DefaultBatcher) startReadingFlushingGoroutine() { qb.currentBatch = &batch{ req: req, ctx: ctx, - idxList: []uint64{idx}} + idxList: []uint64{idx}, + } } else { mergedReq, mergeErr := qb.currentBatch.req.Merge(qb.currentBatch.ctx, req) if mergeErr != nil { @@ -95,7 +98,8 @@ func (qb *DefaultBatcher) startReadingFlushingGoroutine() { qb.currentBatch = &batch{ req: mergedReq, ctx: qb.currentBatch.ctx, - idxList: append(qb.currentBatch.idxList, idx)} + idxList: append(qb.currentBatch.idxList, idx), + } } if qb.currentBatch.req.ItemsCount() >= qb.batchCfg.MinSizeItems { diff --git a/exporter/internal/queue/disabled_batcher.go b/exporter/internal/queue/disabled_batcher.go index db08c546b4..250b38e764 100644 --- a/exporter/internal/queue/disabled_batcher.go +++ b/exporter/internal/queue/disabled_batcher.go @@ -38,7 +38,8 @@ func (qb *DisabledBatcher) Start(_ context.Context, _ component.Host) error { qb.flushAsync(batch{ req: req, ctx: context.Background(), - idxList: []uint64{idx}}) + idxList: []uint64{idx}, + }) } }() return nil diff --git a/exporter/internal/queue/fake_request_test.go b/exporter/internal/queue/fake_request_test.go index 189268cf91..65ee3a289a 100644 --- a/exporter/internal/queue/fake_request_test.go +++ b/exporter/internal/queue/fake_request_test.go @@ -54,7 +54,8 @@ func (r *fakeRequest) ItemsCount() int { } func (r *fakeRequest) Merge(_ context.Context, - r2 internal.Request) (internal.Request, error) { + r2 internal.Request, +) (internal.Request, error) { fr2 := r2.(*fakeRequest) if fr2.mergeErr != nil { return nil, fr2.mergeErr @@ -68,7 +69,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/internal/queue/persistent_queue_test.go b/exporter/internal/queue/persistent_queue_test.go index fbabd0b83a..5ee93c5b4d 100644 --- a/exporter/internal/queue/persistent_queue_test.go +++ b/exporter/internal/queue/persistent_queue_test.go @@ -226,7 +226,8 @@ func (m *fakeStorageClientWithErrors) Reset() { // createAndStartTestPersistentQueue creates and starts a fake queue with the given capacity and number of consumers. func createAndStartTestPersistentQueue(t *testing.T, sizer Sizer[tracesRequest], capacity int64, numConsumers int, - consumeFunc func(_ context.Context, item tracesRequest) error) Queue[tracesRequest] { + consumeFunc func(_ context.Context, item tracesRequest) error, +) Queue[tracesRequest] { pq := NewPersistentQueue[tracesRequest](PersistentQueueSettings[tracesRequest]{ Sizer: sizer, Capacity: capacity, @@ -272,7 +273,8 @@ func createTestPersistentQueueWithItemsCapacity(t testing.TB, ext storage.Extens } func createTestPersistentQueueWithCapacityLimiter(t testing.TB, ext storage.Extension, sizer Sizer[tracesRequest], - capacity int64) *persistentQueue[tracesRequest] { + capacity int64, +) *persistentQueue[tracesRequest] { pq := NewPersistentQueue[tracesRequest](PersistentQueueSettings[tracesRequest]{ Sizer: sizer, Capacity: capacity, @@ -340,7 +342,8 @@ func TestPersistentQueue_FullCapacity(t *testing.T) { func TestPersistentQueue_Shutdown(t *testing.T) { pq := createAndStartTestPersistentQueue(t, &RequestSizer[tracesRequest]{}, 1001, 100, func(context.Context, - tracesRequest) error { + tracesRequest, + ) error { return nil }) req := newTracesRequest(1, 10) @@ -384,7 +387,8 @@ func TestPersistentQueue_ConsumersProducers(t *testing.T) { numMessagesConsumed := &atomic.Int32{} pq := createAndStartTestPersistentQueue(t, &RequestSizer[tracesRequest]{}, 1000, c.numConsumers, func(context.Context, - tracesRequest) error { + tracesRequest, + ) error { numMessagesConsumed.Add(int32(1)) return nil }) @@ -468,7 +472,7 @@ func TestToStorageClient(t *testing.T) { t.Run(tt.name, func(t *testing.T) { storageID := component.MustNewIDWithName("file_storage", strconv.Itoa(tt.storageIndex)) - var extensions = map[component.ID]component.Component{} + extensions := map[component.ID]component.Component{} for i := 0; i < tt.numStorages; i++ { extensions[component.MustNewIDWithName("file_storage", strconv.Itoa(i))] = NewMockStorageExtension(tt.getClientError) } @@ -499,7 +503,7 @@ func TestInvalidStorageExtensionType(t *testing.T) { settings := extensiontest.NewNopSettings() extension, err := factory.Create(context.Background(), settings, extConfig) require.NoError(t, err) - var extensions = map[component.ID]component.Component{ + extensions := map[component.ID]component.Component{ storageID: extension, } host := &mockHost{ext: extensions} diff --git a/exporter/internal/queue/queue.go b/exporter/internal/queue/queue.go index cae36b5c1c..77cac737f7 100644 --- a/exporter/internal/queue/queue.go +++ b/exporter/internal/queue/queue.go @@ -12,10 +12,8 @@ import ( "go.opentelemetry.io/collector/component" ) -var ( - // ErrQueueIsFull is the error returned when an item is offered to the Queue and the queue is full. - ErrQueueIsFull = errors.New("sending queue is full") -) +// ErrQueueIsFull is the error returned when an item is offered to the Queue and the queue is full. +var ErrQueueIsFull = errors.New("sending queue is full") // Queue defines a producer-consumer exchange which can be backed by e.g. the memory-based ring buffer queue // (boundedMemoryQueue) or via a disk-based queue (persistentQueue) diff --git a/exporter/otlphttpexporter/otlp_test.go b/exporter/otlphttpexporter/otlp_test.go index 65a2e5bacc..3bf7968798 100644 --- a/exporter/otlphttpexporter/otlp_test.go +++ b/exporter/otlphttpexporter/otlp_test.go @@ -39,10 +39,12 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" ) -const tracesTelemetryType = "traces" -const metricsTelemetryType = "metrics" -const logsTelemetryType = "logs" -const profilesTelemetryType = "profiles" +const ( + tracesTelemetryType = "traces" + metricsTelemetryType = "metrics" + logsTelemetryType = "logs" + profilesTelemetryType = "profiles" +) type responseSerializer interface { MarshalJSON() ([]byte, error) diff --git a/extension/experimental/storage/storage.go b/extension/experimental/storage/storage.go index 184787db0f..901b6fdd83 100644 --- a/extension/experimental/storage/storage.go +++ b/extension/experimental/storage/storage.go @@ -35,7 +35,6 @@ type Extension interface { // // [overwrite | not-found | no-op] from "real" problems type Client interface { - // Get will retrieve data from storage that corresponds to the // specified key. It should return (nil, nil) if not found Get(ctx context.Context, key string) ([]byte, error) diff --git a/extension/extension.go b/extension/extension.go index 04a8bbbc42..5bc630a9e4 100644 --- a/extension/extension.go +++ b/extension/extension.go @@ -80,7 +80,8 @@ func NewFactory( cfgType component.Type, createDefaultConfig component.CreateDefaultConfigFunc, createServiceExtension CreateFunc, - sl component.StabilityLevel) Factory { + sl component.StabilityLevel, +) Factory { return &factory{ cfgType: cfgType, CreateDefaultConfigFunc: createDefaultConfig, diff --git a/extension/extension_test.go b/extension/extension_test.go index f86bf648b4..1d85292b2b 100644 --- a/extension/extension_test.go +++ b/extension/extension_test.go @@ -20,7 +20,7 @@ type nopExtension struct { } func TestNewFactory(t *testing.T) { - var testType = component.MustNewType("test") + testType := component.MustNewType("test") defaultCfg := struct{}{} nopExtensionInstance := new(nopExtension) diff --git a/extension/zpagesextension/zpagesextension_test.go b/extension/zpagesextension/zpagesextension_test.go index 39ca9fd4d9..21b8df5f8c 100644 --- a/extension/zpagesextension/zpagesextension_test.go +++ b/extension/zpagesextension/zpagesextension_test.go @@ -31,8 +31,10 @@ func newZPagesHost() *zpagesHost { func (*zpagesHost) RegisterZPages(*http.ServeMux, string) {} -var _ registerableTracerProvider = (*registerableProvider)(nil) -var _ registerableTracerProvider = sdktrace.NewTracerProvider() +var ( + _ registerableTracerProvider = (*registerableProvider)(nil) + _ registerableTracerProvider = sdktrace.NewTracerProvider() +) type registerableProvider struct { trace.TracerProvider diff --git a/featuregate/registry.go b/featuregate/registry.go index a72e51a610..9309024c38 100644 --- a/featuregate/registry.go +++ b/featuregate/registry.go @@ -23,10 +23,8 @@ var ( idRegexp = regexp.MustCompile(`^[0-9a-zA-Z\.]*$`) ) -var ( - // ErrAlreadyRegistered is returned when adding a Gate that is already registered. - ErrAlreadyRegistered = errors.New("gate is already registered") -) +// ErrAlreadyRegistered is returned when adding a Gate that is already registered. +var ErrAlreadyRegistered = errors.New("gate is already registered") // GlobalRegistry returns the global Registry. func GlobalRegistry() *Registry {