chore: enable more rules from go-critic (#7647)

Signed-off-by: Matthieu MOREL <[email protected]>
Co-authored-by: Tyler Yahn <[email protected]>

Author: mmorel-35

.golangci.yml

@@ -54,16 +54,11 @@ linters:
     gocritic:
       disabled-checks:
         - appendAssign
-        - appendCombine
-        - assignOp
-        - elseif
         - exitAfterDefer
         - exposedSyncMutex
         - hugeParam
         - rangeValCopy
-        - typeUnparen
         - unnamedResult
-        - unslice
         - whyNoLint
       enable-all: true
     godot:

detectors/gcp/detector.go

@@ -121,8 +121,11 @@ func (r *resourceBuilder) addInt(key attribute.Key, detect func() (string, error
 // zoneAndRegion functions are expected to return zone, region, err.
 func (r *resourceBuilder) addZoneAndRegion(detect func() (string, string, error)) {
 	if zone, region, err := detect(); err == nil {
-		r.attrs = append(r.attrs, semconv.CloudAvailabilityZone(zone))
-		r.attrs = append(r.attrs, semconv.CloudRegion(region))
+		r.attrs = append(
+			r.attrs,
+			semconv.CloudAvailabilityZone(zone),
+			semconv.CloudRegion(region),
+		)
 	} else {
 		r.errs = append(r.errs, err)
 	}

instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/collector_test.go

@@ -44,12 +44,10 @@ func (s *SpansStorage) AddSpans(request *collectortracepb.ExportTraceServiceRequ
 				}
 			}
 			s.spanCount += len(rs.ScopeSpans[0].Spans)
-		} else {
-			if len(rs.ScopeSpans) > 0 {
-				newSpans := rs.ScopeSpans[0].GetSpans()
-				existingRs.ScopeSpans[0].Spans = append(existingRs.ScopeSpans[0].Spans, newSpans...)
-				s.spanCount += len(newSpans)
-			}
+		} else if len(rs.ScopeSpans) > 0 {
+			newSpans := rs.ScopeSpans[0].GetSpans()
+			existingRs.ScopeSpans[0].Spans = append(existingRs.ScopeSpans[0].Spans, newSpans...)
+			s.spanCount += len(newSpans)
 		}
 	}
 }
@@ -76,13 +74,13 @@ func resourceString(res *resourcepb.Resource) string {
 	sAttrs := sortedAttributes(res.GetAttributes())
 	rstr := ""
 	for _, attr := range sAttrs {
-		rstr = rstr + attr.String()
+		rstr += attr.String()
 	}
 	return rstr
 }
 
 func sortedAttributes(attrs []*commonpb.KeyValue) []*commonpb.KeyValue {
-	sort.Slice(attrs[:], func(i, j int) bool {
+	sort.Slice(attrs, func(i, j int) bool {
 		return attrs[i].Key < attrs[j].Key
 	})
 	return attrs

instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/mock_collector_test.go

@@ -136,7 +136,7 @@ func runMockCollectorWithConfig(t *testing.T, mockConfig *mockConfig) *mockColle
 	collectortracepb.RegisterTraceServiceServer(srv, mc.traceSvc)
 	mc.ln = newListener(ln)
 	go func() {
-		_ = srv.Serve((net.Listener)(mc.ln))
+		_ = srv.Serve(net.Listener(mc.ln))
 	}()
 
 	mc.endpoint = ln.Addr().String()

instrumentation/github.com/emicklei/go-restful/otelrestful/restfultest_test.go

@@ -82,7 +82,7 @@ func TestChildSpanNames(t *testing.T) {
 	container.Add(ws)
 
 	ws.Route(ws.GET("/book/{title}").To(func(_ *restful.Request, resp *restful.Response) {
-		_, _ = resp.Write(([]byte)("ok"))
+		_, _ = resp.Write([]byte("ok"))
 	}))
 
 	r := httptest.NewRequest(http.MethodGet, "/user/123", http.NoBody)

instrumentation/github.com/gorilla/mux/otelmux/example_test.go

@@ -39,7 +39,7 @@ func Example() {
 		id := vars["id"]
 		name := getUser(r.Context(), id)
 		reply := fmt.Sprintf("user %s (id %s)\n", name, id)
-		_, _ = w.Write(([]byte)(reply))
+		_, _ = w.Write([]byte(reply))
 	}))
 	http.Handle("/", r)
 	_ = http.ListenAndServe(":8080", nil) //nolint:gosec // Ignoring G114: Use of net/http serve function that has no support for setting timeouts.

instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/internal/semconv/event_monitor.go

@@ -135,13 +135,19 @@ func commandStartedTraceAttrs(evt *event.CommandStartedEvent, setters ...Attribu
 
 	attrs := []attribute.KeyValue{semconv.DBSystemNameMongoDB}
 
-	attrs = append(attrs, semconv.DBOperationName(evt.CommandName))
-	attrs = append(attrs, semconv.DBNamespace(evt.DatabaseName))
-	attrs = append(attrs, semconv.NetworkTransportTCP)
+	attrs = append(
+		attrs,
+		semconv.DBOperationName(evt.CommandName),
+		semconv.DBNamespace(evt.DatabaseName),
+		semconv.NetworkTransportTCP,
+	)
 
 	hostname, port := peerInfo(evt)
-	attrs = append(attrs, semconv.NetworkPeerPort(port))
-	attrs = append(attrs, semconv.NetworkPeerAddress(net.JoinHostPort(hostname, strconv.Itoa(port))))
+	attrs = append(
+		attrs,
+		semconv.NetworkPeerPort(port),
+		semconv.NetworkPeerAddress(net.JoinHostPort(hostname, strconv.Itoa(port))),
+	)
 
 	if !opts.commandAttributeDisabled {
 		attrs = append(attrs, semconv.DBQueryText(sanitizeCommand(evt.Command)))
@@ -164,13 +170,19 @@ func commandStartedTraceAttrsV1210(evt *event.CommandStartedEvent, setters ...At
 
 	attrs := []attribute.KeyValue{semconv1210.DBSystemMongoDB}
 
-	attrs = append(attrs, semconv1210.DBOperation(evt.CommandName))
-	attrs = append(attrs, semconv1210.DBName(evt.DatabaseName))
-	attrs = append(attrs, semconv1210.NetTransportTCP)
+	attrs = append(
+		attrs,
+		semconv1210.DBOperation(evt.CommandName),
+		semconv1210.DBName(evt.DatabaseName),
+		semconv1210.NetTransportTCP,
+	)
 
 	hostname, port := peerInfo(evt)
-	attrs = append(attrs, semconv1210.NetPeerPort(port))
-	attrs = append(attrs, semconv1210.NetPeerName(hostname))
+	attrs = append(
+		attrs,
+		semconv1210.NetPeerPort(port),
+		semconv1210.NetPeerName(hostname),
+	)
 
 	if !opts.commandAttributeDisabled {
 		attrs = append(attrs, semconv1210.DBStatement(sanitizeCommand(evt.Command)))

instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/mongo_test.go

@@ -85,9 +85,9 @@ func TestDBCrudOperation(t *testing.T) {
 
 		title := tc.title
 		if tc.excludeCommand {
-			title = title + "/excludeCommand"
+			title += "/excludeCommand"
 		} else {
-			title = title + "/includeCommand"
+			title += "/includeCommand"
 		}
 
 		mt := mtest.New(t, mtest.NewOptions().ClientType(mtest.Mock))

instrumentation/go.mongodb.org/mongo-driver/v2/mongo/otelmongo/mongo_test.go

@@ -85,9 +85,9 @@ func TestDBCrudOperation(t *testing.T) {
 
 		title := tc.title
 		if tc.excludeCommand {
-			title = title + "/excludeCommand"
+			title += "/excludeCommand"
 		} else {
-			title = title + "/includeCommand"
+			title += "/includeCommand"
 		}
 
 		t.Run(title, func(t *testing.T) {

propagators/aws/xray/propagator_test.go

@@ -271,10 +271,8 @@ func TestInject(t *testing.T) {
 				if headerVal != tc.wantHeaderVal {
 					t.Errorf("expected header value %q, got %q", tc.wantHeaderVal, headerVal)
 				}
-			} else {
-				if headerVal != "" {
-					t.Errorf("expected no header to be set, but got %q", headerVal)
-				}
+			} else if headerVal != "" {
+				t.Errorf("expected no header to be set, but got %q", headerVal)
 			}
 		})
 	}