chore: migrate golangci-lint to v2.3.0 (#765)

mmorel-35 · web-flow · commit ba0937443b4b · 2025-07-25T18:18:14.000-07:00
Signed-off-by: Matthieu MOREL &lt;matthieu.morel35@gmail.com&gt;
diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
@@ -41,11 +41,11 @@ $(GOIMPORTS): $(BINGO_DIR)/goimports.mod
 	@echo "(re)installing $(GOBIN)/goimports-v0.7.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goimports.mod -o=$(GOBIN)/goimports-v0.7.0 "golang.org/x/tools/cmd/goimports"
 
-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.64.5
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.3.0
 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/golangci-lint-v1.64.5"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.64.5 "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	@echo "(re)installing $(GOBIN)/golangci-lint-v2.3.0"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.3.0 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
 
 MDOX := $(GOBIN)/mdox-v0.9.0
 $(MDOX): $(BINGO_DIR)/mdox.mod
diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod
@@ -1,7 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.23.0
+go 1.24.5
 
-toolchain go1.24.0
-
-require github.com/golangci/golangci-lint v1.64.5 // cmd/golangci-lint
+require github.com/golangci/golangci-lint/v2 v2.3.0 // cmd/golangci-lint
diff --git a/.bingo/golangci-lint.sum b/.bingo/golangci-lint.sum
diff --git a/.bingo/variables.env b/.bingo/variables.env
@@ -16,7 +16,7 @@ COPYRIGHT="${GOBIN}/copyright-v0.0.0-20210326193628-425a09c04e05"
 
 GOIMPORTS="${GOBIN}/goimports-v0.7.0"
 
-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.64.5"
+GOLANGCI_LINT="${GOBIN}/golangci-lint-v2.3.0"
 
 MDOX="${GOBIN}/mdox-v0.9.0"
 
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,13 +1,25 @@
 ---
+version: "2"
 
 run:
-  deadline: 5m
+  timeout: 5m
 
-output:
-  sort-results: true
+linters:
+  settings:
+    errcheck:
+      exclude-functions:
+        - (github.com/go-kit/log.Logger).Log
+  exclusions:
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
 
-linters-settings:
-  errcheck:
-    exclude: errcheck_excludes.txt
-  gofumpt:
-    extra-rules: true
+formatters:
+  enable:
+    - gofumpt
+    - goimports
+  settings:
+    gofumpt:
+      extra-rules: true
diff --git a/errcheck_excludes.txt b/errcheck_excludes.txt
diff --git a/examples/client/main.go b/examples/client/main.go
@@ -118,7 +118,6 @@ func main() {
 				return err
 			}
 		}
-
 	}, func(err error) {
 		cancel()
 	})
diff --git a/interceptors/auth/auth_test.go b/interceptors/auth/auth_test.go
@@ -32,7 +32,7 @@ var (
 
 // TODO(mwitkow): Add auth from metadata client dialer, which requires TLS.
 
-func buildDummyAuthFunction(expectedScheme string, expectedToken string) func(ctx context.Context) (context.Context, error) {
+func buildDummyAuthFunction(expectedScheme, expectedToken string) func(ctx context.Context) (context.Context, error) {
 	return func(ctx context.Context) (context.Context, error) {
 		token, err := auth.AuthFromMD(ctx, expectedScheme)
 		if err != nil {
@@ -64,7 +64,7 @@ func (s *assertingPingService) PingList(ping *testpb.PingListRequest, stream tes
 	return s.TestServiceServer.PingList(ping, stream)
 }
 
-func ctxWithToken(ctx context.Context, scheme string, token string) context.Context {
+func ctxWithToken(ctx context.Context, scheme, token string) context.Context {
 	md := grpcMetadata.Pairs("authorization", fmt.Sprintf("%s %v", scheme, token))
 	return metadata.MD(md).ToOutgoing(ctx)
 }
diff --git a/interceptors/callmeta.go b/interceptors/callmeta.go
@@ -43,6 +43,7 @@ func NewServerCallMeta(fullMethod string, streamInfo *grpc.StreamServerInfo, req
 	c.Service, c.Method = splitFullMethodName(fullMethod)
 	return c
 }
+
 func (c CallMeta) FullMethod() string {
 	return fmt.Sprintf("/%s/%s", c.Service, c.Method)
 }
diff --git a/interceptors/client_test.go b/interceptors/client_test.go
@@ -71,7 +71,6 @@ func (m *mockReportable) Equal(t *testing.T, expected []*mockReport) {
 		}
 
 	}
-
 }
 
 func (m *mockReportable) requireOneReportWithRetry(ctx context.Context, t *testing.T, expected *mockReport) {
@@ -303,10 +302,8 @@ func (s *ClientInterceptorTestSuite) TestBiStreamingReporting() {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		for {
-			if s.ctx.Err() != nil {
-				break
-			}
+		for s.ctx.Err() == nil {
+
 			_, err := ss.Recv()
 			if err == io.EOF {
 				break
diff --git a/interceptors/logging/interceptors.go b/interceptors/logging/interceptors.go
@@ -73,7 +73,7 @@ func (c *reporter) PostMsgSend(payload any, err error, duration time.Duration) {
 		return
 	}
 	callType := "response"
-	if c.CallMeta.IsClient {
+	if c.IsClient {
 		callType = "request"
 	}
 	p, ok := payload.(proto.Message)
@@ -114,7 +114,7 @@ func (c *reporter) PostMsgReceive(payload any, err error, duration time.Duration
 		return
 	}
 	callType := "request"
-	if c.CallMeta.IsClient {
+	if c.IsClient {
 		callType = "response"
 	}
 	p, ok := payload.(proto.Message)
diff --git a/interceptors/logging/interceptors_test.go b/interceptors/logging/interceptors_test.go
@@ -114,6 +114,7 @@ func (o *output) Append(lines ...LogLine) {
 
 	o.lines = append(o.lines, lines...)
 }
+
 func (o *output) Reset() {
 	o.m.Lock()
 	defer o.m.Unlock()
@@ -147,7 +148,7 @@ func (l *mockLogger) Log(_ context.Context, lvl logging.Level, msg string, args
 			panic(err)
 		}
 		// Trim spaces for deterministic output (https://github.com/goolang/protobuf/issues/1269).
-		line.fields[args[i].(string)] = string(bytes.Replace(payload, []byte{' '}, []byte{}, -1))
+		line.fields[args[i].(string)] = string(bytes.ReplaceAll(payload, []byte{' '}, []byte{}))
 	}
 	l.o.Append(line)
 }
@@ -202,7 +203,7 @@ func TestSuite(t *testing.T) {
 			},
 		},
 	}
-	s.InterceptorTestSuite.ClientOpts = []grpc.DialOption{
+	s.ClientOpts = []grpc.DialOption{
 		grpc.WithChainUnaryInterceptor(
 			logging.UnaryClientInterceptor(s.logger, logging.WithLevels(customClientCodeToLevel), logging.WithFieldsFromContext(customFields)),
 		),
@@ -213,7 +214,7 @@ func TestSuite(t *testing.T) {
 	errorFields := func(err error) logging.Fields {
 		return testpb.ExtractErrorFields(err)
 	}
-	s.InterceptorTestSuite.ServerOpts = []grpc.ServerOption{
+	s.ServerOpts = []grpc.ServerOption{
 		grpc.StreamInterceptor(logging.StreamServerInterceptor(s.logger, logging.WithLevels(customClientCodeToLevel), logging.WithFieldsFromContext(customFields), logging.WithErrorFields(errorFields))),
 		grpc.UnaryInterceptor(logging.UnaryServerInterceptor(s.logger, logging.WithLevels(customClientCodeToLevel), logging.WithFieldsFromContext(customFields), logging.WithErrorFields(errorFields))),
 	}
@@ -413,11 +414,11 @@ func TestCustomDurationSuite(t *testing.T) {
 			},
 		},
 	}
-	s.InterceptorTestSuite.ClientOpts = []grpc.DialOption{
+	s.ClientOpts = []grpc.DialOption{
 		grpc.WithUnaryInterceptor(logging.UnaryClientInterceptor(s.logger, logging.WithDurationField(logging.DurationToDurationField))),
 		grpc.WithStreamInterceptor(logging.StreamClientInterceptor(s.logger, logging.WithDurationField(logging.DurationToDurationField))),
 	}
-	s.InterceptorTestSuite.ServerOpts = []grpc.ServerOption{
+	s.ServerOpts = []grpc.ServerOption{
 		grpc.StreamInterceptor(logging.StreamServerInterceptor(s.logger, logging.WithDurationField(logging.DurationToDurationField))),
 		grpc.UnaryInterceptor(logging.UnaryServerInterceptor(s.logger, logging.WithDurationField(logging.DurationToDurationField))),
 	}
@@ -520,7 +521,7 @@ func TestPayloadSuite(t *testing.T) {
 			},
 		},
 	}
-	s.InterceptorTestSuite.ClientOpts = []grpc.DialOption{
+	s.ClientOpts = []grpc.DialOption{
 		grpc.WithUnaryInterceptor(logging.UnaryClientInterceptor(
 			s.logger,
 			logging.WithLogOnEvents(logging.PayloadReceived, logging.PayloadSent),
@@ -531,7 +532,7 @@ func TestPayloadSuite(t *testing.T) {
 			logging.WithLevels(logging.DefaultClientCodeToLevel),
 		)),
 	}
-	s.InterceptorTestSuite.ServerOpts = []grpc.ServerOption{
+	s.ServerOpts = []grpc.ServerOption{
 		grpc.StreamInterceptor(logging.StreamServerInterceptor(s.logger,
 			logging.WithLogOnEvents(logging.PayloadReceived, logging.PayloadSent),
 			logging.WithLevels(logging.DefaultServerCodeToLevel),
@@ -682,11 +683,11 @@ func TestCustomGrpcLogFieldsSuite(t *testing.T) {
 			},
 		},
 	}
-	s.InterceptorTestSuite.ClientOpts = []grpc.DialOption{
+	s.ClientOpts = []grpc.DialOption{
 		grpc.WithUnaryInterceptor(logging.UnaryClientInterceptor(s.logger, logging.WithDisableLoggingFields(logging.ComponentFieldKey, logging.MethodTypeFieldKey, logging.SystemTag[0], "custom-field-should-be-ignored"))),
 		grpc.WithStreamInterceptor(logging.StreamClientInterceptor(s.logger, logging.WithDisableLoggingFields(logging.ComponentFieldKey, logging.MethodTypeFieldKey, logging.SystemTag[0], "custom-field-should-be-ignored"))),
 	}
-	s.InterceptorTestSuite.ServerOpts = []grpc.ServerOption{
+	s.ServerOpts = []grpc.ServerOption{
 		grpc.StreamInterceptor(logging.StreamServerInterceptor(s.logger, logging.WithDisableLoggingFields(logging.ComponentFieldKey, logging.MethodTypeFieldKey, logging.SystemTag[0], "custom-field-should-be-ignored"))),
 		grpc.UnaryInterceptor(logging.UnaryServerInterceptor(s.logger, logging.WithDisableLoggingFields(logging.ComponentFieldKey, logging.MethodTypeFieldKey, logging.SystemTag[0], "custom-field-should-be-ignore"))),
 	}
diff --git a/interceptors/logging/logging.go b/interceptors/logging/logging.go
@@ -21,16 +21,16 @@ var (
 	MethodTypeFieldKey   = "grpc.method_type"
 )
 
-type fieldsCtxMarker struct{}
-type fieldsCtxValue struct {
-	fields Fields
-}
-
-var (
-	// fieldsCtxMarkerKey is the Context value marker that is used by logging middleware to read and write logging fields into context.
-	fieldsCtxMarkerKey = &fieldsCtxMarker{}
+type (
+	fieldsCtxMarker struct{}
+	fieldsCtxValue  struct {
+		fields Fields
+	}
 )
 
+// fieldsCtxMarkerKey is the Context value marker that is used by logging middleware to read and write logging fields into context.
+var fieldsCtxMarkerKey = &fieldsCtxMarker{}
+
 func newCommonFields(kind string, c interceptors.CallMeta) Fields {
 	return Fields{
 		SystemTag[0], SystemTag[1],
diff --git a/interceptors/logging/options.go b/interceptors/logging/options.go
@@ -42,17 +42,15 @@ func has(events []LoggableEvent, event LoggableEvent) bool {
 	return false
 }
 
-var (
-	defaultOptions = &options{
-		loggableEvents:    []LoggableEvent{StartCall, FinishCall},
-		codeFunc:          DefaultErrorToCode,
-		durationFieldFunc: DefaultDurationToFields,
-		// levelFunc depends if it's client or server.
-		levelFunc:            nil,
-		timestampFormat:      time.RFC3339,
-		disableGrpcLogFields: nil,
-	}
-)
+var defaultOptions = &options{
+	loggableEvents:    []LoggableEvent{StartCall, FinishCall},
+	codeFunc:          DefaultErrorToCode,
+	durationFieldFunc: DefaultDurationToFields,
+	// levelFunc depends if it's client or server.
+	levelFunc:            nil,
+	timestampFormat:      time.RFC3339,
+	disableGrpcLogFields: nil,
+}
 
 type options struct {
 	levelFunc               CodeToLevel
diff --git a/interceptors/ratelimit/ratelimit.go b/interceptors/ratelimit/ratelimit.go
@@ -44,7 +44,8 @@ func StreamServerInterceptor(limiter Limiter) grpc.StreamServerInterceptor {
 // saving cost.
 func UnaryClientInterceptor(limiter Limiter) grpc.UnaryClientInterceptor {
 	return func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn,
-		invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
+		invoker grpc.UnaryInvoker, opts ...grpc.CallOption,
+	) error {
 		if err := limiter.Limit(ctx); err != nil {
 			return status.Errorf(codes.ResourceExhausted, "%s is rejected by grpc_ratelimit middleware, please retry later. %s", method, err)
 		}
diff --git a/interceptors/recovery/examples_test.go b/interceptors/recovery/examples_test.go
@@ -13,9 +13,7 @@ import (
 	"google.golang.org/grpc/status"
 )
 
-var (
-	customFunc recovery.RecoveryHandlerFunc
-)
+var customFunc recovery.RecoveryHandlerFunc
 
 // Initialization shows an initialization sequence with a custom recovery handler func.
 func Example_initialization() {
diff --git a/interceptors/recovery/options.go b/interceptors/recovery/options.go
@@ -8,11 +8,9 @@ package recovery
 
 import "context"
 
-var (
-	defaultOptions = &options{
-		recoveryHandlerFunc: nil,
-	}
-)
+var defaultOptions = &options{
+	recoveryHandlerFunc: nil,
+}
 
 type options struct {
 	recoveryHandlerFunc RecoveryHandlerFuncContext
diff --git a/interceptors/reporter.go b/interceptors/reporter.go
@@ -19,14 +19,12 @@ const (
 	BidiStream   GRPCType = "bidi_stream"
 )
 
-var (
-	AllCodes = []codes.Code{
-		codes.OK, codes.Canceled, codes.Unknown, codes.InvalidArgument, codes.DeadlineExceeded, codes.NotFound,
-		codes.AlreadyExists, codes.PermissionDenied, codes.Unauthenticated, codes.ResourceExhausted,
-		codes.FailedPrecondition, codes.Aborted, codes.OutOfRange, codes.Unimplemented, codes.Internal,
-		codes.Unavailable, codes.DataLoss,
-	}
-)
+var AllCodes = []codes.Code{
+	codes.OK, codes.Canceled, codes.Unknown, codes.InvalidArgument, codes.DeadlineExceeded, codes.NotFound,
+	codes.AlreadyExists, codes.PermissionDenied, codes.Unauthenticated, codes.ResourceExhausted,
+	codes.FailedPrecondition, codes.Aborted, codes.OutOfRange, codes.Unimplemented, codes.Internal,
+	codes.Unavailable, codes.DataLoss,
+}
 
 type ClientReportable interface {
 	ClientReporter(context.Context, CallMeta) (Reporter, context.Context)
diff --git a/interceptors/server_test.go b/interceptors/server_test.go
@@ -150,10 +150,8 @@ func (s *ServerInterceptorTestSuite) TestBiStreamingReporting() {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		for {
-			if s.ctx.Err() != nil {
-				break
-			}
+		for s.ctx.Err() == nil {
+
 			_, err := ss.Recv()
 			if err == io.EOF {
 				break
diff --git a/interceptors/timeout/timeout_test.go b/interceptors/timeout/timeout_test.go
@@ -35,7 +35,7 @@ func TestTimeoutUnaryClientInterceptor(t *testing.T) {
 		},
 		TestService: server,
 	}
-	its.Suite.SetT(t)
+	its.SetT(t)
 	its.SetupSuite()
 	defer its.TearDownSuite()
 
diff --git a/metadata/metadata.go b/metadata/metadata.go
@@ -108,7 +108,7 @@ func (m MD) Del(key string) MD {
 // It works analogously to http.Header.Set, overwriting all previous metadata values.
 //
 // The function is binary-key safe.
-func (m MD) Set(key string, value string) MD {
+func (m MD) Set(key, value string) MD {
 	k, v := encodeKeyValue(key, value)
 	m[k] = []string{v}
 	return m
@@ -119,7 +119,7 @@ func (m MD) Set(key string, value string) MD {
 // It works analogously to http.Header.Add, as it appends to any existing values associated with key.
 //
 // The function is binary-key safe.
-func (m MD) Add(key string, value string) MD {
+func (m MD) Add(key, value string) MD {
 	k, v := encodeKeyValue(key, value)
 	m[k] = append(m[k], v)
 	return m
diff --git a/providers/prometheus/server_options.go b/providers/prometheus/server_options.go
@@ -9,8 +9,10 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-type exemplarFromCtxFn func(ctx context.Context) prometheus.Labels
-type labelsFromCtxFn func(metadata context.Context) prometheus.Labels
+type (
+	exemplarFromCtxFn func(ctx context.Context) prometheus.Labels
+	labelsFromCtxFn   func(metadata context.Context) prometheus.Labels
+)
 
 type serverMetricsConfig struct {
 	counterOpts counterOptions

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,6 @@ func main() {`
`118`	`118`	`return err`
`119`	`119`	`}`
`120`	`120`	`}`
`121`		`-`
`122`	`121`	`}, func(err error) {`
`123`	`122`	`cancel()`
`124`	`123`	`})`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ var (`
`32`	`32`
`33`	`33`	`// TODO(mwitkow): Add auth from metadata client dialer, which requires TLS.`
`34`	`34`
`35`		`-func buildDummyAuthFunction(expectedScheme string, expectedToken string) func(ctx context.Context) (context.Context, error) {`
	`35`	`+func buildDummyAuthFunction(expectedScheme, expectedToken string) func(ctx context.Context) (context.Context, error) {`
`36`	`36`	`return func(ctx context.Context) (context.Context, error) {`
`37`	`37`	`token, err := auth.AuthFromMD(ctx, expectedScheme)`
`38`	`38`	`if err != nil {`
`@@ -64,7 +64,7 @@ func (s assertingPingService) PingList(ping testpb.PingListRequest, stream tes`
`64`	`64`	`return s.TestServiceServer.PingList(ping, stream)`
`65`	`65`	`}`
`66`	`66`
`67`		`-func ctxWithToken(ctx context.Context, scheme string, token string) context.Context {`
	`67`	`+func ctxWithToken(ctx context.Context, scheme, token string) context.Context {`
`68`	`68`	`md := grpcMetadata.Pairs("authorization", fmt.Sprintf("%s %v", scheme, token))`
`69`	`69`	`return metadata.MD(md).ToOutgoing(ctx)`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ func NewServerCallMeta(fullMethod string, streamInfo *grpc.StreamServerInfo, req`
`43`	`43`	`c.Service, c.Method = splitFullMethodName(fullMethod)`
`44`	`44`	`return c`
`45`	`45`	`}`
	`46`	`+`
`46`	`47`	`func (c CallMeta) FullMethod() string {`
`47`	`48`	`return fmt.Sprintf("/%s/%s", c.Service, c.Method)`
`48`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ func (m mockReportable) Equal(t testing.T, expected []*mockReport) {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`}`
`74`		`-`
`75`	`74`	`}`
`76`	`75`
`77`	`76`	`func (m mockReportable) requireOneReportWithRetry(ctx context.Context, t testing.T, expected *mockReport) {`
`@@ -303,10 +302,8 @@ func (s *ClientInterceptorTestSuite) TestBiStreamingReporting() {`
`303`	`302`	`wg.Add(1)`
`304`	`303`	`go func() {`
`305`	`304`	`defer wg.Done()`
`306`		`- for {`
`307`		`- if s.ctx.Err() != nil {`
`308`		`- break`
`309`		`- }`
	`305`	`+ for s.ctx.Err() == nil {`
	`306`	`+`
`310`	`307`	`_, err := ss.Recv()`
`311`	`308`	`if err == io.EOF {`
`312`	`309`	`break`