[chore]: enable whitespace linter (#11579)

#### Description [whitespace](https://golangci-lint.run/usage/linters/#whitespace) is a linter that checks for unnecessary newlines at the start and end of functions. Signed-off-by: Matthieu MOREL <[email protected]>
open-telemetry · Oct 31, 2024 · 0204d95 · 0204d95
1 parent 2d9d376
commit 0204d95
Show file tree

Hide file tree

Showing 47 changed files with 1 addition and 67 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -144,6 +144,7 @@ linters:
     - unused
     - unparam
     - usestdlibvars
+    - whitespace
 
 issues:
   # Excluding configuration per-path, per-linter, per-text and per-source

diff --git a/cmd/mdatagen/internal/embedded_templates_test.go b/cmd/mdatagen/internal/embedded_templates_test.go
@@ -48,5 +48,4 @@ func TestEnsureTemplatesLoaded(t *testing.T) {
 		return nil
 	}))
 	assert.Equal(t, len(templateFiles), count, "Must match the expected number of calls")
-
 }
diff --git a/cmd/mdatagen/internal/samplereceiver/metrics_test.go b/cmd/mdatagen/internal/samplereceiver/metrics_test.go
@@ -104,5 +104,4 @@ func TestComponentTelemetry(t *testing.T) {
 		},
 	})
 	require.NoError(t, tt.Shutdown(context.Background()))
-
 }
diff --git a/component/componentstatus/instance_test.go b/component/componentstatus/instance_test.go
@@ -92,5 +92,4 @@ func TestAllPipelineIDs(t *testing.T) {
 		return false
 	})
 	assert.Equal(t, 1, count)
-
 }
diff --git a/component/componenttest/configtest.go b/component/componenttest/configtest.go
@@ -65,10 +65,8 @@ func validateConfigDataType(t reflect.Type) error {
 
 // checkStructFieldTags inspects the tags of a struct field.
 func checkStructFieldTags(f reflect.StructField) error {
-
 	tagValue := f.Tag.Get("mapstructure")
 	if tagValue == "" {
-
 		// Ignore special types.
 		switch f.Type.Kind() {
 		case reflect.Interface, reflect.Chan, reflect.Func, reflect.Uintptr, reflect.UnsafePointer:

diff --git a/config/configcompression/compressiontype.go b/config/configcompression/compressiontype.go
@@ -39,5 +39,4 @@ func (ct *Type) UnmarshalText(in []byte) error {
 		return nil
 	}
 	return fmt.Errorf("unsupported compression type %q", typ)
-
 }
diff --git a/config/configgrpc/configgrpc_test.go b/config/configgrpc/configgrpc_test.go
@@ -560,7 +560,6 @@ func TestGRPCServerWarning(t *testing.T) {
 			require.Len(t, observed.FilterLevelExact(zap.WarnLevel).All(), test.len)
 		})
 	}
-
 }
 
 func TestGRPCServerSettingsError(t *testing.T) {

diff --git a/config/confighttp/compressor_test.go b/config/confighttp/compressor_test.go
@@ -49,7 +49,6 @@ func BenchmarkCompression(b *testing.B) {
 		b.Run(fmt.Sprint(benchmark.name), func(b *testing.B) {
 			benchmark.function(b, benchmark.codec, &buffer, payload)
 		})
-
 	}
 }
 

diff --git a/config/confighttp/confighttp_test.go b/config/confighttp/confighttp_test.go
@@ -220,7 +220,6 @@ func TestPartialHTTPClientSettings(t *testing.T) {
 			assert.EqualValues(t, 0, transport.MaxConnsPerHost)
 			assert.EqualValues(t, 90*time.Second, transport.IdleConnTimeout)
 			assert.False(t, transport.DisableKeepAlives)
-
 		})
 	}
 }
@@ -554,7 +553,6 @@ func TestHTTPServerWarning(t *testing.T) {
 			require.Len(t, observed.FilterLevelExact(zap.WarnLevel).All(), tt.len)
 		})
 	}
-
 }
 
 func TestHttpReception(t *testing.T) {
@@ -1279,7 +1277,6 @@ func TestServerWithDecoder(t *testing.T) {
 	srv.Handler.ServeHTTP(response, req)
 	// verify
 	assert.Equal(t, http.StatusOK, response.Result().StatusCode)
-
 }
 
 func TestServerWithDecompression(t *testing.T) {
@@ -1497,7 +1494,6 @@ func BenchmarkHttpRequest(b *testing.B) {
 			if !bb.clientPerThread {
 				c, err = hcs.ToClient(context.Background(), componenttest.NewNopHost(), nilProvidersSettings)
 				require.NoError(b, err)
-
 			}
 			b.RunParallel(func(pb *testing.PB) {
 				if c == nil {

diff --git a/config/configretry/backoff.go b/config/configretry/backoff.go
@@ -68,7 +68,6 @@ func (bs *BackOffConfig) Validate() error {
 		if bs.MaxElapsedTime < bs.MaxInterval {
 			return errors.New("'max_elapsed_time' must not be less than 'max_interval'")
 		}
-
 	}
 	return nil
 }
diff --git a/config/configtls/configtls_test.go b/config/configtls/configtls_test.go
@@ -327,7 +327,6 @@ func TestLoadTLSServerConfig(t *testing.T) {
 }
 
 func TestLoadTLSServerConfigReload(t *testing.T) {
-
 	tmpCaPath := createTempClientCaFile(t)
 
 	overwriteClientCA(t, tmpCaPath, "ca-1.crt")
@@ -358,7 +357,6 @@ func TestLoadTLSServerConfigReload(t *testing.T) {
 }
 
 func TestLoadTLSServerConfigFailingReload(t *testing.T) {
-
 	tmpCaPath := createTempClientCaFile(t)
 
 	overwriteClientCA(t, tmpCaPath, "ca-1.crt")
@@ -389,7 +387,6 @@ func TestLoadTLSServerConfigFailingReload(t *testing.T) {
 }
 
 func TestLoadTLSServerConfigFailingInitialLoad(t *testing.T) {
-
 	tmpCaPath := createTempClientCaFile(t)
 
 	overwriteClientCA(t, tmpCaPath, "testCA-bad.txt")
@@ -405,7 +402,6 @@ func TestLoadTLSServerConfigFailingInitialLoad(t *testing.T) {
 }
 
 func TestLoadTLSServerConfigWrongPath(t *testing.T) {
-
 	tmpCaPath := createTempClientCaFile(t)
 
 	tlsSetting := ServerConfig{
@@ -419,7 +415,6 @@ func TestLoadTLSServerConfigWrongPath(t *testing.T) {
 }
 
 func TestLoadTLSServerConfigFailing(t *testing.T) {
-
 	tmpCaPath := createTempClientCaFile(t)
 
 	overwriteClientCA(t, tmpCaPath, "ca-1.crt")

diff --git a/config/internal/warning_test.go b/config/internal/warning_test.go
@@ -54,5 +54,4 @@ func TestShouldWarn(t *testing.T) {
 			assert.Equal(t, shouldWarn(test.endpoint), test.warn)
 		})
 	}
-
 }
diff --git a/confmap/provider/internal/configurablehttpprovider/provider.go b/confmap/provider/internal/configurablehttpprovider/provider.go
@@ -80,7 +80,6 @@ func (fmp *provider) createClient() (*http.Client, error) {
 }
 
 func (fmp *provider) Retrieve(_ context.Context, uri string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) {
-
 	if !strings.HasPrefix(uri, string(fmp.scheme)+":") {
 		return nil, fmt.Errorf("%q uri is not supported by %q provider", uri, string(fmp.scheme))
 	}

diff --git a/confmap/provider_test.go b/confmap/provider_test.go
@@ -157,5 +157,4 @@ func TestNewRetrievedFromYAMLString(t *testing.T) {
 			}
 		})
 	}
-
 }
diff --git a/exporter/debugexporter/config_test.go b/exporter/debugexporter/config_test.go
@@ -79,7 +79,6 @@ func Test_UnmarshalMarshalled(t *testing.T) {
 		},
 	} {
 		t.Run(name, func(t *testing.T) {
-
 			conf := confmap.New()
 			err := conf.Marshal(tc.inCfg)
 			require.NoError(t, err)

diff --git a/exporter/debugexporter/internal/otlptext/databuffer.go b/exporter/debugexporter/internal/otlptext/databuffer.go
@@ -350,7 +350,6 @@ func (b *dataBuffer) logProfileMappings(ms pprofile.MappingSlice) {
 		b.logEntry("        Has filenames: %t", mapping.HasFilenames())
 		b.logEntry("        Has line numbers: %t", mapping.HasLineNumbers())
 		b.logEntry("        Has inline frames: %t", mapping.HasInlineFrames())
-
 	}
 }
 

diff --git a/exporter/debugexporter/internal/otlptext/traces_test.go b/exporter/debugexporter/internal/otlptext/traces_test.go
@@ -17,7 +17,6 @@ import (
 )
 
 func TestTracesText(t *testing.T) {
-
 	tests := []struct {
 		name string
 		in   ptrace.Traces

diff --git a/exporter/exporterhelper/exporterhelperprofiles/profiles_batch_test.go b/exporter/exporterhelper/exporterhelperprofiles/profiles_batch_test.go
@@ -124,7 +124,6 @@ func TestMergeSplitProfiles(t *testing.T) {
 				assert.Equal(t, tt.expected[i], r.(*profilesRequest))
 			}
 		})
-
 	}
 }
 

diff --git a/exporter/exporterhelper/internal/queue_sender_test.go b/exporter/exporterhelper/internal/queue_sender_test.go
@@ -317,7 +317,6 @@ func TestQueueRetryWithDisabledQueue(t *testing.T) {
 			require.NoError(t, be.Shutdown(context.Background()))
 		})
 	}
-
 }
 
 func TestQueueFailedRequestDropped(t *testing.T) {

diff --git a/exporter/exporterhelper/logs_batch_test.go b/exporter/exporterhelper/logs_batch_test.go
@@ -126,7 +126,6 @@ func TestMergeSplitLogs(t *testing.T) {
 				assert.Equal(t, tt.expected[i], r.(*logsRequest))
 			}
 		})
-
 	}
 }
 

diff --git a/exporter/exportertest/mock_consumer_test.go b/exporter/exportertest/mock_consumer_test.go
@@ -129,11 +129,9 @@ func TestConsumeLogsNonPermanent(t *testing.T) {
 	assert.Equal(t, 0, mc.reqCounter.error.permanent)
 	assert.Equal(t, 0, mc.reqCounter.success)
 	assert.Equal(t, 1, mc.reqCounter.total)
-
 }
 
 func TestConsumeLogsPermanent(t *testing.T) {
-
 	mc := newMockConsumer(returnPermanentError)
 	validData := createLog("logId")
 	err := mc.ConsumeLogs(context.Background(), validData)
@@ -144,7 +142,6 @@ func TestConsumeLogsPermanent(t *testing.T) {
 	assert.Equal(t, 1, mc.reqCounter.error.permanent)
 	assert.Equal(t, 0, mc.reqCounter.success)
 	assert.Equal(t, 1, mc.reqCounter.total)
-
 }
 
 func TestConsumeLogsSuccess(t *testing.T) {
@@ -158,7 +155,6 @@ func TestConsumeLogsSuccess(t *testing.T) {
 	assert.Equal(t, 0, mc.reqCounter.error.permanent)
 	assert.Equal(t, 1, mc.reqCounter.success)
 	assert.Equal(t, 1, mc.reqCounter.total)
-
 }
 
 func TestConsumeTracesNonPermanent(t *testing.T) {
@@ -172,11 +168,9 @@ func TestConsumeTracesNonPermanent(t *testing.T) {
 	assert.Equal(t, 0, mc.reqCounter.error.permanent)
 	assert.Equal(t, 0, mc.reqCounter.success)
 	assert.Equal(t, 1, mc.reqCounter.total)
-
 }
 
 func TestConsumeTracesPermanent(t *testing.T) {
-
 	mc := newMockConsumer(returnPermanentError)
 	validData := createTrace("traceId")
 	err := mc.ConsumeTraces(context.Background(), validData)
@@ -187,7 +181,6 @@ func TestConsumeTracesPermanent(t *testing.T) {
 	assert.Equal(t, 1, mc.reqCounter.error.permanent)
 	assert.Equal(t, 0, mc.reqCounter.success)
 	assert.Equal(t, 1, mc.reqCounter.total)
-
 }
 
 func TestConsumeTracesSuccess(t *testing.T) {
@@ -201,7 +194,6 @@ func TestConsumeTracesSuccess(t *testing.T) {
 	assert.Equal(t, 0, mc.reqCounter.error.permanent)
 	assert.Equal(t, 1, mc.reqCounter.success)
 	assert.Equal(t, 1, mc.reqCounter.total)
-
 }
 func TestConsumeMetricsNonPermanent(t *testing.T) {
 	mc := newMockConsumer(returnNonPermanentError)
@@ -214,7 +206,6 @@ func TestConsumeMetricsNonPermanent(t *testing.T) {
 	assert.Equal(t, 0, mc.reqCounter.error.permanent)
 	assert.Equal(t, 0, mc.reqCounter.success)
 	assert.Equal(t, 1, mc.reqCounter.total)
-
 }
 
 func TestConsumeMetricsPermanent(t *testing.T) {
@@ -228,7 +219,6 @@ func TestConsumeMetricsPermanent(t *testing.T) {
 	assert.Equal(t, 1, mc.reqCounter.error.permanent)
 	assert.Equal(t, 0, mc.reqCounter.success)
 	assert.Equal(t, 1, mc.reqCounter.total)
-
 }
 
 func TestConsumeMetricsSuccess(t *testing.T) {
@@ -242,7 +232,6 @@ func TestConsumeMetricsSuccess(t *testing.T) {
 	assert.Equal(t, 0, mc.reqCounter.error.permanent)
 	assert.Equal(t, 1, mc.reqCounter.success)
 	assert.Equal(t, 1, mc.reqCounter.total)
-
 }
 
 func TestCapabilities(t *testing.T) {

diff --git a/exporter/internal/queue/default_batcher.go b/exporter/internal/queue/default_batcher.go
@@ -29,7 +29,6 @@ func (qb *DefaultBatcher) resetTimer() {
 
 // startReadingFlushingGoroutine starts a goroutine that reads and then flushes.
 func (qb *DefaultBatcher) startReadingFlushingGoroutine() {
-
 	qb.stopWG.Add(1)
 	go func() {
 		defer qb.stopWG.Done()

diff --git a/exporter/internal/queue/persistent_queue.go b/exporter/internal/queue/persistent_queue.go
@@ -382,7 +382,6 @@ func (pq *persistentQueue[T]) OnProcessingFinished(index uint64, consumeErr erro
 
 	// Ensure the used size and the channel size are in sync.
 	pq.sizedChannel.syncSize()
-
 }
 
 // retrieveAndEnqueueNotDispatchedReqs gets the items for which sending was not finished, cleans the storage

diff --git a/exporter/internal/queue/persistent_queue_test.go b/exporter/internal/queue/persistent_queue_test.go
@@ -190,7 +190,6 @@ func TestPersistentQueue_Shutdown(t *testing.T) {
 	for i := 0; i < 1000; i++ {
 		assert.NoError(t, pq.Offer(context.Background(), req))
 	}
-
 }
 
 func TestPersistentQueue_ConsumersProducers(t *testing.T) {

diff --git a/exporter/otlpexporter/config_test.go b/exporter/otlpexporter/config_test.go
@@ -139,7 +139,6 @@ func TestUnmarshalInvalidConfig(t *testing.T) {
 			assert.ErrorContains(t, component.ValidateConfig(cfg), tt.errorMsg)
 		})
 	}
-
 }
 
 func TestValidDNSEndpoint(t *testing.T) {

diff --git a/extension/auth/client_test.go b/extension/auth/client_test.go
@@ -115,5 +115,4 @@ func TestWithPerRPCCredentials(t *testing.T) {
 	assert.True(t, called)
 	assert.NotNil(t, p)
 	assert.NoError(t, err)
-
 }
diff --git a/extension/zpagesextension/zpagesextension.go b/extension/zpagesextension/zpagesextension.go
@@ -45,7 +45,6 @@ type registerableTracerProvider interface {
 }
 
 func (zpe *zpagesExtension) Start(ctx context.Context, host component.Host) error {
-
 	zPagesMux := http.NewServeMux()
 
 	sdktracer, ok := zpe.telemetry.TracerProvider.(registerableTracerProvider)

diff --git a/otelcol/command_components.go b/otelcol/command_components.go
@@ -41,7 +41,6 @@ func newComponentsCommand(set CollectorSettings) *cobra.Command {
 		Long:  "Outputs available components in this collector distribution including their stability levels. The output format is not stable and can change between releases.",
 		Args:  cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, _ []string) error {
-
 			factories, err := set.Factories()
 			if err != nil {
 				return fmt.Errorf("failed to initialize factories: %w", err)

diff --git a/otelcol/unmarshaler.go b/otelcol/unmarshaler.go
@@ -27,7 +27,6 @@ type configSettings struct {
 // unmarshal the configSettings from a confmap.Conf.
 // After the config is unmarshalled, `Validate()` must be called to validate.
 func unmarshal(v *confmap.Conf, factories Factories) (*configSettings, error) {
-
 	telFactory := telemetry.NewFactory()
 	defaultTelConfig := *telFactory.CreateDefaultConfig().(*telemetry.Config)
 

diff --git a/pdata/pcommon/value_test.go b/pdata/pcommon/value_test.go
@@ -72,7 +72,6 @@ func TestValueReadOnly(t *testing.T) {
 	v.CopyTo(v2)
 	assert.Equal(t, v.AsRaw(), v2.AsRaw())
 	assert.Panics(t, func() { v2.CopyTo(v) })
-
 }
 
 func TestValueType(t *testing.T) {

diff --git a/pdata/plog/pb_test.go b/pdata/plog/pb_test.go
@@ -29,7 +29,6 @@ func TestProtoSizer(t *testing.T) {
 	bytes, err := marshaler.MarshalLogs(ld)
 	require.NoError(t, err)
 	assert.Equal(t, len(bytes), size)
-
 }
 
 func TestProtoSizerEmptyLogs(t *testing.T) {

diff --git a/pdata/pprofile/pprofileotlp/response.go b/pdata/pprofile/pprofileotlp/response.go
@@ -65,7 +65,6 @@ func (ms ExportResponse) unmarshalJsoniter(iter *jsoniter.Iterator) {
 		}
 		return true
 	})
-
 }
 
 // PartialSuccess returns the ExportLogsPartialSuccess associated with this ExportResponse.

diff --git a/pdata/ptrace/ptraceotlp/response.go b/pdata/ptrace/ptraceotlp/response.go
@@ -65,7 +65,6 @@ func (ms ExportResponse) unmarshalJsoniter(iter *jsoniter.Iterator) {
 		}
 		return true
 	})
-
 }
 
 // PartialSuccess returns the ExportLogsPartialSuccess associated with this ExportResponse.

diff --git a/processor/batchprocessor/config_test.go b/processor/batchprocessor/config_test.go
@@ -51,7 +51,6 @@ func TestValidateConfig_ValidBatchSizes(t *testing.T) {
 		SendBatchMaxSize: 1000,
 	}
 	assert.NoError(t, cfg.Validate())
-
 }
 
 func TestValidateConfig_InvalidBatchSize(t *testing.T) {

diff --git a/receiver/otlpreceiver/config_test.go b/receiver/otlpreceiver/config_test.go
@@ -141,7 +141,6 @@ func TestUnmarshalConfig(t *testing.T) {
 				},
 			},
 		}, cfg)
-
 }
 
 func TestUnmarshalConfigUnix(t *testing.T) {