From a279fd225418cc3d0093e447e2a6c0a4c4a96f36 Mon Sep 17 00:00:00 2001 From: Andrew Glaude Date: Fri, 16 Aug 2024 14:09:52 -0400 Subject: [PATCH] bump go minimum version to 1.22 --- .github/workflows/appsec.yml | 4 ++-- .github/workflows/main-branch-tests.yml | 4 ++-- .github/workflows/pull-request.yml | 2 +- .github/workflows/smoke-tests.yml | 4 ++-- .gitlab/macrobenchmarks.yml | 28 +++++++++++------------ internal/apps/Dockerfile | 2 +- internal/apps/setup-smoke-test/Dockerfile | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml index f913f17fdf..76c6b555c8 100644 --- a/.github/workflows/appsec.yml +++ b/.github/workflows/appsec.yml @@ -95,7 +95,7 @@ jobs: strategy: matrix: runs-on: [ macos-12, macos-14 ] # oldest and newest macos runners available - macos-14 mainly is here to cover the fact it is an ARM machine - go-version: [ "1.22", "1.21" ] + go-version: [ "1.22", "1.23" ] fail-fast: true # saving some CI time - macos runners too long to get steps: - uses: actions/checkout@v4 @@ -187,7 +187,7 @@ jobs: needs: go-mod-caching strategy: matrix: - go-version: [ "1.22", "1.21" ] + go-version: [ "1.22", "1.23" ] distribution: [ bookworm, bullseye, alpine ] platform: [ linux/amd64, linux/arm64 ] diff --git a/.github/workflows/main-branch-tests.yml b/.github/workflows/main-branch-tests.yml index 96e4c7ea25..10894ba672 100644 --- a/.github/workflows/main-branch-tests.yml +++ b/.github/workflows/main-branch-tests.yml @@ -22,7 +22,7 @@ jobs: unit-integration-tests: strategy: matrix: - go-version: [ "1.21", "1.22" ] + go-version: [ "1.23", "1.22" ] fail-fast: false uses: ./.github/workflows/unit-integration-tests.yml with: @@ -33,7 +33,7 @@ jobs: strategy: matrix: runs-on: [ macos-latest, windows-latest, ubuntu-latest ] - go-version: [ "1.21", "1.22" ] + go-version: [ "1.23", "1.22" ] fail-fast: false uses: ./.github/workflows/multios-unit-tests.yml with: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 128967216d..9513b2e328 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -18,6 +18,6 @@ jobs: name: PR Unit and Integration Tests uses: ./.github/workflows/unit-integration-tests.yml with: - go-version: "1.21" + go-version: "1.22" ref: ${{ github.ref }} secrets: inherit diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 9bc2c62905..07e316a8e2 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -76,7 +76,7 @@ jobs: ref: ${{ inputs.ref || github.ref }} - uses: actions/setup-go@v3 with: - go-version: "1.21" + go-version: "1.22" cache: true - name: go mod tidy run: |- @@ -99,7 +99,7 @@ jobs: matrix: # TODO: cross-compilation from/to different hardware architectures once # github provides native ARM runners. - go: [ "1.21", "1.22", "1.23-rc" ] + go: [ "1.22", "1.23" ] build-env: [ alpine, bookworm, bullseye ] build-with-cgo: [ 0, 1 ] deployment-env: [ alpine, debian11, debian12, al2, al2023, busybox, scratch ] diff --git a/.gitlab/macrobenchmarks.yml b/.gitlab/macrobenchmarks.yml index 542bfb0c93..ba625ee23e 100644 --- a/.gitlab/macrobenchmarks.yml +++ b/.gitlab/macrobenchmarks.yml @@ -56,10 +56,10 @@ variables: # 2. Rebuild image in Gitlab CI (build-images CI job in https://gitlab.ddbuild.io/DataDog/apm-reliability/benchmarking-platform/-/pipelines?page=1&scope=all&ref=go%2Fgo-prof-app) # -.go121-benchmarks: +.go123-benchmarks: extends: .benchmarks variables: - GO_VERSION: "1.21.12" + GO_VERSION: "1.23.0" .go122-benchmarks: extends: .benchmarks @@ -123,8 +123,8 @@ go122-profile-trace-asm: ENABLE_APPSEC: "true" DD_PROFILING_EXECUTION_TRACE_ENABLED: "false" -go121-baseline: - extends: .go121-benchmarks +go123-baseline: + extends: .go123-benchmarks variables: ENABLE_DDPROF: "false" ENABLE_TRACING: "false" @@ -132,8 +132,8 @@ go121-baseline: ENABLE_APPSEC: "false" DD_PROFILING_EXECUTION_TRACE_ENABLED: "false" -go121-only-trace: - extends: .go121-benchmarks +go123-only-trace: + extends: .go123-benchmarks variables: ENABLE_DDPROF: "false" ENABLE_TRACING: "true" @@ -141,8 +141,8 @@ go121-only-trace: ENABLE_APPSEC: "false" DD_PROFILING_EXECUTION_TRACE_ENABLED: "false" -go121-only-profile: - extends: .go121-benchmarks +go123-only-profile: + extends: .go123-benchmarks variables: ENABLE_DDPROF: "false" ENABLE_TRACING: "false" @@ -150,8 +150,8 @@ go121-only-profile: ENABLE_APPSEC: "false" DD_PROFILING_EXECUTION_TRACE_ENABLED: "false" -go121-profile-trace: - extends: .go121-benchmarks +go123-profile-trace: + extends: .go123-benchmarks variables: ENABLE_DDPROF: "false" ENABLE_TRACING: "true" @@ -159,8 +159,8 @@ go121-profile-trace: ENABLE_APPSEC: "false" DD_PROFILING_EXECUTION_TRACE_ENABLED: "false" -go121-trace-asm: - extends: .go121-benchmarks +go123-trace-asm: + extends: .go123-benchmarks variables: ENABLE_DDPROF: "false" ENABLE_TRACING: "true" @@ -168,8 +168,8 @@ go121-trace-asm: ENABLE_APPSEC: "true" DD_PROFILING_EXECUTION_TRACE_ENABLED: "false" -go121-profile-trace-asm: - extends: .go121-benchmarks +go123-profile-trace-asm: + extends: .go123-benchmarks variables: ENABLE_DDPROF: "false" ENABLE_TRACING: "true" diff --git a/internal/apps/Dockerfile b/internal/apps/Dockerfile index 2f32c31648..462dd2080e 100644 --- a/internal/apps/Dockerfile +++ b/internal/apps/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21 +FROM golang:1.22 COPY . /dd-trace-go WORKDIR /dd-trace-go/internal/apps # -t will download all dependencies, including test dependencies diff --git a/internal/apps/setup-smoke-test/Dockerfile b/internal/apps/setup-smoke-test/Dockerfile index 7828ed071a..72b451e8bd 100644 --- a/internal/apps/setup-smoke-test/Dockerfile +++ b/internal/apps/setup-smoke-test/Dockerfile @@ -17,7 +17,7 @@ # select one by default, but also allows to provide a --build-arg option # too instead of relying on the --target option. This way, the CI matrix # can systematically use --build-arg for all of the parameters. -ARG go="1.21" # golang docker image parameter in `golang:{go}-{buildenv}` +ARG go="1.22" # golang docker image parameter in `golang:{go}-{buildenv}` ARG build_env="bookworm" # golang docker image parameter in `golang:{go}-{buildenv}` ARG build_with_cgo="0" # 0 or 1 ARG build_with_vendoring="" # y or empty