Skip to content

Commit

Permalink
Add go 1.23 in docker image and remove 1.16-1.18 support. (#194)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrproliu authored Aug 21, 2024
1 parent 91d8895 commit c997106
Show file tree
Hide file tree
Showing 91 changed files with 112 additions and 119 deletions.
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.18
- name: Set up Go 1.19
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Setup docker (missing on MacOS)
if: runner.os == 'macos'
env:
Expand Down Expand Up @@ -147,10 +147,10 @@ jobs:
with:
name: test-tools-macos-12
path: test/plugins/dist
- name: Set up Go 1.18
- name: Set up Go 1.19
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Setup docker (missing on MacOS)
if: runner.os == 'macos'
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
permissions:
contents: read
packages: write
timeout-minutes: 90
timeout-minutes: 150
env:
VERSION: ${{ github.sha }}
steps:
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.18
- name: Set up Go 1.19
uses: actions/setup-go@v2
with:
go-version: 1.18
go-version: 1.19
- name: Check out code into the Go module directory
uses: actions/checkout@v2
with:
Expand All @@ -48,7 +48,7 @@ jobs:
fail-fast: true
matrix:
os: [ ubuntu-latest, macos-13, windows-latest ]
go-version: [ 1.18, 1.19 ]
go-version: [ 1.19 ]
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
Expand Down
7 changes: 5 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ Release Notes.

0.5.0
------------------
* **Add go `1.23` support**.
* **Remove go `1.16`, `1.17`, and `1.18` support**.

#### Features
* Add support trace ignore.
* Enhance the observability of makefile execution.
* Update the error message if the peer address is empty when creating exit span.
* Support enhancement go`1.23`.
* Update the error message if the peer address is empty when creating an exit span.
* Support enhancement go `1.23`.

#### Plugins
* Support [Pulsar](https://github.com/apache/pulsar-client-go) MQ.
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.18'
ARG BASE_BUILDER_IMAGE='golang:1.19'

FROM ${BASE_BUILDER_IMAGE} as builder
# Go Agent Version
Expand Down
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -127,19 +127,17 @@ 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.16 go1.17 go1.18 go1.19 go1.20 go1.21 go1.22
base.all := go1.19 go1.20 go1.21 go1.22 go1.23
base.each = $(word 1, $@)


##@ Docker

base.image.go1.16 := golang:1.16
base.image.go1.17 := golang:1.17
base.image.go1.18 := golang:1.18
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

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,15 +4,15 @@ 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.17 to go v1.20.
* `http`: [Native HTTP](https://pkg.go.dev/net/http) tested go v1.19 to go v1.23.
* `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.
* `fasthttp`: [FastHttp](https://github.com/valyala/fasthttp) tested v1.10.0 to v1.50.0.
* `fiber`: [Fiber](https://github.com/gofiber/fiber) tested v2.49.0 to v2.50.0.
* `echov4`: [Echov4](https://github.com/labstack/echo) tested v4.0.0 to v4.11.4
* HTTP Client
* `http`: [Native HTTP](https://pkg.go.dev/net/http) tested go v1.17 to go v1.20.
* `http`: [Native HTTP](https://pkg.go.dev/net/http) tested go v1.19 to go v1.23.
* `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 @@ -23,7 +23,7 @@ metrics based on the tracing data.
* `gorm`: [GORM](https://github.com/go-gorm/gorm) tested v1.22.0 to v1.25.1.
* [MySQL Driver](https://github.com/go-gorm/mysql)
* `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.17 to go v1.20.
* `sql`: [Native SQL](https://pkg.go.dev/database/sql) tested go v1.19 to go v1.23.
* [MySQL Driver](https://github.com/go-sql-driver/mysql) tested v1.4.0 to v1.7.1.
* `go-elasticsearchv8`: [go-elasticsearch](https://github.com/elastic/go-elasticsearch) tested v8.10.0 to v8.11.1.
* Cache Client
Expand All @@ -37,7 +37,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.17 to go v1.20.
* `runtimemetrics`: [Native Runtime Metrics](https://pkg.go.dev/runtime/metrics) tested go v1.19 to go v1.23.

# 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.16, 1.17, 1.18, 1.19, 1.20**.
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**.
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.18
go 1.19

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.18
go 1.19

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.18
go 1.19

require github.com/rabbitmq/amqp091-go v1.9.0 // indirect
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.18
go 1.19

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.18
go 1.19

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.18
go 1.19

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.18
go 1.19

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.18
go 1.19

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.18
go 1.19

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.18
go 1.19

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.18
go 1.19

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.18
go 1.19

require (
github.com/emicklei/go-restful/v3 v3.10.2
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.18
go 1.19

require (
github.com/go-sql-driver/mysql v1.7.1
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.18
go 1.19

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.18
go 1.19

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.18
go 1.19

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.18
go 1.19

require (
github.com/Microsoft/go-winio v0.6.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion plugins/mongo/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/apache/skywalking-go/plugins/mongo

go 1.18
go 1.19

require go.mongodb.org/mongo-driver v1.11.7 // indirect
2 changes: 1 addition & 1 deletion plugins/mux/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/apache/skywalking-go/plugins/mux

go 1.18
go 1.19

require github.com/gorilla/mux v1.8.0 // indirect
2 changes: 1 addition & 1 deletion plugins/pulsar/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/apache/skywalking-go/plugins/pulsar

go 1.18
go 1.19

require github.com/apache/pulsar-client-go v0.12.0 // indirect
2 changes: 1 addition & 1 deletion plugins/rocketmq/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/apache/skywalking-go/plugins/rocketmq

go 1.18
go 1.19

require (
github.com/apache/rocketmq-client-go/v2 v2.1.2 // indirect
Expand Down
2 changes: 1 addition & 1 deletion plugins/runtimemetrics/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/apache/skywalking-go/plugins/runtimemetrics

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

go 1.18
go 1.19

require (
github.com/klauspost/compress v1.15.9 // indirect
Expand Down
2 changes: 1 addition & 1 deletion plugins/sql/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/apache/skywalking-go/plugins/sql

go 1.18
go 1.19

require github.com/go-sql-driver/mysql v1.7.1 // indirect
2 changes: 1 addition & 1 deletion plugins/trace-activation/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/apache/skywalking-go/plugin/trace

go 1.18
go 1.19

require github.com/dave/dst v0.27.2 // indirect
2 changes: 1 addition & 1 deletion test/benchmark-codebase/consumer/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module consumer

go 1.18
go 1.19

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

Expand Down
2 changes: 1 addition & 1 deletion test/benchmark-codebase/provider/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module provider

go 1.18
go 1.19

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

Expand Down
2 changes: 1 addition & 1 deletion test/plugins/runner-helper/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module plugin-runner-helper

go 1.18
go 1.19

require gopkg.in/yaml.v3 v3.0.1

Expand Down
2 changes: 1 addition & 1 deletion test/plugins/scenarios/amqp/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module test/plugins/scenarios/amqp

go 1.18
go 1.19

require (
github.com/apache/skywalking-go v0.3.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion test/plugins/scenarios/amqp/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ start-script: ./bin/startup.sh
framework: github.com/rabbitmq/amqp091-go
export-port: 8080
support-version:
- go: 1.18
- go: 1.19
framework:
- v1.9.0
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion test/plugins/scenarios/discard-reporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module test/plugins/scenarios/discard-reporter

go 1.18
go 1.19
2 changes: 0 additions & 2 deletions test/plugins/scenarios/discard-reporter/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,5 @@ start-script: ./bin/startup.sh
framework: go
export-port: 8080
support-version:
- go: 1.17
- go: 1.18
- go: 1.19
- go: 1.20
Loading

0 comments on commit c997106

Please sign in to comment.