[chore]: enable whitespace linter (part 1) (open-telemetry#36117)

#### Description [whitespace](https://golangci-lint.run/usage/linters/#whitespace) is a linter that checks for unnecessary newlines at the start and end of functions. Notice that's only the first part, the full conformity wil be ensured with one or two other PR as this one is already big to review Signed-off-by: Matthieu MOREL <[email protected]>
sbylica-splunk · Dec 17, 2024 · 77b8a00 · 77b8a00
1 parent 3a59870
commit 77b8a00
Show file tree

Hide file tree

Showing 106 changed files with 0 additions and 186 deletions.
diff --git a/receiver/aerospikereceiver/client.go b/receiver/aerospikereceiver/client.go
@@ -71,7 +71,6 @@ func nodeGetterFactory(cfg *clientConfig, policy *as.ClientPolicy, authEnabled b
 		authEnabled,
 	)
 	return cluster, err
-
 }
 
 // newASClient creates a new defaultASClient connected to the given host and port

diff --git a/receiver/aerospikereceiver/cluster/node_test.go b/receiver/aerospikereceiver/cluster/node_test.go
@@ -70,7 +70,6 @@ func TestNode_NewConnNode(t *testing.T) {
 	_, err = _newConnNode(cPolicy, host, authEnabled, factoryFuncNegLogin)
 	connFactoryNegLogin.AssertExpectations(t)
 	require.ErrorContains(t, err, "ResultCode: NOT_AUTHENTICATED")
-
 }
 
 func TestNode_RequestInfo(t *testing.T) {

diff --git a/receiver/aerospikereceiver/scraper.go b/receiver/aerospikereceiver/scraper.go
@@ -383,7 +383,6 @@ func (r *aerospikeReceiver) emitNamespace(info map[string]string, now pcommon.Ti
 			addPartialIfError(errs, r.mb.RecordAerospikeNamespaceTransactionCountDataPoint(now, v, metadata.AttributeTransactionTypeWrite, metadata.AttributeTransactionResultSuccess))
 		case "client_write_timeout":
 			addPartialIfError(errs, r.mb.RecordAerospikeNamespaceTransactionCountDataPoint(now, v, metadata.AttributeTransactionTypeWrite, metadata.AttributeTransactionResultTimeout))
-
 		}
 	}
 

diff --git a/receiver/apachereceiver/scraper_test.go b/receiver/apachereceiver/scraper_test.go
@@ -75,7 +75,6 @@ func TestScraperFailedStart(t *testing.T) {
 }
 
 func TestParseScoreboard(t *testing.T) {
-
 	t.Run("test freq count", func(t *testing.T) {
 		scoreboard := `S_DD_L_GGG_____W__IIII_C________________W__________________________________.........................____WR______W____W________________________C______________________________________W_W____W______________R_________R________C_________WK_W________K_____W__C__________W___R______.............................................................................................................................`
 		results := parseScoreboard(scoreboard)

diff --git a/receiver/awscontainerinsightreceiver/factory.go b/receiver/awscontainerinsightreceiver/factory.go
@@ -58,7 +58,6 @@ func createMetricsReceiver(
 	baseCfg component.Config,
 	consumer consumer.Metrics,
 ) (receiver.Metrics, error) {
-
 	rCfg := baseCfg.(*Config)
 	return newAWSContainerInsightReceiver(params.TelemetrySettings, rCfg, consumer)
 }
diff --git a/receiver/awscontainerinsightreceiver/internal/cadvisor/cadvisor_linux.go b/receiver/awscontainerinsightreceiver/internal/cadvisor/cadvisor_linux.go
@@ -196,7 +196,6 @@ func (c *Cadvisor) addEbsVolumeInfo(tags map[string]string, ebsVolumeIDsUsedAsPV
 }
 
 func (c *Cadvisor) addECSMetrics(cadvisormetrics []*extractors.CAdvisorMetric) {
-
 	if len(cadvisormetrics) == 0 {
 		c.logger.Warn("cadvisor can't collect any metrics!")
 	}
@@ -300,15 +299,13 @@ func (c *Cadvisor) decorateMetrics(cadvisormetrics []*extractors.CAdvisorMetric)
 
 		// add tags for EKS
 		if c.containerOrchestrator == ci.EKS {
-
 			tags[ci.ClusterNameKey] = c.hostInfo.GetClusterName()
 
 			out := c.k8sDecorator.Decorate(m)
 			if out != nil {
 				result = append(result, out)
 			}
 		}
-
 	}
 
 	return result

diff --git a/receiver/awscontainerinsightreceiver/internal/cadvisor/extractors/diskio_extractor_test.go b/receiver/awscontainerinsightreceiver/internal/cadvisor/extractors/diskio_extractor_test.go
@@ -14,7 +14,6 @@ import (
 )
 
 func TestDiskIOStats(t *testing.T) {
-
 	result := testutils.LoadContainerInfo(t, "./testdata/PreInfoContainer.json")
 	result2 := testutils.LoadContainerInfo(t, "./testdata/CurInfoContainer.json")
 	// for eks node-level metrics

diff --git a/receiver/awscontainerinsightreceiver/internal/cadvisor/extractors/extractor_helpers_test.go b/receiver/awscontainerinsightreceiver/internal/cadvisor/extractors/extractor_helpers_test.go
@@ -83,7 +83,6 @@ func AssertContainsTaggedField(
 	expectedFields map[string]any,
 	expectedTags map[string]string,
 ) {
-
 	actualFields := cadvisorMetric.GetFields()
 	actualTags := cadvisorMetric.GetTags()
 	if !reflect.DeepEqual(expectedTags, actualTags) {

diff --git a/receiver/awscontainerinsightreceiver/internal/cadvisor/extractors/extractor_test.go b/receiver/awscontainerinsightreceiver/internal/cadvisor/extractors/extractor_test.go
@@ -120,5 +120,4 @@ func TestMergeMetrics(t *testing.T) {
 	require.Len(t, mergedMetrics, 1)
 	assert.Equal(t, expected.GetTags(), mergedMetrics[0].GetTags())
 	assert.Equal(t, expected.GetFields(), mergedMetrics[0].GetFields())
-
 }
diff --git a/receiver/awscontainerinsightreceiver/internal/cadvisor/extractors/fs_extractor_test.go b/receiver/awscontainerinsightreceiver/internal/cadvisor/extractors/fs_extractor_test.go
@@ -135,5 +135,4 @@ func TestFSStatsWithAllowList(t *testing.T) {
 	assert.Equal(t, "tmpfs", cMetrics[0].tags["device"])
 	assert.Equal(t, "/dev/xvda1", cMetrics[1].tags["device"])
 	assert.Equal(t, "overlay", cMetrics[2].tags["device"])
-
 }
diff --git a/receiver/awscontainerinsightreceiver/internal/cadvisor/extractors/net_extractor.go b/receiver/awscontainerinsightreceiver/internal/cadvisor/extractors/net_extractor.go
@@ -31,7 +31,6 @@ func (n *NetMetricExtractor) HasValue(info *cinfo.ContainerInfo) bool {
 }
 
 func (n *NetMetricExtractor) GetValue(info *cinfo.ContainerInfo, _ CPUMemInfoProvider, containerType string) []*CAdvisorMetric {
-
 	// Just a protection here, there is no Container level Net metrics
 	if containerType == ci.TypePod || containerType == ci.TypeContainer {
 		return nil

diff --git a/receiver/awscontainerinsightreceiver/internal/ecsInfo/cgroup.go b/receiver/awscontainerinsightreceiver/internal/ecsInfo/cgroup.go
@@ -85,7 +85,6 @@ func newCGroupScanner(ctx context.Context, mountConfigPath string, logger *zap.L
 }
 
 func (c *cgroupScanner) refresh() {
-
 	if c.ecsTaskInfoProvider == nil {
 		return
 	}

diff --git a/receiver/awscontainerinsightreceiver/internal/ecsInfo/cgroup_test.go b/receiver/awscontainerinsightreceiver/internal/ecsInfo/cgroup_test.go
@@ -45,7 +45,6 @@ func TestGetCGroupPathForTask(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			got, err := getCGroupPathForTask(cgroupMount, controller, tt.input, clusterName)
 
 			if tt.err != nil {
@@ -96,7 +95,6 @@ func TestGetCGroupPathFromARN(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			got, err := getTaskCgroupPathFromARN(tt.input)
 
 			if tt.err != nil {
@@ -110,7 +108,6 @@ func TestGetCGroupPathFromARN(t *testing.T) {
 }
 
 func TestGetCGroupMountPoint(t *testing.T) {
-
 	tests := []struct {
 		name    string
 		input   string
@@ -149,7 +146,6 @@ func TestGetCGroupMountPoint(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-
 			got, err := getCGroupMountPoint(tt.input)
 
 			if tt.err != nil {
@@ -160,7 +156,6 @@ func TestGetCGroupMountPoint(t *testing.T) {
 			}
 		})
 	}
-
 }
 
 func TestGetCPUReservedInTask(t *testing.T) {
@@ -217,7 +212,6 @@ func TestGetCPUReservedInTask(t *testing.T) {
 			assert.Equal(t, tt.expectRes, got)
 		})
 	}
-
 }
 
 func TestGetMEMReservedInTask(t *testing.T) {
@@ -337,5 +331,4 @@ func TestGetCPUReservedAndMemReserved(t *testing.T) {
 	assert.Equal(t, int64(0), cgroup.getCPUReserved())
 
 	assert.Equal(t, int64(0), cgroup.getMemReserved())
-
 }
diff --git a/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecs_instance_info_test.go b/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecs_instance_info_test.go
@@ -28,7 +28,6 @@ func (mi *MockHostInfo) GetInstanceIPReadyC() chan bool {
 }
 
 func TestECSInstanceInfo(t *testing.T) {
-
 	var ctx, cancel = context.WithCancel(context.Background())
 	defer cancel()
 	instanceReadyC := make(chan bool)
@@ -81,5 +80,4 @@ func TestECSInstanceInfo(t *testing.T) {
 
 	assert.Equal(t, "", ecsinstanceinfo.GetClusterName())
 	assert.Equal(t, "", ecsinstanceinfo.GetContainerInstanceID())
-
 }
diff --git a/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecs_task_info.go b/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecs_task_info.go
@@ -79,7 +79,6 @@ func (ti *taskInfo) getTasksInfo(ctx context.Context) (ecsTasksInfo *ECSTasksInf
 }
 
 func (ti *taskInfo) refresh(ctx context.Context) {
-
 	ecsTasksInfo := ti.getTasksInfo(ctx)
 	runningTaskCount := int64(0)
 	var tasks []ECSTask
@@ -100,7 +99,6 @@ func (ti *taskInfo) refresh(ctx context.Context) {
 	if len(ti.runningTasksInfo) != 0 && ti.runningTaskCount != 0 && !isClosed(ti.readyC) {
 		close(ti.readyC)
 	}
-
 }
 
 func (ti *taskInfo) getRunningTaskCount() int64 {

diff --git a/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecs_task_info_test.go b/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecs_task_info_test.go
@@ -18,7 +18,6 @@ import (
 )
 
 func TestECSTaskInfoSuccess(t *testing.T) {
-
 	ctx := context.Background()
 
 	taskReadyC := make(chan bool)
@@ -48,7 +47,6 @@ func TestECSTaskInfoSuccess(t *testing.T) {
 	assert.Equal(t, int64(1), ecsTaskinfo.getRunningTaskCount())
 
 	assert.NotEmpty(t, ecsTaskinfo.getRunningTasksInfo())
-
 }
 
 func TestECSTaskInfoFail(t *testing.T) {
@@ -88,5 +86,4 @@ func TestECSTaskInfoFail(t *testing.T) {
 	assert.NotNil(t, ecsTaskinfo)
 	assert.Equal(t, int64(0), ecsTaskinfo.getRunningTaskCount())
 	assert.Empty(t, ecsTaskinfo.getRunningTasksInfo())
-
 }
diff --git a/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecsinfo.go b/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecsinfo.go
@@ -123,7 +123,6 @@ func NewECSInfo(refreshInterval time.Duration, hostIPProvider hostIPProvider, ho
 }
 
 func (e *EcsInfo) initContainerInfo(ctx context.Context) {
-
 	<-e.hostIPProvider.GetInstanceIPReadyC()
 
 	e.logger.Info("instance ip is ready and begin initializing ecs container info")
@@ -133,7 +132,6 @@ func (e *EcsInfo) initContainerInfo(ctx context.Context) {
 }
 
 func (e *EcsInfo) initTaskInfo(ctx context.Context) {
-
 	<-e.hostIPProvider.GetInstanceIPReadyC()
 
 	e.logger.Info("instance ip is ready and begin initializing ecs task info")
@@ -144,7 +142,6 @@ func (e *EcsInfo) initTaskInfo(ctx context.Context) {
 }
 
 func (e *EcsInfo) initCgroupScanner(ctx context.Context) {
-
 	<-e.isContainerInfoReadyC
 	<-e.isTaskInfoReadyC
 

diff --git a/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecsinfo_test.go b/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecsinfo_test.go
@@ -48,7 +48,6 @@ func (ii *MockTaskInfo) getRunningTaskCount() int64 {
 	return ii.runningTaskCount
 }
 func (ii *MockTaskInfo) getRunningTasksInfo() []ECSTask {
-
 	return ii.tasks
 }
 
@@ -76,7 +75,6 @@ func (c *MockCgroupScanner) getMEMReservedInTask(_ string, _ string, _ []ECSCont
 func TestNewECSInfo(t *testing.T) {
 	// test the case when containerInstanceInfor fails to initialize
 	containerInstanceInfoCreatorOpt := func(ei *EcsInfo) {
-
 		ei.containerInstanceInfoCreator = func(context.Context, hostIPProvider, time.Duration, *zap.Logger, doer, chan bool) containerInstanceInfoProvider {
 			return &MockInstanceInfo{
 				clusterName: "Cluster-name",
@@ -131,5 +129,4 @@ func TestNewECSInfo(t *testing.T) {
 
 	assert.Equal(t, int64(1024), ecsinfo.GetCPUReserved())
 	assert.Equal(t, int64(1024), ecsinfo.GetMemReserved())
-
 }
diff --git a/receiver/awscontainerinsightreceiver/internal/ecsInfo/utils.go b/receiver/awscontainerinsightreceiver/internal/ecsInfo/utils.go
@@ -43,7 +43,6 @@ func GetContainerInstanceIDFromArn(arn string) (containerInstanceID string, err
 	}
 	err = errors.New("Can't get ecs container instance id from ContainerInstance arn: " + arn)
 	return
-
 }
 
 // Check the channel is closed or not.
@@ -94,7 +93,6 @@ func request(ctx context.Context, endpoint string, client doer) ([]byte, error)
 		return nil, fmt.Errorf("response from %s, execeeds the maximum length: %v", endpoint, maxHTTPResponseLength)
 	}
 	return body, nil
-
 }
 
 func clientGet(ctx context.Context, url string, client doer) (resp *http.Response, err error) {

diff --git a/receiver/awscontainerinsightreceiver/internal/ecsInfo/utils_test.go b/receiver/awscontainerinsightreceiver/internal/ecsInfo/utils_test.go
@@ -24,7 +24,6 @@ func (m *mockHTTPClient) Do(_ *http.Request) (*http.Response, error) {
 }
 
 func TestGetContainerInstanceIDFromArn(t *testing.T) {
-
 	oldFormatARN := "arn:aws:ecs:region:aws_account_id:task/task-id"
 	result, _ := GetContainerInstanceIDFromArn(oldFormatARN)
 	assert.Equal(t, "task-id", result, "Expected to be equal")
@@ -39,19 +38,16 @@ func TestGetContainerInstanceIDFromArn(t *testing.T) {
 }
 
 func TestIsClosed(t *testing.T) {
-
 	channel := make(chan bool)
 
 	assert.False(t, isClosed(channel))
 
 	close(channel)
 
 	assert.True(t, isClosed(channel))
-
 }
 
 func TestRequestSuccessWithKnownLength(t *testing.T) {
-
 	respBody := "body"
 	response := &http.Response{
 		StatusCode:    http.StatusOK,
@@ -72,11 +68,9 @@ func TestRequestSuccessWithKnownLength(t *testing.T) {
 	assert.NoError(t, err)
 
 	assert.NotNil(t, body)
-
 }
 
 func TestRequestSuccessWithUnknownLength(t *testing.T) {
-
 	respBody := "body"
 	response := &http.Response{
 		StatusCode:    http.StatusOK,
@@ -97,11 +91,9 @@ func TestRequestSuccessWithUnknownLength(t *testing.T) {
 	assert.NoError(t, err)
 
 	assert.NotNil(t, body)
-
 }
 
 func TestRequestWithFailedStatus(t *testing.T) {
-
 	respBody := "body"
 	response := &http.Response{
 		Status:        "Bad Request",
@@ -123,11 +115,9 @@ func TestRequestWithFailedStatus(t *testing.T) {
 	assert.Nil(t, body)
 
 	assert.Error(t, err)
-
 }
 
 func TestRequestWithLargeContentLength(t *testing.T) {
-
 	respBody := "body"
 	response := &http.Response{
 		StatusCode:    http.StatusOK,
@@ -148,5 +138,4 @@ func TestRequestWithLargeContentLength(t *testing.T) {
 	assert.Nil(t, body)
 
 	assert.Error(t, err)
-
 }
diff --git a/receiver/awscontainerinsightreceiver/internal/k8sapiserver/k8sapiserver.go b/receiver/awscontainerinsightreceiver/internal/k8sapiserver/k8sapiserver.go
@@ -246,7 +246,6 @@ func (k *K8sAPIServer) Shutdown() error {
 }
 
 func (k *K8sAPIServer) startLeaderElection(ctx context.Context, lock resourcelock.Interface) {
-
 	for {
 		leaderelection.RunOrDie(ctx, leaderelection.LeaderElectionConfig{
 			Lock: lock,

diff --git a/receiver/awscontainerinsightreceiver/receiver.go b/receiver/awscontainerinsightreceiver/receiver.go
@@ -44,7 +44,6 @@ func newAWSContainerInsightReceiver(
 	settings component.TelemetrySettings,
 	config *Config,
 	nextConsumer consumer.Metrics) (receiver.Metrics, error) {
-
 	r := &awsContainerInsightReceiver{
 		settings:     settings,
 		nextConsumer: nextConsumer,
@@ -79,7 +78,6 @@ func (acir *awsContainerInsightReceiver) Start(ctx context.Context, host compone
 		}
 	}
 	if acir.config.ContainerOrchestrator == ci.ECS {
-
 		ecsInfo, err := ecsinfo.NewECSInfo(acir.config.CollectionInterval, hostinfo, host, acir.settings)
 		if err != nil {
 			return err
@@ -134,7 +132,6 @@ func (acir *awsContainerInsightReceiver) Shutdown(context.Context) error {
 	}
 
 	return errs
-
 }
 
 // collectData collects container stats from cAdvisor and k8s api server (if it is an elected leader)
-Original file line number
+Diff line change
@@ Expand Up @@
     		authEnabled,
     	)
     	return cluster, err
     }
     // newASClient creates a new defaultASClient connected to the given host and port
@@ Expand Down @@