fix linting

jj22ee · Nov 6, 2024 · 18cca02 · 18cca02
1 parent 7cef2d3
commit 18cca02
Show file tree

Hide file tree

Showing 29 changed files with 45 additions and 152 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -59,7 +59,6 @@ linters-settings:
     sections:
       - standard
       - default
-      - prefix(github.com/open-telemetry/opentelemetry-collector-contrib)
 
   govet:
     # settings per analyzer
@@ -89,9 +88,6 @@ linters-settings:
       replacement: any
 
   goimports:
-    # put imports beginning with prefix after 3rd-party packages;
-    # it's a comma-separated list of prefixes
-    local-prefixes: github.com/open-telemetry/opentelemetry-collector-contrib
 
   misspell:
     # Correct spellings using locale preferences for US or UK.

diff --git a/exporter/awsemfexporter/config.go b/exporter/awsemfexporter/config.go
@@ -6,13 +6,11 @@ package awsemfexporter // import "github.com/amazon-contributing/opentelemetry-c
 import (
 	"strings"
 
-	"go.opentelemetry.io/collector/component"
-	"go.uber.org/zap"
-
 	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
 	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
-
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry"
+	"go.opentelemetry.io/collector/component"
+	"go.uber.org/zap"
 )
 
 var (

diff --git a/exporter/awsemfexporter/config_test.go b/exporter/awsemfexporter/config_test.go
@@ -9,17 +9,15 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata"
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"go.opentelemetry.io/collector/featuregate"
 	"go.uber.org/zap"
-
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata"
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
-
-	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry"
 )
 
 func TestLoadConfig(t *testing.T) {

diff --git a/exporter/awsemfexporter/datapoint.go b/exporter/awsemfexporter/datapoint.go
@@ -9,12 +9,11 @@ import (
 	"strconv"
 	"time"
 
+	aws "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.uber.org/zap"
 	"golang.org/x/exp/maps"
-
-	aws "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics"
 )
 
 const (

diff --git a/exporter/awsemfexporter/datapoint_test.go b/exporter/awsemfexporter/datapoint_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 	"time"
 
+	aws "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/pdata/pcommon"
@@ -18,8 +19,6 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest/observer"
-
-	aws "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics"
 )
 
 type metricValueType string

diff --git a/exporter/awsemfexporter/emf_exporter.go b/exporter/awsemfexporter/emf_exporter.go
@@ -10,7 +10,10 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/appsignals"
 	"github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware"
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/google/uuid"
 	"go.opentelemetry.io/collector/component"
@@ -19,10 +22,6 @@ import (
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.uber.org/zap"
-
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/appsignals"
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
 )
 
 const (

diff --git a/exporter/awsemfexporter/emf_exporter_test.go b/exporter/awsemfexporter/emf_exporter_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware"
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -21,8 +22,6 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest/observer"
-
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
 )
 
 const defaultRetryCount = 1

diff --git a/exporter/awsemfexporter/factory.go b/exporter/awsemfexporter/factory.go
@@ -6,16 +6,14 @@ package awsemfexporter // import "github.com/amazon-contributing/opentelemetry-c
 import (
 	"context"
 
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata"
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/exporter"
 	"go.opentelemetry.io/collector/exporter/exporterhelper"
 	"go.opentelemetry.io/collector/featuregate"
 	"go.uber.org/zap"
-
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata"
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
-
-	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry"
 )
 
 var defaultNoRollupfg = featuregate.GlobalRegistry().MustRegister("awsemf.nodimrollupdefault", featuregate.StageAlpha,

diff --git a/exporter/awsemfexporter/factory_test.go b/exporter/awsemfexporter/factory_test.go
@@ -8,14 +8,13 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"go.opentelemetry.io/collector/exporter/exportertest"
-
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter/internal/metadata"
 )
 
 func TestCreateDefaultConfig(t *testing.T) {

diff --git a/exporter/awsemfexporter/grouped_metric.go b/exporter/awsemfexporter/grouped_metric.go
@@ -7,10 +7,9 @@ import (
 	"encoding/json"
 	"strings"
 
+	aws "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.uber.org/zap"
-
-	aws "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics"
 )
 
 // groupedMetric defines set of metrics with same namespace, timestamp and labels

diff --git a/exporter/awsemfexporter/metric_translator.go b/exporter/awsemfexporter/metric_translator.go
@@ -11,12 +11,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
+	aws "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
-
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
-	aws "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics"
 )
 
 const (

diff --git a/exporter/awsemfexporter/metric_translator_test.go b/exporter/awsemfexporter/metric_translator_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/pdata/pcommon"
@@ -20,8 +21,6 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest/observer"
-
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs"
 )
 
 // Copied from "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal/occonventions"
@@ -132,7 +131,7 @@ func stringSlicesEqual(expected, actual []string) bool {
 	return true
 }
 
-func min(i, j int) int {
+func customMin(i, j int) int {
 	if i < j {
 		return i
 	}
@@ -153,7 +152,7 @@ func (d dimensionality) Less(i, j int) bool {
 	dim1 := d[i]
 	dim2 := d[j]
 
-	for k := 0; k < min(len(dim1), len(dim2)); k++ {
+	for k := 0; k < customMin(len(dim1), len(dim2)); k++ {
 		if dim1[k] != dim2[k] {
 			return dim1[k] < dim2[k]
 		}

diff --git a/exporter/awsxrayexporter/awsxray.go b/exporter/awsxrayexporter/awsxray.go
@@ -9,7 +9,11 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/translator"
 	"github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware"
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
+	awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/xray"
 	"go.opentelemetry.io/collector/component"
@@ -19,11 +23,6 @@ import (
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp"
 	"go.uber.org/zap"
-
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/translator"
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
-	awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
 )
 
 const (

diff --git a/exporter/awsxrayexporter/awsxray_test.go b/exporter/awsxrayexporter/awsxray_test.go
@@ -13,6 +13,9 @@ import (
 	"time"
 
 	"github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware"
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry/telemetrytest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -24,10 +27,6 @@ import (
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 	"go.uber.org/zap"
-
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry/telemetrytest"
 )
 
 func TestTraceExport(t *testing.T) {

diff --git a/exporter/awsxrayexporter/config.go b/exporter/awsxrayexporter/config.go
@@ -4,10 +4,9 @@
 package awsxrayexporter // import "github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter"
 
 import (
-	"go.opentelemetry.io/collector/component"
-
 	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
 	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
+	"go.opentelemetry.io/collector/component"
 )
 
 // Config defines configuration for AWS X-Ray exporter.

diff --git a/exporter/awsxrayexporter/config_test.go b/exporter/awsxrayexporter/config_test.go
@@ -7,13 +7,12 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata"
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
-
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata"
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
 )
 
 func TestLoadConfig(t *testing.T) {

diff --git a/exporter/awsxrayexporter/factory.go b/exporter/awsxrayexporter/factory.go
@@ -6,13 +6,12 @@ package awsxrayexporter // import "github.com/amazon-contributing/opentelemetry-
 import (
 	"context"
 
-	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/exporter"
-	"go.opentelemetry.io/collector/featuregate"
-
 	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata"
 	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
 	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray/telemetry"
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/exporter"
+	"go.opentelemetry.io/collector/featuregate"
 )
 
 var skipTimestampValidationFeatureGate = featuregate.GlobalRegistry().MustRegister(

diff --git a/exporter/awsxrayexporter/factory_test.go b/exporter/awsxrayexporter/factory_test.go
@@ -8,16 +8,15 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata"
+	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"go.opentelemetry.io/collector/exporter/exportertest"
 	"go.opentelemetry.io/collector/featuregate"
-
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata"
-	"github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil"
 )
 
 func TestCreateDefaultConfig(t *testing.T) {

diff --git a/exporter/awsxrayexporter/internal/translator/aws.go b/exporter/awsxrayexporter/internal/translator/aws.go
@@ -7,11 +7,10 @@ import (
 	"strconv"
 	"strings"
 
+	awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
 	"github.com/aws/aws-sdk-go/aws"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
-
-	awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func makeAws(attributes map[string]pcommon.Value, resource pcommon.Resource, logGroupNames []string) (map[string]pcommon.Value, *awsxray.AWSData) {

diff --git a/exporter/awsxrayexporter/internal/translator/aws_test.go b/exporter/awsxrayexporter/internal/translator/aws_test.go
@@ -6,12 +6,11 @@ package translator
 import (
 	"testing"
 
+	awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
-
-	awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func TestAwsFromEc2Resource(t *testing.T) {

diff --git a/exporter/awsxrayexporter/internal/translator/cause.go b/exporter/awsxrayexporter/internal/translator/cause.go
@@ -11,12 +11,11 @@ import (
 	"strconv"
 	"strings"
 
+	awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
 	"github.com/aws/aws-sdk-go/aws"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
-
-	awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 // ExceptionEventName the name of the exception event.

diff --git a/exporter/awsxrayexporter/internal/translator/http.go b/exporter/awsxrayexporter/internal/translator/http.go
@@ -7,12 +7,11 @@ import (
 	"net"
 	"strconv"
 
+	awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
 	"github.com/aws/aws-sdk-go/aws"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
-
-	awsxray "github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 const (