Skip to content

Commit c997106

Browse files
mrproliumrproliu
authored
Add go 1.23 in docker image and remove 1.16-1.18 support. (#194)
1 parent 91d8895 commit c997106

File tree

91 files changed

+112
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+112
-119
lines changed

‎.github/workflows/plugin-tests.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ jobs:
3333
runs-on: ${{ matrix.os }}
3434
timeout-minutes: 60
3535
steps:
36-
- name: Set up Go 1.18
36+
- name: Set up Go 1.19
3737
uses: actions/setup-go@v2
3838
with:
39-
go-version: 1.18
39+
go-version: 1.19
4040
- name: Setup docker (missing on MacOS)
4141
if: runner.os == 'macos'
4242
env:
@@ -147,10 +147,10 @@ jobs:
147147
with:
148148
name: test-tools-macos-12
149149
path: test/plugins/dist
150-
- name: Set up Go 1.18
150+
- name: Set up Go 1.19
151151
uses: actions/setup-go@v2
152152
with:
153-
go-version: 1.18
153+
go-version: 1.19
154154
- name: Setup docker (missing on MacOS)
155155
if: runner.os == 'macos'
156156
env:

‎.github/workflows/publish-docker.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
permissions:
3232
contents: read
3333
packages: write
34-
timeout-minutes: 90
34+
timeout-minutes: 150
3535
env:
3636
VERSION: ${{ github.sha }}
3737
steps:

‎.github/workflows/skywalking-go.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
runs-on: ubuntu-latest
2626
timeout-minutes: 60
2727
steps:
28-
- name: Set up Go 1.18
28+
- name: Set up Go 1.19
2929
uses: actions/setup-go@v2
3030
with:
31-
go-version: 1.18
31+
go-version: 1.19
3232
- name: Check out code into the Go module directory
3333
uses: actions/checkout@v2
3434
with:
@@ -48,7 +48,7 @@ jobs:
4848
fail-fast: true
4949
matrix:
5050
os: [ ubuntu-latest, macos-13, windows-latest ]
51-
go-version: [ 1.18, 1.19 ]
51+
go-version: [ 1.19 ]
5252
runs-on: ${{ matrix.os }}
5353
timeout-minutes: 60
5454
steps:

‎CHANGES.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ Release Notes.
44

55
0.5.0
66
------------------
7+
* **Add go `1.23` support**.
8+
* **Remove go `1.16`, `1.17`, and `1.18` support**.
9+
710
#### Features
811
* Add support trace ignore.
912
* Enhance the observability of makefile execution.
10-
* Update the error message if the peer address is empty when creating exit span.
11-
* Support enhancement go`1.23`.
13+
* Update the error message if the peer address is empty when creating an exit span.
14+
* Support enhancement go `1.23`.
1215

1316
#### Plugins
1417
* Support [Pulsar](https://github.com/apache/pulsar-client-go) MQ.

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# User used targeting base image
1818
ARG BASE_GO_IMAGE
1919
# Build the agent base image
20-
ARG BASE_BUILDER_IMAGE='golang:1.18'
20+
ARG BASE_BUILDER_IMAGE='golang:1.19'
2121

2222
FROM ${BASE_BUILDER_IMAGE} as builder
2323
# Go Agent Version

‎Makefile

+2-4
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,17 @@ release: ## Build skywalking-go agent release
127127
/bin/sh tools/release/create_bin_release.sh
128128
/bin/sh tools/release/create_source_release.sh
129129

130-
base.all := go1.16 go1.17 go1.18 go1.19 go1.20 go1.21 go1.22
130+
base.all := go1.19 go1.20 go1.21 go1.22 go1.23
131131
base.each = $(word 1, $@)
132132

133133

134134
##@ Docker
135135

136-
base.image.go1.16 := golang:1.16
137-
base.image.go1.17 := golang:1.17
138-
base.image.go1.18 := golang:1.18
139136
base.image.go1.19 := golang:1.19
140137
base.image.go1.20 := golang:1.20
141138
base.image.go1.21 := golang:1.21
142139
base.image.go1.22 := golang:1.22
140+
base.image.go1.23 := golang:1.23
143141

144142
docker.%: PLATFORMS =
145143
docker.%: LOAD_OR_PUSH = --load

‎docs/en/agent/support-plugins.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ metrics based on the tracing data.
44

55
* HTTP Server
66
* `gin`: [Gin](https://github.com/gin-gonic/gin) tested v1.7.0 to v1.9.0.
7-
* `http`: [Native HTTP](https://pkg.go.dev/net/http) tested go v1.17 to go v1.20.
7+
* `http`: [Native HTTP](https://pkg.go.dev/net/http) tested go v1.19 to go v1.23.
88
* `go-restfulv3`: [Go-Restful](https://github.com/emicklei/go-restful) tested v3.7.1 to 3.10.2.
99
* `mux`: [Mux](https://github.com/gorilla/mux) tested v1.7.0 to v1.8.0.
1010
* `iris`: [Iris](https://github.com/kataras/iris) tested v12.1.0 to 12.2.5.
1111
* `fasthttp`: [FastHttp](https://github.com/valyala/fasthttp) tested v1.10.0 to v1.50.0.
1212
* `fiber`: [Fiber](https://github.com/gofiber/fiber) tested v2.49.0 to v2.50.0.
1313
* `echov4`: [Echov4](https://github.com/labstack/echo) tested v4.0.0 to v4.11.4
1414
* HTTP Client
15-
* `http`: [Native HTTP](https://pkg.go.dev/net/http) tested go v1.17 to go v1.20.
15+
* `http`: [Native HTTP](https://pkg.go.dev/net/http) tested go v1.19 to go v1.23.
1616
* `fasthttp`: [FastHttp](https://github.com/valyala/fasthttp) tested v1.10.0 to v1.50.0.
1717
* RPC Frameworks
1818
* `dubbo`: [Dubbo](https://github.com/apache/dubbo-go) tested v3.0.1 to v3.0.5.
@@ -23,7 +23,7 @@ metrics based on the tracing data.
2323
* `gorm`: [GORM](https://github.com/go-gorm/gorm) tested v1.22.0 to v1.25.1.
2424
* [MySQL Driver](https://github.com/go-gorm/mysql)
2525
* `mongo`: [Mongo](https://github.com/mongodb/mongo-go-driver) tested v1.11.1 to v1.11.7.
26-
* `sql`: [Native SQL](https://pkg.go.dev/database/sql) tested go v1.17 to go v1.20.
26+
* `sql`: [Native SQL](https://pkg.go.dev/database/sql) tested go v1.19 to go v1.23.
2727
* [MySQL Driver](https://github.com/go-sql-driver/mysql) tested v1.4.0 to v1.7.1.
2828
* `go-elasticsearchv8`: [go-elasticsearch](https://github.com/elastic/go-elasticsearch) tested v8.10.0 to v8.11.1.
2929
* Cache Client
@@ -37,7 +37,7 @@ metrics based on the tracing data.
3737
# Metrics Plugins
3838
The meter plugin provides the advanced metrics collections.
3939

40-
* `runtimemetrics`: [Native Runtime Metrics](https://pkg.go.dev/runtime/metrics) tested go v1.17 to go v1.20.
40+
* `runtimemetrics`: [Native Runtime Metrics](https://pkg.go.dev/runtime/metrics) tested go v1.19 to go v1.23.
4141

4242
# Logging Plugins
4343
The logging plugin provides the advanced logging collections.

‎docs/en/setup/docker.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN go build -toolexec="skywalking-go-agent" -a /path/to/project
2323

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

26-
1. Used the SkyWalking Go provided image as the base image, which currently supports the following Go versions: **1.16, 1.17, 1.18, 1.19, 1.20**.
26+
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**.
2727
2. Copied the project into the Docker image.
2828
3. Installed SkyWalking Go and compiled the project, [read this documentation for more detail](./gobuild.md).
2929
The SkyWalking Go agent is already installed in the `/usr/local/bin` directory with the name **skywalking-go-agent**.

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/google/uuid v1.3.0

‎go.work

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.18
1+
go 1.19
22

33
use (
44
.

‎plugins/amqp/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/apache/skywalking-go/plugins/amqp
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/rabbitmq/amqp091-go v1.9.0 // indirect

‎plugins/core/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/core
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/dave/dst v0.27.2

‎plugins/dubbo/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/dubbo
22

3-
go 1.18
3+
go 1.19
44

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

‎plugins/echov4/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/echov4
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/labstack/echo/v4 v4.6.3

‎plugins/fasthttp/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/fasthttp
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/stretchr/testify v1.8.4

‎plugins/fiber/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/fiber
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/andybalholm/brotli v1.0.5 // indirect

‎plugins/gin/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/gin
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/gin-gonic/gin v1.9.0

‎plugins/go-elasticsearchv8/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/go-elasticsearchv8
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/elastic/elastic-transport-go/v8 v8.3.0 // indirect

‎plugins/go-redisv9/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/go-redisv9
22

3-
go 1.18
3+
go 1.19
44

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

‎plugins/go-restfulv3/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/go-restfulv3
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/emicklei/go-restful/v3 v3.10.2

‎plugins/gorm/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/gorm
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/go-sql-driver/mysql v1.7.1

‎plugins/http/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/http
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/stretchr/testify v1.8.2
66

‎plugins/irisv12/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/irisv12
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/kataras/iris/v12 v12.2.0

‎plugins/kratosv2/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/kratosv2
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/go-kratos/kratos/v2 v2.6.2 // indirect

‎plugins/microv4/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/microv4
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/Microsoft/go-winio v0.6.0 // indirect

‎plugins/mongo/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/apache/skywalking-go/plugins/mongo
22

3-
go 1.18
3+
go 1.19
44

55
require go.mongodb.org/mongo-driver v1.11.7 // indirect

‎plugins/mux/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/apache/skywalking-go/plugins/mux
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/gorilla/mux v1.8.0 // indirect

‎plugins/pulsar/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/apache/skywalking-go/plugins/pulsar
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/apache/pulsar-client-go v0.12.0 // indirect

‎plugins/rocketmq/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/rocketmq
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/apache/rocketmq-client-go/v2 v2.1.2 // indirect

‎plugins/runtimemetrics/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module github.com/apache/skywalking-go/plugins/runtimemetrics
22

3-
go 1.18
3+
go 1.19

‎plugins/segmentio-kafka/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/apache/skywalking-go/plugins/segmentio-kafka
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/klauspost/compress v1.15.9 // indirect

‎plugins/sql/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/apache/skywalking-go/plugins/sql
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/go-sql-driver/mysql v1.7.1 // indirect

‎plugins/trace-activation/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/apache/skywalking-go/plugin/trace
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/dave/dst v0.27.2 // indirect

‎test/benchmark-codebase/consumer/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module consumer
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/gin-gonic/gin v1.9.0
66

‎test/benchmark-codebase/provider/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module provider
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/gin-gonic/gin v1.9.0
66

‎test/plugins/runner-helper/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module plugin-runner-helper
22

3-
go 1.18
3+
go 1.19
44

55
require gopkg.in/yaml.v3 v3.0.1
66

‎test/plugins/scenarios/amqp/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module test/plugins/scenarios/amqp
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/apache/skywalking-go v0.3.0 // indirect

‎test/plugins/scenarios/amqp/plugin.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ start-script: ./bin/startup.sh
2020
framework: github.com/rabbitmq/amqp091-go
2121
export-port: 8080
2222
support-version:
23-
- go: 1.18
23+
- go: 1.19
2424
framework:
2525
- v1.9.0
2626
dependencies:

‎test/plugins/scenarios/discard-reporter/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module test/plugins/scenarios/discard-reporter
22

3-
go 1.18
3+
go 1.19

‎test/plugins/scenarios/discard-reporter/plugin.yml

-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,5 @@ start-script: ./bin/startup.sh
2020
framework: go
2121
export-port: 8080
2222
support-version:
23-
- go: 1.17
24-
- go: 1.18
2523
- go: 1.19
2624
- go: 1.20

0 commit comments

Comments
 (0)