chore: several rules from go-critic (#7635)

Signed-off-by: Matthieu MOREL <[email protected]>
Co-authored-by: Robert Pająk <[email protected]>

Author: mmorel-35

.golangci.yml

@@ -10,6 +10,7 @@ linters:
     - depguard
     - errcheck
     - errorlint
+    - gocritic
     - godot
     - gosec
     - govet
@@ -50,6 +51,22 @@ linters:
             - pkg: crypto/md5
             - pkg: crypto/sha1
             - pkg: crypto/**/pkix
+    gocritic:
+      disabled-checks:
+        - appendAssign
+        - appendCombine
+        - assignOp
+        - elseif
+        - exitAfterDefer
+        - exposedSyncMutex
+        - hugeParam
+        - paramTypeCombine
+        - rangeValCopy
+        - typeUnparen
+        - unnamedResult
+        - unslice
+        - whyNoLint
+      enable-all: true
     godot:
       exclude:
         # Exclude sentence fragments for lists.

bridges/otelslog/handler.go

@@ -361,7 +361,7 @@ func (g *group) KeyValue(kvs ...log.KeyValue) log.KeyValue {
 // Clone returns a copy of g.
 func (g *group) Clone() *group {
 	if g == nil {
-		return g
+		return nil
 	}
 	g2 := *g
 	g2.attrs = g2.attrs.Clone()

bridges/prometheus/producer.go

@@ -367,11 +367,12 @@ func convertExemplar(exemplar *dto.Exemplar) metricdata.Exemplar[float64] {
 	var traceID, spanID []byte
 	// find the trace ID and span ID in attributes, if it exists
 	for _, label := range exemplar.GetLabel() {
-		if label.GetName() == traceIDLabel {
+		switch label.GetName() {
+		case traceIDLabel:
 			traceID = []byte(label.GetValue())
-		} else if label.GetName() == spanIDLabel {
+		case spanIDLabel:
 			spanID = []byte(label.GetValue())
-		} else {
+		default:
 			attrs = append(attrs, attribute.String(label.GetName(), label.GetValue()))
 		}
 	}

detectors/autodetect/autodetect.go

@@ -121,15 +121,9 @@ var (
 		IDAWSEC2: func() resource.Detector {
 			return ec2.NewResourceDetector()
 		},
-		IDAWSECS: func() resource.Detector {
-			return ecs.NewResourceDetector()
-		},
-		IDAWSEKS: func() resource.Detector {
-			return eks.NewResourceDetector()
-		},
-		IDAWSLambda: func() resource.Detector {
-			return lambda.NewResourceDetector()
-		},
+		IDAWSECS:    ecs.NewResourceDetector,
+		IDAWSEKS:    eks.NewResourceDetector,
+		IDAWSLambda: lambda.NewResourceDetector,
 
 		IDAzureVM: func() resource.Detector {
 			return azurevm.New()

detectors/aws/ecs/ecs.go

@@ -73,7 +73,7 @@ func (detector *resourceDetector) Detect(ctx context.Context) (*resource.Resourc
 	metadataURIV3 := os.Getenv(metadataV3EnvVar)
 	metadataURIV4 := os.Getenv(metadataV4EnvVar)
 
-	if len(metadataURIV3) == 0 && len(metadataURIV4) == 0 {
+	if metadataURIV3 == "" && metadataURIV4 == "" {
 		return nil, nil
 	}
 	hostName, err := detector.utils.getContainerName()
@@ -91,7 +91,7 @@ func (detector *resourceDetector) Detect(ctx context.Context) (*resource.Resourc
 		semconv.ContainerID(containerID),
 	}
 
-	if len(metadataURIV4) > 0 {
+	if metadataURIV4 != "" {
 		containerMetadata, err := detector.utils.getContainerMetadataV4(ctx)
 		if err != nil {
 			return empty, err
@@ -133,7 +133,7 @@ func (detector *resourceDetector) Detect(ctx context.Context) (*resource.Resourc
 		)
 
 		availabilityZone := taskMetadata.AvailabilityZone
-		if len(availabilityZone) > 0 {
+		if availabilityZone != "" {
 			attributes = append(
 				attributes,
 				semconv.CloudAvailabilityZone(availabilityZone),

detectors/aws/eks/detector.go

@@ -56,6 +56,9 @@ var _ resource.Detector = (*resourceDetector)(nil)
 // Compile time assertion that eksDetectorUtils implements the detectorUtils interface.
 var _ detectorUtils = (*eksDetectorUtils)(nil)
 
+// is this going to stop working with 1.20 when Docker is deprecated?
+var containerIDRegex = regexp.MustCompile(`^.*/docker/(.+)$`)
+
 // NewResourceDetector returns a resource detector that will detect AWS EKS resources.
 func NewResourceDetector() resource.Detector {
 	utils, err := newK8sDetectorUtils()
@@ -180,16 +183,10 @@ func (eksUtils eksDetectorUtils) getContainerID() (string, error) {
 		return "", fmt.Errorf("getContainerID() error: cannot read file with path %s: %w", defaultCgroupPath, err)
 	}
 
-	// is this going to stop working with 1.20 when Docker is deprecated?
-	r, err := regexp.Compile(`^.*/docker/(.+)$`)
-	if err != nil {
-		return "", err
-	}
-
 	// Retrieve containerID from file
 	splitData := strings.Split(strings.TrimSpace(string(fileData)), "\n")
 	for _, str := range splitData {
-		if r.MatchString(str) {
+		if containerIDRegex.MatchString(str) {
 			return str[len(str)-containerIDLength:], nil
 		}
 	}

detectors/aws/lambda/detector.go

@@ -45,7 +45,7 @@ func NewResourceDetector() resource.Detector {
 func (detector *resourceDetector) Detect(context.Context) (*resource.Resource, error) {
 	// Lambda resources come from ENV
 	lambdaName := os.Getenv(lambdaFunctionNameEnvVar)
-	if len(lambdaName) == 0 {
+	if lambdaName == "" {
 		return empty, errNotOnLambda
 	}
 	awsRegion := os.Getenv(awsRegionEnvVar)

detectors/azure/azurevm/vm.go

@@ -89,7 +89,7 @@ func (detector *ResourceDetector) getJSONMetadata(ctx context.Context) ([]byte,
 
 	client := http.Client{Transport: pTransport}
 
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, detector.endpoint, nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, detector.endpoint, http.NoBody)
 	if err != nil {
 		return nil, false, err
 	}

examples/passthrough/handler/handler.go

@@ -53,7 +53,7 @@ func (h *Handler) HandleHTTPReq(r *http.Request) {
 // makeOutgoingRequest mimics what an instrumented http client does.
 func (h *Handler) makeOutgoingRequest(ctx context.Context) {
 	// make a new http request
-	r, err := http.NewRequest("", "", nil)
+	r, err := http.NewRequest("", "", http.NoBody)
 	if err != nil {
 		panic(err)
 	}

examples/passthrough/main.go

@@ -32,7 +32,7 @@ func main() {
 	defer func() { _ = tp.Shutdown(ctx) }()
 
 	// make an initial http request
-	r, err := http.NewRequest("", "", nil)
+	r, err := http.NewRequest("", "", http.NoBody)
 	if err != nil {
 		panic(err)
 	}