chore: update golangci-lint configuration and improve test formatting

This commit modifies the .golangci.yml file to update the version and adjust the enabled linters, while also refining the exclusion rules for test files. Additionally, it enhances the formatting of test files by removing unnecessary blank lines and ensuring consistent comment formatting across various test cases. The GitHub Actions workflow is updated to use the latest Go version and golangci-lint action, improving the CI process.

Author: strider2038

.github/workflows/tests.yml

@@ -10,22 +10,23 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.20
+          go-version: ^1.21
+          cache-dependency-path: go.sum
         id: go
 
-      - name: Checkout code
-        uses: actions/checkout@v2
-
       - name: Set up dependencies
         run: go mod download
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v9
         with:
-          version: v1.52
+          version: v2.6.1
 
       - name: Run tests
-        run: go test -v $(go list ./... | grep -v vendor)
+        run: go test -race -v ./...

.golangci.yml

@@ -1,6 +1,4 @@
-run:
-  skip-dirs:
-    - var
+version: "2"
 linters:
   enable:
     - asciicheck
@@ -11,7 +9,6 @@ linters:
     - dogsled
     - dupl
     - durationcheck
-    - exportloopref
     - forbidigo
     - funlen
     - gocognit
@@ -20,68 +17,98 @@ linters:
     - gocyclo
     - godot
     - godox
-    - gofmt
-    - gofumpt
-    - goimports
     - gomodguard
     - goprintffuncname
     - gosec
-    - gosimple
-    - govet
     - importas
-    - ineffassign
     - lll
     - makezero
     - misspell
     - nakedret
     - nestif
     - nilerr
     - noctx
-    - noctx
     - nolintlint
     - prealloc
     - predeclared
     - promlinter
     - revive
-    - stylecheck
-    - tenv
+    - staticcheck
     - testpackage
     - thelper
     - tparallel
-    - typecheck
     - unconvert
     - unparam
-    - unused
     - whitespace
-
-issues:
-  exclude-rules:
-    # Exclude some linters from running on tests files.
-    - path: _test\.go
-      linters:
-        - contextcheck
-        - cyclop
-        - dupl
-        - errcheck
-        - exportloopref
-        - funlen
-        - gochecknoglobals
-        - goconst
-        - gocritic
-        - gocyclo
-        - gosec
-        - lll
-    - path: errors\.go
-      linters:
-        - errcheck
-    - path: stack\.go
-      linters:
-        - errcheck
-        - goconst
-        - gocritic
-
-linters-settings:
-  revive:
+  settings:
+    depguard:
+      rules:
+        main:
+          files:
+            - $all
+            - '!$test'
+            - '!**/test/**/*'
+          allow:
+            - $gostd
+            - github.com
+        test:
+          files:
+            - $test
+          allow:
+            - $gostd
+            - github.com
+    revive:
+      rules:
+        - name: var-naming
+          disabled: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      - name: var-naming
-        disabled: true
+      - linters:
+          - contextcheck
+          - cyclop
+          - dupl
+          - errcheck
+          - exportloopref
+          - funlen
+          - gochecknoglobals
+          - gocognit
+          - goconst
+          - gocritic
+          - gocyclo
+          - gosec
+          - lll
+          - nestif
+        path: _test\.go
+      - linters:
+          - errcheck
+        path: errors\.go
+      - linters:
+          - nestif
+        path: errorstest
+      - linters:
+          - errcheck
+          - goconst
+          - gocritic
+        path: stack\.go
+    paths:
+      - var
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

assertions_test.go

@@ -34,8 +34,8 @@ func assertFormatRegexp(t *testing.T, arg interface{}, format, want string) {
 	t.Helper()
 
 	got := fmt.Sprintf(format, arg)
-	gotLines := strings.SplitN(got, "\n", -1)
-	wantLines := strings.SplitN(want, "\n", -1)
+	gotLines := strings.Split(got, "\n")
+	wantLines := strings.Split(want, "\n")
 
 	if len(wantLines) > len(gotLines) {
 		t.Errorf("wantLines(%d) > gotLines(%d):\n got: %q\nwant: %q", len(wantLines), len(gotLines), got, want)

errors.go

@@ -250,16 +250,16 @@ func (e *stacked) Format(s fmt.State, verb rune) {
 	switch verb {
 	case 'v':
 		if s.Flag('+') {
-			io.WriteString(s, e.wrapped.Error())
-			writeAttrs(s, e.wrapped.Attrs(), "")
+			io.WriteString(s, e.Error())
+			writeAttrs(s, e.Attrs(), "")
 			e.stack.Format(s, verb)
 			return
 		}
 		fallthrough
 	case 's':
-		io.WriteString(s, e.wrapped.Error())
+		io.WriteString(s, e.Error())
 	case 'q':
-		fmt.Fprintf(s, "%q", e.wrapped.Error())
+		fmt.Fprintf(s, "%q", e.Error())
 	}
 }
 
@@ -294,7 +294,7 @@ func splitArgsAndOptions(argsAndOptions []interface{}) ([]interface{}, []Option)
 	return args, options
 }
 
-// isOptionOrAttr checks if a value is either an Option or slog.Attr
+// isOptionOrAttr checks if a value is either an Option or slog.Attr.
 func isOptionOrAttr(v interface{}) bool {
 	if _, ok := v.(Option); ok {
 		return true
@@ -305,7 +305,7 @@ func isOptionOrAttr(v interface{}) bool {
 	return false
 }
 
-// convertToOptions converts a slice of Option and/or slog.Attr to []Option
+// convertToOptions converts a slice of Option and/or slog.Attr to []Option.
 func convertToOptions(items []interface{}) []Option {
 	options := make([]Option, 0, len(items))
 	for _, item := range items {
@@ -396,7 +396,7 @@ func writeAttrs(w io.Writer, attrs []slog.Attr, prefix string) {
 	}
 }
 
-// writeAttr writes a single attribute value to an io.Writer
+// writeAttr writes a single attribute value to an io.Writer.
 func writeAttr(w io.Writer, key string, value slog.Value) {
 	io.WriteString(w, "\n"+key+": ")
 
@@ -433,7 +433,7 @@ func writeAttr(w io.Writer, key string, value slog.Value) {
 			}
 		case json.RawMessage:
 			// Format JSON as string
-			io.WriteString(w, string(typed))
+			w.Write(typed)
 		default:
 			// Default formatting
 			io.WriteString(w, fmt.Sprintf("%v", v))

errors_test.go

@@ -316,7 +316,7 @@ func TestFields(t *testing.T) {
 			if len(attrs) == 0 {
 				t.Fatalf("expected %#v to have attributes", test.err)
 			}
-			
+
 			// Find the "key" attribute
 			var found bool
 			var value interface{}
@@ -327,11 +327,11 @@ func TestFields(t *testing.T) {
 					break
 				}
 			}
-			
+
 			if !found {
 				t.Fatalf("expected %#v to have attribute with key 'key'", test.err)
 			}
-			
+
 			if !reflect.DeepEqual(value, test.expected) {
 				t.Errorf("want value %v (%T), got %v (%T)", test.expected, test.expected, value, value)
 			}

errorstest/mock.go

@@ -51,7 +51,7 @@ func (m *Logger) AssertField(t *testing.T, key string, expected interface{}) {
 	}
 }
 
-// findAttr recursively searches for an attribute by key, handling groups with dot notation
+// findAttr recursively searches for an attribute by key, handling groups with dot notation.
 func (m *Logger) findAttr(key string, attrs []slog.Attr, prefix string) (interface{}, bool) {
 	for _, attr := range attrs {
 		if attr.Value.Kind() == slog.KindGroup {
@@ -157,7 +157,7 @@ func (m *Logger) AssertStackTrace(t *testing.T, want StackTrace) {
 	}
 }
 
-// attrsEqual compares two slog.Attr values for equality
+// attrsEqual compares two slog.Attr values for equality.
 func attrsEqual(a, b slog.Attr) bool {
 	if a.Key != b.Key {
 		return false

example_log_test.go

@@ -125,7 +125,7 @@ func ExampleLog_typicalErrorHandling() {
 
 		// Get attributes from error
 		attrs := errors.Attrs(notFoundError)
-		
+
 		// Get stack trace
 		var stackTrace errors.StackTrace
 		for e := notFoundError; e != nil; e = errors.Unwrap(e) {
@@ -134,7 +134,7 @@ func ExampleLog_typicalErrorHandling() {
 				break
 			}
 		}
-		
+
 		fmt.Println(`log repository error, attrs count:`, len(attrs))
 		fmt.Printf(
 			"log repository error, first line of stack trace: %s %s:%d\n",
@@ -165,13 +165,13 @@ func ExampleLog_typicalErrorHandling() {
 
 		// Get attributes from error
 		attrs := errors.Attrs(sqlError)
-		
+
 		// Create a map for display
 		fields := make(map[string]interface{})
 		for _, attr := range attrs {
 			fields[attr.Key] = attr.Value.Any()
 		}
-		
+
 		// Get stack trace
 		var stackTrace errors.StackTrace
 		for e := sqlError; e != nil; e = errors.Unwrap(e) {
@@ -180,7 +180,7 @@ func ExampleLog_typicalErrorHandling() {
 				break
 			}
 		}
-		
+
 		fmt.Println(`log repository error, fields:`, fields)
 		fmt.Printf(
 			"log repository error, first line of stack trace: %s %s:%d\n",

example_loggable_test.go

@@ -40,13 +40,13 @@ func ExampleLog_loggableError() {
 
 	// Get attributes from error
 	attrs := errors.Attrs(err)
-	
+
 	// Create a map for display
 	fields := make(map[string]interface{})
 	for _, attr := range attrs {
 		fields[attr.Key] = attr.Value.Any()
 	}
-	
+
 	// Get stack trace
 	var stackTrace errors.StackTrace
 	for e := err; e != nil; e = errors.Unwrap(e) {
@@ -55,7 +55,7 @@ func ExampleLog_loggableError() {
 			break
 		}
 	}
-	
+
 	fmt.Println(`error message:`, err.Error())
 	fmt.Println(`error fields:`, fields)
 	fmt.Printf(