Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: 1.24
- uses: actions/checkout@v2
with:
submodules: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/plugin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
- name: Set up Go 1.19
- name: Set up Go 1.24
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: 1.24
- name: Setup docker (missing on MacOS)
if: runner.os == 'macos'
env:
Expand Down Expand Up @@ -154,10 +154,10 @@ jobs:
with:
name: test-tools-macos-12
path: test/plugins/dist
- name: Set up Go 1.19
- name: Set up Go 1.24
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: 1.24
- name: Setup docker (missing on MacOS)
if: runner.os == 'macos'
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/skywalking-go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- name: Set up Go 1.19
- name: Set up Go 1.24
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: 1.24
- name: Check out code into the Go module directory
uses: actions/checkout@v2
with:
Expand All @@ -50,7 +50,7 @@ jobs:
fail-fast: true
matrix:
os: [ ubuntu-latest, windows-latest ]
go-version: [ 1.19 ]
go-version: [ 1.24, 1.25, 1.26 ]
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/windows-plugin-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ jobs:
curl -SL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
docker-compose --version
- name: WSL – Install Go 1.19
- name: WSL – Install Go 1.24
shell: wsl-run {0}
run: |
wget https://go.dev/dl/go1.19.linux-amd64.tar.gz
sudo tar -C /usr/local -xzf go1.19.linux-amd64.tar.gz
wget https://go.dev/dl/go1.24.13.linux-amd64.tar.gz
sudo tar -C /usr/local -xzf go1.24.13.linux-amd64.tar.gz

echo 'export GOROOT=/usr/local/go' >> ~/.profile
echo 'export GOPATH=$HOME/go' >> ~/.profile
Expand Down Expand Up @@ -134,10 +134,10 @@ jobs:
run: |
sudo cp -rf ~/repo/* /mnt/d/a/skywalking-go

- name: Windows Set up Go 1.19
- name: Windows Set up Go 1.24
uses: actions/setup-go@v2
with:
go-version: 1.19
go-version: 1.24
- name: WSL Setup Tools
shell: wsl-run {0}
run: |
Expand Down
25 changes: 2 additions & 23 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,15 @@

linters-settings:
govet:
check-shadowing: true
golint:
min-confidence: 0
enable:
- shadow
gocyclo:
min-complexity: 15
maligned:
suggest-new: true
dupl:
threshold: 200
goconst:
min-len: 2
min-occurrences: 2
depguard:
list-type: blacklist
packages:
-
include-go-root: true
packages-with-error-messages:
fmt: "logging is allowed only by logutils.Log"
misspell:
locale: US
lll:
Expand Down Expand Up @@ -67,8 +57,6 @@ linters-settings:
linters:
enable:
- bodyclose
- deadcode
- depguard
- dogsled
- dupl
- errcheck
Expand All @@ -78,27 +66,18 @@ linters:
- gocyclo
- gofmt
- goimports
- golint
- gosec
- gosimple
- govet
- ineffassign
- interfacer
- lll
- misspell
- nakedret
- staticcheck
- structcheck
- stylecheck
- typecheck
- unconvert
- unparam
- varcheck
- whitespace
disable:
- unused

service:
golangci-lint-version: 1.20.x
prepare:
- echo "here I can run custom commands, but no preparation needed for this repo"
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Release Notes.
* Add mutex to fix some data race.
* Replace external `goapi` dependency with in-repo generated protocols.
* Support pprof profiling.
* Align the agent with the supported Go releases (retire EOL Go 1.19-1.23): publish Go 1.24, 1.25, 1.26 base images, bump the module `go.mod` floor to Go 1.24, and run the CI build, plugin, and e2e jobs on Go 1.24-1.26.

#### Plugins

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# User used targeting base image
ARG BASE_GO_IMAGE
# Build the agent base image
ARG BASE_BUILDER_IMAGE='golang:1.19'
ARG BASE_BUILDER_IMAGE='golang:1.24'

FROM ${BASE_BUILDER_IMAGE} as builder
# Go Agent Version
Expand Down
12 changes: 5 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ deps:
$(GO_GET) -v -t -d ./...

linter:
$(GO_LINT) version || curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_PATH)/bin v1.50.0
$(GO_LINT) version || curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/v1.64.8/install.sh | sh -s -- -b $(GO_PATH)/bin v1.64.8

##@ General

Expand Down Expand Up @@ -153,17 +153,15 @@ release: ## Build skywalking-go agent release
/bin/sh tools/release/create_bin_release.sh
/bin/sh tools/release/create_source_release.sh

base.all := go1.19 go1.20 go1.21 go1.22 go1.23
base.all := go1.24 go1.25 go1.26
base.each = $(word 1, $@)


##@ Docker

base.image.go1.19 := golang:1.19
base.image.go1.20 := golang:1.20
base.image.go1.21 := golang:1.21
base.image.go1.22 := golang:1.22
base.image.go1.23 := golang:1.23
base.image.go1.24 := golang:1.24
base.image.go1.25 := golang:1.25
base.image.go1.26 := golang:1.26

docker.%: PLATFORMS =
docker.%: LOAD_OR_PUSH = --load
Expand Down
8 changes: 4 additions & 4 deletions docs/en/agent/support-plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metrics based on the tracing data.

* HTTP Server
* `gin`: [Gin](https://github.com/gin-gonic/gin) tested v1.7.0 to v1.9.0.
* `http`: [Native HTTP](https://pkg.go.dev/net/http) tested go v1.19 to go v1.23.
* `http`: [Native HTTP](https://pkg.go.dev/net/http) tested go v1.24 to go v1.26.
* `go-restfulv3`: [Go-Restful](https://github.com/emicklei/go-restful) tested v3.7.1 to 3.10.2.
* `mux`: [Mux](https://github.com/gorilla/mux) tested v1.7.0 to v1.8.0.
* `iris`: [Iris](https://github.com/kataras/iris) tested v12.1.0 to 12.2.5.
Expand All @@ -13,7 +13,7 @@ metrics based on the tracing data.
* `echov4`: [Echov4](https://github.com/labstack/echo) tested v4.0.0 to v4.11.4
* `goframe`: [GoFrame](https://github.com/gogf/gf/) tested v2.6.0 to v2.7.3
* HTTP Client
* `http`: [Native HTTP](https://pkg.go.dev/net/http) tested go v1.19 to go v1.23.
* `http`: [Native HTTP](https://pkg.go.dev/net/http) tested go v1.24 to go v1.26.
* `fasthttp`: [FastHttp](https://github.com/valyala/fasthttp) tested v1.10.0 to v1.50.0.
* RPC Frameworks
* `dubbo`: [Dubbo](https://github.com/apache/dubbo-go) tested v3.0.1 to v3.0.5.
Expand All @@ -25,7 +25,7 @@ metrics based on the tracing data.
* [MySQL Driver](https://github.com/go-gorm/mysql)
* [PostgreSQL Driver](https://github.com/go-gorm/postgres) tested v1.5.2 to v1.6.0.
* `mongo`: [Mongo](https://github.com/mongodb/mongo-go-driver) tested v1.11.1 to v1.11.7.
* `sql`: [Native SQL](https://pkg.go.dev/database/sql) tested go v1.19 to go v1.23.
* `sql`: [Native SQL](https://pkg.go.dev/database/sql) tested go v1.24 to go v1.26.
* [MySQL Driver](https://github.com/go-sql-driver/mysql) tested v1.4.0 to v1.7.1.
* [pgx/v5 stdlib](https://github.com/jackc/pgx/tree/master/stdlib) tested v5.5.5 to v5.7.2.
* `go-elasticsearchv8`: [go-elasticsearch](https://github.com/elastic/go-elasticsearch) tested v8.10.0 to v8.11.1.
Expand All @@ -40,7 +40,7 @@ metrics based on the tracing data.
# Metrics Plugins
The meter plugin provides the advanced metrics collections.

* `runtimemetrics`: [Native Runtime Metrics](https://pkg.go.dev/runtime/metrics) tested go v1.19 to go v1.23.
* `runtimemetrics`: [Native Runtime Metrics](https://pkg.go.dev/runtime/metrics) tested go v1.24 to go v1.26.

# Logging Plugins
The logging plugin provides the advanced logging collections.
Expand Down
2 changes: 1 addition & 1 deletion docs/en/setup/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN go build -toolexec="skywalking-go-agent" -a /path/to/project

In the above code, we have performed the following actions:

1. Used the SkyWalking Go provided image as the base image, which currently supports the following Go versions: **1.19, 1.20, 1.21, 1.22, 1.23**.
1. Used the SkyWalking Go provided image as the base image, which currently supports the following Go versions: **1.24, 1.25, 1.26**.
2. Copied the project into the Docker image.
3. Installed SkyWalking Go and compiled the project, [read this documentation for more detail](./gobuild.md).
The SkyWalking Go agent is already installed in the `/usr/local/bin` directory with the name **skywalking-go-agent**.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go

go 1.19
go 1.24

require (
github.com/google/uuid v1.3.0
Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.19
go 1.24

use (
.
Expand Down
2 changes: 1 addition & 1 deletion plugins/amqp/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/apache/skywalking-go/plugins/amqp

go 1.19
go 1.24

require github.com/rabbitmq/amqp091-go v1.9.0 // indirect
1 change: 0 additions & 1 deletion plugins/core/fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ package core
import "embed"

// FS is export the file system for the core module for file copy.
// go:nolint
//
//go:embed *
var FS embed.FS
2 changes: 1 addition & 1 deletion plugins/core/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/core

go 1.19
go 1.24

require (
github.com/dave/dst v0.27.2
Expand Down
2 changes: 1 addition & 1 deletion plugins/dubbo/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/dubbo

go 1.19
go 1.24

require dubbo.apache.org/dubbo-go/v3 v3.0.5

Expand Down
2 changes: 1 addition & 1 deletion plugins/echov4/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/echov4

go 1.19
go 1.24

require (
github.com/labstack/echo/v4 v4.6.3
Expand Down
2 changes: 1 addition & 1 deletion plugins/fasthttp/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/fasthttp

go 1.19
go 1.24

require (
github.com/stretchr/testify v1.8.4
Expand Down
2 changes: 1 addition & 1 deletion plugins/fiber/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/fiber

go 1.19
go 1.24

require (
github.com/andybalholm/brotli v1.0.5 // indirect
Expand Down
2 changes: 1 addition & 1 deletion plugins/gin/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/gin

go 1.19
go 1.24

require (
github.com/gin-gonic/gin v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion plugins/go-elasticsearchv8/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/go-elasticsearchv8

go 1.19
go 1.24

require (
github.com/elastic/elastic-transport-go/v8 v8.3.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion plugins/go-redisv9/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/go-redisv9

go 1.19
go 1.24

require github.com/redis/go-redis/v9 v9.0.5

Expand Down
2 changes: 1 addition & 1 deletion plugins/go-restfulv3/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/go-restfulv3

go 1.19
go 1.24

require (
github.com/emicklei/go-restful/v3 v3.10.2
Expand Down
2 changes: 1 addition & 1 deletion plugins/goframe/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/goframe

go 1.19
go 1.24

require (
github.com/dave/dst v0.27.2 // indirect
Expand Down
2 changes: 1 addition & 1 deletion plugins/gorm/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/gorm

go 1.19
go 1.24

require (
github.com/go-sql-driver/mysql v1.7.1
Expand Down
2 changes: 1 addition & 1 deletion plugins/grpc/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/grpc

go 1.20
go 1.24

require google.golang.org/grpc v1.56.2

Expand Down
2 changes: 1 addition & 1 deletion plugins/http/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/http

go 1.19
go 1.24

require github.com/stretchr/testify v1.8.2

Expand Down
2 changes: 1 addition & 1 deletion plugins/irisv12/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/irisv12

go 1.19
go 1.24

require (
github.com/kataras/iris/v12 v12.2.0
Expand Down
2 changes: 1 addition & 1 deletion plugins/kratosv2/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/kratosv2

go 1.19
go 1.24

require (
github.com/go-kratos/kratos/v2 v2.6.2 // indirect
Expand Down
2 changes: 1 addition & 1 deletion plugins/microv4/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/microv4

go 1.19
go 1.24

require (
github.com/Microsoft/go-winio v0.6.0 // indirect
Expand Down
Loading
Loading