[chore] Upgrade golangci and fix lint issues

Signed-off-by: Bogdan Drutu <[email protected]>
open-telemetry · Dec 20, 2024 · 8d67668 · 8d67668
1 parent 23306ea
commit 8d67668
Show file tree

Hide file tree

Showing 29 changed files with 148 additions and 189 deletions.
diff --git a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go
@@ -139,13 +139,6 @@ func newMetricLogFromRaw(
 	}
 }
 
-func min(l, r int) int {
-	if l < r {
-		return l
-	}
-	return r
-}
-
 func resourceToMetricLabels(labels *KeyValues, resource pcommon.Resource) {
 	attrs := resource.Attributes()
 	attrs.Range(func(k string, v pcommon.Value) bool {

diff --git a/exporter/awsemfexporter/metric_translator_test.go b/exporter/awsemfexporter/metric_translator_test.go
@@ -120,13 +120,6 @@ func stringSlicesEqual(expected, actual []string) bool {
 	return true
 }
 
-func min(i, j int) int {
-	if i < j {
-		return i
-	}
-	return j
-}
-
 type dimensionality [][]string
 
 func (d dimensionality) Len() int {

diff --git a/exporter/googlecloudpubsubexporter/watermark.go b/exporter/googlecloudpubsubexporter/watermark.go
@@ -35,9 +35,9 @@ type collector struct {
 func (c *collector) earliest(timestamp pcommon.Timestamp) bool {
 	t := timestamp.AsTime()
 	if t.Before(c.calculatedTime) {
-		min := c.processingTime.Add(-c.allowedDrift)
-		if t.Before(min) {
-			c.calculatedTime = min
+		minTime := c.processingTime.Add(-c.allowedDrift)
+		if t.Before(minTime) {
+			c.calculatedTime = minTime
 			return true
 		}
 		c.calculatedTime = t

diff --git a/exporter/mezmoexporter/utils.go b/exporter/mezmoexporter/utils.go
@@ -4,10 +4,10 @@
 package mezmoexporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter"
 
 // truncateString Truncates the given string to a maximum length provided by max.
-func truncateString(s string, max int) string {
-	if len(s) < max {
+func truncateString(s string, maxLen int) string {
+	if len(s) < maxLen {
 		return s
 	}
 
-	return s[:max]
+	return s[:maxLen]
 }
diff --git a/exporter/signalfxexporter/internal/apm/correlations/client.go b/exporter/signalfxexporter/internal/apm/correlations/client.go
@@ -191,10 +191,10 @@ func (cc *Client) Correlate(cor *Correlation, cb CorrelateCB) {
 					cor.Logger(cc.log).WithFields(log.Fields{"method": http.MethodPut}).Info("Updated dimension")
 				}
 			case http.StatusTeapot:
-				max := &ErrMaxEntries{}
-				err = json.Unmarshal(body, max)
+				maxEntry := &ErrMaxEntries{}
+				err = json.Unmarshal(body, maxEntry)
 				if err == nil {
-					err = max
+					err = maxEntry
 				}
 			}
 			if err != nil {

diff --git a/exporter/signalfxexporter/internal/apm/tracetracker/cache.go b/exporter/signalfxexporter/internal/apm/tracetracker/cache.go
@@ -52,10 +52,10 @@ func (t *TimeoutCache) IsFull() bool {
 	return false
 }
 
-func (t *TimeoutCache) SetMaxSize(max int64, now time.Time) {
+func (t *TimeoutCache) SetMaxSize(maxSize int64, now time.Time) {
 	t.Lock()
 	defer t.Unlock()
-	t.maxSize = max
+	t.maxSize = maxSize
 	t.maxSizeExpiryTS = now.Add(time.Hour * 1)
 }
 

diff --git a/exporter/signalfxexporter/internal/apm/tracetracker/tracker.go b/exporter/signalfxexporter/internal/apm/tracetracker/tracker.go
@@ -167,8 +167,8 @@ func (a *ActiveServiceTracker) processEnvironment(res pcommon.Resource, now time
 						a.hostEnvironmentCache.UpdateOrCreate(&CacheKey{value: environment}, now)
 					}
 					// nolint:errorlint
-					if max, ok := err.(*correlations.ErrMaxEntries); ok && max.MaxEntries > 0 {
-						a.hostEnvironmentCache.SetMaxSize(max.MaxEntries, now)
+					if maxEntry, ok := err.(*correlations.ErrMaxEntries); ok && maxEntry.MaxEntries > 0 {
+						a.hostEnvironmentCache.SetMaxSize(maxEntry.MaxEntries, now)
 					}
 				})
 			}
@@ -226,8 +226,8 @@ func (a *ActiveServiceTracker) processService(res pcommon.Resource, now time.Tim
 						a.hostServiceCache.UpdateOrCreate(&CacheKey{value: service}, now)
 					}
 					// nolint:errorlint
-					if max, ok := err.(*correlations.ErrMaxEntries); ok && max.MaxEntries > 0 {
-						a.hostServiceCache.SetMaxSize(max.MaxEntries, now)
+					if maxEntry, ok := err.(*correlations.ErrMaxEntries); ok && maxEntry.MaxEntries > 0 {
+						a.hostServiceCache.SetMaxSize(maxEntry.MaxEntries, now)
 					}
 				})
 			}

diff --git a/extension/observer/ecsobserver/fetcher.go b/extension/observer/ecsobserver/fetcher.go
@@ -260,7 +260,7 @@ func (f *taskFetcher) attachContainerInstance(ctx context.Context, tasks []*task
 
 	// DescribeContainerInstance size limit is 100, do it in batch.
 	for i := 0; i < len(instanceList); i += describeContainerInstanceLimit {
-		end := minInt(i+describeContainerInstanceLimit, len(instanceList))
+		end := min(i+describeContainerInstanceLimit, len(instanceList))
 		if err := f.describeContainerInstances(ctx, instanceList[i:end], ciToEC2); err != nil {
 			return fmt.Errorf("describe container instanced failed offset=%d: %w", i, err)
 		}
@@ -365,7 +365,7 @@ func (f *taskFetcher) getAllServices(ctx context.Context) ([]*ecs.Service, error
 	// DescribeServices size limit is 10 so we need to do paging on client side.
 	var services []*ecs.Service
 	for i := 0; i < len(servicesToDescribe); i += describeServiceLimit {
-		end := minInt(i+describeServiceLimit, len(servicesToDescribe))
+		end := min(i+describeServiceLimit, len(servicesToDescribe))
 		desc := &ecs.DescribeServicesInput{
 			Cluster:  cluster,
 			Services: servicesToDescribe[i:end],
@@ -424,12 +424,3 @@ func sortStringPointers(ps []*string) {
 		ps[i] = aws.String(ss[i])
 	}
 }
-
-func minInt(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-// Util End
diff --git a/extension/observer/ecsobserver/internal/ecsmock/service.go b/extension/observer/ecsobserver/internal/ecsmock/service.go
@@ -437,7 +437,7 @@ func getPage(p pageInput) (*pageOutput, error) {
 			return nil, fmt.Errorf("invalid next token %q: %w", token, err)
 		}
 	}
-	end := minInt(p.size, start+p.limit)
+	end := min(p.size, start+p.limit)
 	var newNextToken *string
 	if end < p.size {
 		newNextToken = aws.String(strconv.Itoa(end))
@@ -462,12 +462,3 @@ func getArns(items any, arnGetter func(i int) *string) []*string {
 	}
 	return arns
 }
-
-// 'generic' End
-
-func minInt(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
diff --git a/extension/solarwindsapmsettingsextension/config_test.go b/extension/solarwindsapmsettingsextension/config_test.go
@@ -4,7 +4,6 @@
 package solarwindsapmsettingsextension
 
 import (
-	"os"
 	"path/filepath"
 	"testing"
 	"time"
@@ -275,21 +274,26 @@ func TestLoadConfig(t *testing.T) {
 	}
 }
 
-func TestResolveServiceNameBestEffort(t *testing.T) {
+func TestResolveServiceNameBestEffortNoEnv(t *testing.T) {
 	// Without any environment variables
 	require.Empty(t, resolveServiceNameBestEffort())
-	// With OTEL_SERVICE_NAME only
-	require.NoError(t, os.Setenv("OTEL_SERVICE_NAME", "otel_ser1"))
+}
+
+// With OTEL_SERVICE_NAME only
+func TestResolveServiceNameBestEffortOnlyOtelService(t *testing.T) {
+	t.Setenv("OTEL_SERVICE_NAME", "otel_ser1")
 	require.Equal(t, "otel_ser1", resolveServiceNameBestEffort())
-	require.NoError(t, os.Unsetenv("OTEL_SERVICE_NAME"))
-	// With AWS_LAMBDA_FUNCTION_NAME only
-	require.NoError(t, os.Setenv("AWS_LAMBDA_FUNCTION_NAME", "lambda"))
+}
+
+// With AWS_LAMBDA_FUNCTION_NAME only
+func TestResolveServiceNameBestEffortOnlyAwsLambda(t *testing.T) {
+	t.Setenv("AWS_LAMBDA_FUNCTION_NAME", "lambda")
 	require.Equal(t, "lambda", resolveServiceNameBestEffort())
-	require.NoError(t, os.Unsetenv("AWS_LAMBDA_FUNCTION_NAME"))
-	// With both
-	require.NoError(t, os.Setenv("OTEL_SERVICE_NAME", "otel_ser1"))
-	require.NoError(t, os.Setenv("AWS_LAMBDA_FUNCTION_NAME", "lambda"))
+}
+
+// With both
+func TestResolveServiceNameBestEffortBoth(t *testing.T) {
+	t.Setenv("OTEL_SERVICE_NAME", "otel_ser1")
+	t.Setenv("AWS_LAMBDA_FUNCTION_NAME", "lambda")
 	require.Equal(t, "otel_ser1", resolveServiceNameBestEffort())
-	require.NoError(t, os.Unsetenv("AWS_LAMBDA_FUNCTION_NAME"))
-	require.NoError(t, os.Unsetenv("OTEL_SERVICE_NAME"))
 }
diff --git a/internal/aws/cwlogs/pusher_test.go b/internal/aws/cwlogs/pusher_test.go
@@ -54,29 +54,29 @@ func TestValidateLogEventFailed(t *testing.T) {
 
 // eventBatch Tests
 func TestLogEventBatch_timestampWithin24Hours(t *testing.T) {
-	min := time.Date(2017, time.June, 20, 23, 38, 0, 0, time.Local)
-	max := min.Add(23 * time.Hour)
+	minDate := time.Date(2017, time.June, 20, 23, 38, 0, 0, time.Local)
+	maxDate := minDate.Add(23 * time.Hour)
 	logEventBatch := &eventBatch{
-		maxTimestampMs: max.UnixNano() / 1e6,
-		minTimestampMs: min.UnixNano() / 1e6,
+		maxTimestampMs: maxDate.UnixNano() / 1e6,
+		minTimestampMs: minDate.UnixNano() / 1e6,
 	}
 
 	// less than the min
-	target := min.Add(-1 * time.Hour)
+	target := minDate.Add(-1 * time.Hour)
 	assert.True(t, logEventBatch.isActive(aws.Int64(target.UnixNano()/1e6)))
 
 	target = target.Add(-1 * time.Millisecond)
 	assert.False(t, logEventBatch.isActive(aws.Int64(target.UnixNano()/1e6)))
 
 	// more than the max
-	target = max.Add(1 * time.Hour)
+	target = maxDate.Add(1 * time.Hour)
 	assert.True(t, logEventBatch.isActive(aws.Int64(target.UnixNano()/1e6)))
 
 	target = target.Add(1 * time.Millisecond)
 	assert.False(t, logEventBatch.isActive(aws.Int64(target.UnixNano()/1e6)))
 
 	// in between min and max
-	target = min.Add(2 * time.Hour)
+	target = minDate.Add(2 * time.Hour)
 	assert.True(t, logEventBatch.isActive(aws.Int64(target.UnixNano()/1e6)))
 }
 

diff --git a/internal/exp/metrics/staleness/staleness.go b/internal/exp/metrics/staleness/staleness.go
@@ -31,9 +31,9 @@ type Staleness[T any] struct {
 	pq    PriorityQueue
 }
 
-func NewStaleness[T any](max time.Duration, items streams.Map[T]) *Staleness[T] {
+func NewStaleness[T any](maxDuration time.Duration, items streams.Map[T]) *Staleness[T] {
 	return &Staleness[T]{
-		Max: max,
+		Max: maxDuration,
 
 		items: items,
 		pq:    NewPriorityQueue(),
@@ -117,13 +117,13 @@ func (stale Tracker) Refresh(ts time.Time, ids ...identity.Stream) {
 	}
 }
 
-func (stale Tracker) Collect(max time.Duration) []identity.Stream {
+func (stale Tracker) Collect(maxDuration time.Duration) []identity.Stream {
 	now := NowFunc()
 
 	var ids []identity.Stream
 	for stale.pq.Len() > 0 {
 		_, ts := stale.pq.Peek()
-		if now.Sub(ts) < max {
+		if now.Sub(ts) < maxDuration {
 			break
 		}
 		id, _ := stale.pq.Pop()

diff --git a/internal/exp/metrics/staleness/staleness_test.go b/internal/exp/metrics/staleness/staleness_test.go
@@ -14,9 +14,8 @@ import (
 )
 
 func TestStaleness(t *testing.T) {
-	max := 1 * time.Second
 	stalenessMap := NewStaleness[int](
-		max,
+		1*time.Second,
 		make(streams.HashMap[int]),
 	)