Merge branch 'main' into trace-span-customer-err

Author: lawlielt

.github/dependabot.yml

@@ -4,84 +4,4 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/config/apollo"
-    schedule:
-      interval: "weekly"    
-  - package-ecosystem: "gomod"
-    directory: "/contrib/config/consul"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/config/etcd"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/config/kubernetes"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/config/nacos"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/encoding/msgpack"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/log/aliyun"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/log/zap"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/log/fluent"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/metrics/datadog"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/metrics/prometheus"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/opensergo"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/registry/apollo"
-    schedule:
-      interval: "weekly"    
-  - package-ecosystem: "gomod"
-    directory: "/contrib/registry/consul"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/registry/etcd"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/registry/kubernetes"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/registry/nacos"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/registry/zookeeper"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/registry/eureka"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "gomod"
-    directory: "/contrib/registry/polaris"
-    schedule:
-      interval: "weekly"
+      interval: "monthly"

.github/pull_request_template.md

@@ -35,6 +35,6 @@ Usage: `fixes/resolves #<issue number>`, or `fixes/resolves (paste link of issue
 
 #### Other special notes for the reviewers:
 <!--
-* Somethings that need extra attention for the reviewers
+* Some things that need extra attention for the reviewers
 * Some additional notes, TODO list, etc.
 -->

.github/workflows/gitee-sync.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v4
       - name: Mirror Github to Gitee
-        uses: Yikun/hub-mirror-action@v1.4
+        uses: Yikun/hub-mirror-action@v1.5
         with:
           src: github/go-kratos
           dst: gitee/go-kratos

.github/workflows/go.yml

@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        go: [ 1.20.x, 1.21.x, 1.22.x ]
+        go: [1.22.x, 1.23.x, 1.24.x]
     name: build & test
     runs-on: ubuntu-latest
     services:
@@ -25,7 +25,7 @@ jobs:
           ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
           ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
       consul:
-        image: consul:1.12.3
+        image: hashicorp/consul:1.20
         ports:
           - 8500:8500
       nacos:
@@ -44,7 +44,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v5.0.2
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
 

.github/workflows/lint.yml

@@ -29,8 +29,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.54.2
+          version: v2.0
           working-directory: ${{ matrix.workdir }}
           skip-pkg-cache: true

.golangci.yml

@@ -1,71 +1,71 @@
+version: "2"
 run:
-  timeout: 5m
   modules-download-mode: readonly
-
 linters:
-  disable-all: true
-  fast: false
+  default: none
   enable:
     - bodyclose
     - dogsled
     - durationcheck
     - errcheck
-    - exportloopref
-    - govet
-    - gosimple
-    - gofmt
-    - gofumpt
     - goconst
-    - goimports
-    - gomnd
     - gocyclo
+    - govet
     - ineffassign
     - lll
+    - misspell
+    - mnd
     - prealloc
     - revive
     - staticcheck
-    - typecheck
+    - unconvert
     - unused
-    - whitespace
     - wastedassign
-    - unconvert
-    - misspell
-
-  # don't enable:
-  # - asciicheck
-  # - scopelint
-  # - gochecknoglobals
-  # - gocognit
-  # - godot
-  # - godox
-  # - goerr113
-  # - interfacer
-  # - maligned
-  # - nestif
-  # - prealloc
-  # - testpackage
-  # - stylrcheck
-  # - wsl
-
-linters-settings:
-  govet:
-    check-shadowing: true
-  whitespace:
-    multi-func: true
-  lll:
-    line-length: 160
-  gomnd:
-    # don't include the "operation", "argument" and "assign"
-    checks: 
-      - case
-      - condition
-      - return
-  goconst:
-    ignore-tests: true
-  gocyclo:
-    # recommend 10-20
-    min-complexity: 50
-  goimports:
-    local-prefixes: github.com/go-kratos # Put imports beginning with prefix after 3rd-party packages
-  misspell: # Finds commonly misspelled English words in comments
-    locale: US
+    - whitespace
+  settings:
+    gocyclo:
+      min-complexity: 50
+    govet:
+      enable:
+        - shadow
+    lll:
+      line-length: 160
+    misspell:
+      locale: US
+    mnd:
+      checks:
+        - case
+        - condition
+        - return
+    whitespace:
+      multi-func: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - goconst
+        path: (.+)_test\.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/go-kratos
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -1,26 +1,24 @@
 user	:=	$(shell whoami)
 rev 	:= 	$(shell git rev-parse --short HEAD)
-os		:=	$(shell expr substr $(shell uname -s) 1 5)
+os		:=	$(shell uname)
 
 # GOBIN > GOPATH > INSTALLDIR
 # Mac OS X
-ifeq ($(shell uname),Darwin)
-GOBIN	:=	$(shell echo ${GOBIN} | cut -d':' -f1)
+ifeq ($(os),Darwin)
+GOBIN	:=	$(shell echo $(GOBIN) | cut -d':' -f1)
 GOPATH	:=	$(shell echo $(GOPATH) | cut -d':' -f1)
 endif
 
 # Linux
 ifeq ($(os),Linux)
-GOBIN	:=	$(shell echo ${GOBIN} | cut -d':' -f1)
+GOBIN	:=	$(shell echo $(GOBIN) | cut -d':' -f1)
 GOPATH	:=	$(shell echo $(GOPATH) | cut -d':' -f1)
 endif
 
 # Windows
-ifeq ($(os),MINGW)
-GOBIN	:=	$(subst \,/,$(GOBIN))
-GOPATH	:=	$(subst \,/,$(GOPATH))
-GOBIN :=/$(shell echo "$(GOBIN)" | cut -d';' -f1 | sed 's/://g')
-GOPATH :=/$(shell echo "$(GOPATH)" | cut -d';' -f1 | sed 's/://g')
+ifneq ($(findstring MINGW,$(shell uname -s)),)
+GOBIN := $(shell echo "$(GOBIN)" | sed 's|\\|/|g' | cut -d';' -f1 | sed 's|^\([A-Za-z]\):|/\1|')
+GOPATH := $(shell echo "$(GOPATH)" | sed 's|\\|/|g' | cut -d';' -f1 | sed 's|^\([A-Za-z]\):|/\1|')
 endif
 BIN		:= 	""
 

README.md

@@ -3,13 +3,16 @@
 <p align="center">
 <a href="https://github.com/go-kratos/kratos/actions"><img src="https://github.com/go-kratos/kratos/workflows/Go/badge.svg" alt="Build Status"></a>
 <a href="https://pkg.go.dev/github.com/go-kratos/kratos/v2"><img src="https://pkg.go.dev/badge/github.com/go-kratos/kratos/v2" alt="GoDoc"></a>
+<a href="https://deepwiki.com/go-kratos/kratos"><img src="https://img.shields.io/badge/DeepWiki-go--kratos%2Fkratos-blue.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAyCAYAAAAnWDnqAAAAAXNSR0IArs4c6QAAA05JREFUaEPtmUtyEzEQhtWTQyQLHNak2AB7ZnyXZMEjXMGeK/AIi+QuHrMnbChYY7MIh8g01fJoopFb0uhhEqqcbWTp06/uv1saEDv4O3n3dV60RfP947Mm9/SQc0ICFQgzfc4CYZoTPAswgSJCCUJUnAAoRHOAUOcATwbmVLWdGoH//PB8mnKqScAhsD0kYP3j/Yt5LPQe2KvcXmGvRHcDnpxfL2zOYJ1mFwrryWTz0advv1Ut4CJgf5uhDuDj5eUcAUoahrdY/56ebRWeraTjMt/00Sh3UDtjgHtQNHwcRGOC98BJEAEymycmYcWwOprTgcB6VZ5JK5TAJ+fXGLBm3FDAmn6oPPjR4rKCAoJCal2eAiQp2x0vxTPB3ALO2CRkwmDy5WohzBDwSEFKRwPbknEggCPB/imwrycgxX2NzoMCHhPkDwqYMr9tRcP5qNrMZHkVnOjRMWwLCcr8ohBVb1OMjxLwGCvjTikrsBOiA6fNyCrm8V1rP93iVPpwaE+gO0SsWmPiXB+jikdf6SizrT5qKasx5j8ABbHpFTx+vFXp9EnYQmLx02h1QTTrl6eDqxLnGjporxl3NL3agEvXdT0WmEost648sQOYAeJS9Q7bfUVoMGnjo4AZdUMQku50McDcMWcBPvr0SzbTAFDfvJqwLzgxwATnCgnp4wDl6Aa+Ax283gghmj+vj7feE2KBBRMW3FzOpLOADl0Isb5587h/U4gGvkt5v60Z1VLG8BhYjbzRwyQZemwAd6cCR5/XFWLYZRIMpX39AR0tjaGGiGzLVyhse5C9RKC6ai42ppWPKiBagOvaYk8lO7DajerabOZP46Lby5wKjw1HCRx7p9sVMOWGzb/vA1hwiWc6jm3MvQDTogQkiqIhJV0nBQBTU+3okKCFDy9WwferkHjtxib7t3xIUQtHxnIwtx4mpg26/HfwVNVDb4oI9RHmx5WGelRVlrtiw43zboCLaxv46AZeB3IlTkwouebTr1y2NjSpHz68WNFjHvupy3q8TFn3Hos2IAk4Ju5dCo8B3wP7VPr/FGaKiG+T+v+TQqIrOqMTL1VdWV1DdmcbO8KXBz6esmYWYKPwDL5b5FA1a0hwapHiom0r/cKaoqr+27/XcrS5UwSMbQAAAABJRU5ErkJggg==" alt="DeepWiki"></a>
+<!-- DeepWiki badge generated by https://deepwiki.ryoppippi.com/ -->
 <a href="https://codecov.io/gh/go-kratos/kratos"><img src="https://codecov.io/gh/go-kratos/kratos/master/graph/badge.svg" alt="codeCov"></a>
 <a href="https://goreportcard.com/report/github.com/go-kratos/kratos"><img src="https://goreportcard.com/badge/github.com/go-kratos/kratos" alt="Go Report Card"></a>
 <a href="https://github.com/go-kratos/kratos/blob/main/LICENSE"><img src="https://img.shields.io/github/license/go-kratos/kratos" alt="License"></a>
 <a href="https://github.com/avelino/awesome-go"><img src="https://awesome.re/mentioned-badge.svg" alt="Awesome Go"></a>
 <a href="https://discord.gg/BWzJsUJ"><img src="https://img.shields.io/discord/766619759214854164?label=chat&logo=discord" alt="Discord"></a>
 </p>
 <p align="center">
+<a href="https://trendshift.io/repositories/3233" target="_blank"><img src="https://trendshift.io/api/badge/repositories/3233" alt="go-kratos%2Fkratos | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 <a href="https://www.producthunt.com/posts/go-kratos?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-go-kratos" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=306565&theme=light" alt="Go Kratos - A Go framework for microservices. | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 </p>
 
@@ -39,7 +42,7 @@ Kratos is accessible, powerful, and provides tools required for large, robust ap
 
 Kratos has the most extensive and thorough [documentation](https://go-kratos.dev/en/docs/getting-started/start) and [example](https://github.com/go-kratos/examples) library of all modern web application frameworks, making it a breeze to get started with the framework.
 
-We also provide a [modern template](https://github.com/go-kratos/kratos-layout). This template should help reduce the work required to setup up modern projects.
+We also provide a [modern template](https://github.com/go-kratos/kratos-layout). This template should help reduce the work required to set up modern projects.
 
 ### Goals