update

lucacome · lucacome · commit 250c987ea381 · 2026-04-14T19:13:09.000-07:00
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -22,22 +22,22 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Golang Environment
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: stable
 
       - name: Lint Go
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v9
 
   actionlint:
     name: Actionlint
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Lint Actions
         uses: reviewdog/action-actionlint@v1
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,34 +1,6 @@
-linters-settings:
-  misspell:
-    locale: US
-  revive:
-    ignore-generated-header: true
-    rules:
-      - name: blank-imports
-      - name: context-as-argument
-      - name: context-keys-type
-      - name: dot-imports
-      - name: empty-block
-      - name: error-naming
-      - name: error-return
-      - name: error-strings
-      - name: errorf
-      - name: exported
-      - name: increment-decrement
-      - name: indent-error-flow
-      - name: package-comments
-      - name: range
-      - name: receiver-naming
-      - name: redefines-builtin-id
-      - name: superfluous-else
-      - name: time-naming
-      - name: unexported-return
-      - name: unreachable-code
-      - name: var-declaration
-      - name: var-naming
-  govet:
-    enable-all: true
+version: "2"
 linters:
+  default: none
   enable:
     - asasalint
     - asciicheck
@@ -47,11 +19,7 @@ linters:
     - gochecksumtype
     - gocritic
     - godot
-    - gofmt
-    - gofumpt
-    - goimports
     - gosec
-    - gosimple
     - gosmopolitan
     - govet
     - ineffassign
@@ -69,22 +37,66 @@ linters:
     - reassign
     - revive
     - staticcheck
-    - stylecheck
     - tagalign
-    - tenv
     - thelper
     - tparallel
-    - typecheck
     - unconvert
     - unparam
     - unused
     - usestdlibvars
     - wastedassign
     - whitespace
-    # - wrapcheck
-  disable-all: true
+  settings:
+    govet:
+      enable-all: true
+    misspell:
+      locale: US
+    revive:
+      rules:
+        - name: blank-imports
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: dot-imports
+        - name: empty-block
+        - name: error-naming
+        - name: error-return
+        - name: error-strings
+        - name: errorf
+        - name: exported
+        - name: increment-decrement
+        - name: indent-error-flow
+        - name: package-comments
+        - name: range
+        - name: receiver-naming
+        - name: redefines-builtin-id
+        - name: superfluous-else
+        - name: time-naming
+        - name: unexported-return
+        - name: unreachable-code
+        - name: var-declaration
+        - name: var-naming
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
-run:
-  timeout: 5m
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/log/log.go b/log/log.go
@@ -136,7 +136,7 @@ func Fatal(log string, fields ...zapcore.Field) {
 
 func logSpan(span opentracing.Span, log string, fields ...zapcore.Field) {
 	if span != nil {
-		opentracingFields := make([]opentracinglog.Field, len(fields)+1)
+		opentracingFields := make([]opentracinglog.Field, 0, len(fields)+1)
 		if log != "" {
 			opentracingFields = append(opentracingFields, opentracinglog.String("event", log))
 		}
diff --git a/utils/fields.go b/utils/fields.go
@@ -32,25 +32,31 @@ func ZapFieldToOpentracing(zapField zapcore.Field) opentracinglog.Field {
 		}
 		return opentracinglog.Bool(zapField.Key, val)
 	case zapcore.Float32Type:
-		return opentracinglog.Float32(zapField.Key, math.Float32frombits(uint32(zapField.Integer)))
+		return opentracinglog.Float32(zapField.Key, math.Float32frombits(uint32(zapField.Integer))) //nolint:gosec // G115: intentional bit-pattern conversion matching zap's encoding
 	case zapcore.Float64Type:
-		return opentracinglog.Float64(zapField.Key, math.Float64frombits(uint64(zapField.Integer)))
+		return opentracinglog.Float64(zapField.Key, math.Float64frombits(uint64(zapField.Integer))) //nolint:gosec // G115: intentional bit-pattern conversion matching zap's encoding
 	case zapcore.Int64Type:
-		return opentracinglog.Int64(zapField.Key, int64(zapField.Integer))
+		return opentracinglog.Int64(zapField.Key, zapField.Integer)
 	case zapcore.Int32Type:
-		return opentracinglog.Int32(zapField.Key, int32(zapField.Integer))
+		return opentracinglog.Int32(zapField.Key, int32(zapField.Integer)) //nolint:gosec // G115: value was originally int32, stored as int64 by zap
 	case zapcore.StringType:
 		return opentracinglog.String(zapField.Key, zapField.String)
 	case zapcore.StringerType:
-		return opentracinglog.String(zapField.Key, zapField.Interface.(fmt.Stringer).String())
+		if s, ok := zapField.Interface.(fmt.Stringer); ok {
+			return opentracinglog.String(zapField.Key, s.String())
+		}
+		return opentracinglog.Object(zapField.Key, zapField.Interface)
 	case zapcore.Uint64Type:
-		return opentracinglog.Uint64(zapField.Key, uint64(zapField.Integer))
+		return opentracinglog.Uint64(zapField.Key, uint64(zapField.Integer)) //nolint:gosec // G115: value was originally uint64, stored as int64 by zap
 	case zapcore.Uint32Type:
-		return opentracinglog.Uint32(zapField.Key, uint32(zapField.Integer))
+		return opentracinglog.Uint32(zapField.Key, uint32(zapField.Integer)) //nolint:gosec // G115: value was originally uint32, stored as int64 by zap
 	case zapcore.DurationType:
 		return opentracinglog.String(zapField.Key, time.Duration(zapField.Integer).String())
 	case zapcore.ErrorType:
-		return opentracinglog.Error(zapField.Interface.(error))
+		if err, ok := zapField.Interface.(error); ok {
+			return opentracinglog.Error(err)
+		}
+		return opentracinglog.Object(zapField.Key, zapField.Interface)
 	default:
 		return opentracinglog.Object(zapField.Key, zapField.Interface)
 	}
diff --git a/utils/fields_test.go b/utils/fields_test.go
@@ -18,6 +18,7 @@ func (s stringer) String() string {
 }
 
 func TestFieldsConversion(t *testing.T) {
+	t.Parallel()
 	TestData := []struct {
 		ZapField         zapcore.Field
 		OpenTracingField opentracinglog.Field

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func Fatal(log string, fields ...zapcore.Field) {`
`136`	`136`
`137`	`137`	`func logSpan(span opentracing.Span, log string, fields ...zapcore.Field) {`
`138`	`138`	`if span != nil {`
`139`		`- opentracingFields := make([]opentracinglog.Field, len(fields)+1)`
	`139`	`+ opentracingFields := make([]opentracinglog.Field, 0, len(fields)+1)`
`140`	`140`	`if log != "" {`
`141`	`141`	`opentracingFields = append(opentracingFields, opentracinglog.String("event", log))`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ func (s stringer) String() string {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`func TestFieldsConversion(t *testing.T) {`
	`21`	`+ t.Parallel()`
`21`	`22`	`TestData := []struct {`
`22`	`23`	`ZapField zapcore.Field`
`23`	`24`	`OpenTracingField opentracinglog.Field`