From e69d9808241fa59013386e9d0cc60f279bf5dbd0 Mon Sep 17 00:00:00 2001 From: Christian Simon Date: Mon, 24 Nov 2025 15:07:52 +0000 Subject: [PATCH] Update go version to 1.24.10 Also update the script for `.pyroscope.yaml` (was missed in #4606) --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/fuzzer.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test-examples.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- .github/workflows/weekly-release.yml | 2 +- .goreleaser.yaml | 2 +- .pyroscope.yaml | 2 +- examples/golang-pgo/Dockerfile | 2 +- .../golang-push/rideshare-alloy/Dockerfile | 2 +- .../rideshare-alloy/Dockerfile.load-generator | 2 +- .../golang-push/rideshare-k6/Dockerfile | 2 +- .../rideshare-k6/Dockerfile.load-generator | 2 +- .../golang-push/rideshare/Dockerfile | 2 +- .../golang-push/rideshare/Dockerfile.load-generator | 2 +- .../golang-push/simple/Dockerfile | 2 +- examples/tracing/golang-push/Dockerfile | 2 +- .../tracing/golang-push/Dockerfile.load-generator | 2 +- tools/upgrade-go-version.sh | 3 +++ 19 files changed, 26 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44ac143ac4..2438c3b7e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: - name: Install Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.9 + go-version: 1.24.10 - name: Format run: make fmt check/unstaged-changes check-generated: @@ -40,7 +40,7 @@ jobs: - name: Install Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.9 + go-version: 1.24.10 - name: Check generated files run: make generate check/unstaged-changes test: @@ -63,7 +63,7 @@ jobs: - name: Install Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.9 + go-version: 1.24.10 - name: Go Mod run: make check/go/mod - name: Test @@ -78,7 +78,7 @@ jobs: - name: Install Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.9 + go-version: 1.24.10 - name: Run linter run: make lint - name: Check helm manifests @@ -109,7 +109,7 @@ jobs: - name: Set up go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.9 + go-version: 1.24.10 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: 20 @@ -139,7 +139,7 @@ jobs: - name: Set up go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.9 + go-version: 1.24.10 # login to docker hub - id: get-secrets uses: grafana/shared-workflows/actions/get-vault-secrets@eb33f84481d38701f4d2c587a4817ce332784f5f diff --git a/.github/workflows/fuzzer.yml b/.github/workflows/fuzzer.yml index 45dfb65491..4cd5d414b0 100644 --- a/.github/workflows/fuzzer.yml +++ b/.github/workflows/fuzzer.yml @@ -16,6 +16,6 @@ jobs: - name: Install Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.9 + go-version: 1.24.10 - name: Run Fuzz_Merge_Single run: go test -fuzz=Fuzz_Merge_Single --fuzztime 1h -run '^$' -v ./pkg/pprof/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 327d57d5d5..40f346a8dd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: - run: git fetch --force --tags - uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: "1.24.9" + go-version: "1.24.10" cache: false - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 with: diff --git a/.github/workflows/test-examples.yml b/.github/workflows/test-examples.yml index 9c3747562c..c7eeae7563 100644 --- a/.github/workflows/test-examples.yml +++ b/.github/workflows/test-examples.yml @@ -22,6 +22,6 @@ jobs: - name: Install Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.9 + go-version: 1.24.10 - name: Run tests run: make examples/test diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 44dfc01aec..753bb703f8 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -44,7 +44,7 @@ jobs: echo "user-id=$(gh api "/users/${APP_BOT}" --jq .id)" >> "$GITHUB_OUTPUT" - uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6 with: - go-version: 1.24.9 + go-version: 1.24.10 - name: Update contributors run: make update-contributors diff --git a/.github/workflows/weekly-release.yml b/.github/workflows/weekly-release.yml index 69d41daa38..7fb5146112 100644 --- a/.github/workflows/weekly-release.yml +++ b/.github/workflows/weekly-release.yml @@ -33,7 +33,7 @@ jobs: git tag "$WEEKLY_IMAGE_TAG" - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5 with: - go-version: "1.24.9" + go-version: "1.24.10" cache: false # setup docker buildx - name: Set up QEMU diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 4d24f63a14..5a2207e164 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -3,7 +3,7 @@ version: 2 before: hooks: # This hook ensures that goreleaser uses the correct go version for a Pyroscope release - - sh -euc 'go version | grep "go version go1.24.9 " || { echo "Unexpected go version"; exit 1; }' + - sh -euc 'go version | grep "go version go1.24.10 " || { echo "Unexpected go version"; exit 1; }' env: # Strip debug information from the binary by default, weekly builds will have debug information - GORELEASER_DEBUG_INFO_FLAGS={{ if and (index .Env "GORELEASER_STRIP_DEBUG_INFO") (eq .Env.GORELEASER_STRIP_DEBUG_INFO "false") }}{{ else }}-s -w{{ end }} diff --git a/.pyroscope.yaml b/.pyroscope.yaml index 96190e2e8a..ee295db87a 100644 --- a/.pyroscope.yaml +++ b/.pyroscope.yaml @@ -8,5 +8,5 @@ source_code: github: owner: golang repo: go - ref: go1.24.8 + ref: go1.24.10 path: src diff --git a/examples/golang-pgo/Dockerfile b/examples/golang-pgo/Dockerfile index 532f350314..d94a77078a 100644 --- a/examples/golang-pgo/Dockerfile +++ b/examples/golang-pgo/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.9 +FROM golang:1.24.10 WORKDIR /go/src/app COPY . . diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare-alloy/Dockerfile b/examples/language-sdk-instrumentation/golang-push/rideshare-alloy/Dockerfile index d09e153497..38bc94cdf4 100644 --- a/examples/language-sdk-instrumentation/golang-push/rideshare-alloy/Dockerfile +++ b/examples/language-sdk-instrumentation/golang-push/rideshare-alloy/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.9 +FROM golang:1.24.10 WORKDIR /go/src/app COPY . . diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare-alloy/Dockerfile.load-generator b/examples/language-sdk-instrumentation/golang-push/rideshare-alloy/Dockerfile.load-generator index bcd760f7d8..c3549cb756 100644 --- a/examples/language-sdk-instrumentation/golang-push/rideshare-alloy/Dockerfile.load-generator +++ b/examples/language-sdk-instrumentation/golang-push/rideshare-alloy/Dockerfile.load-generator @@ -1,4 +1,4 @@ -FROM golang:1.24.9 +FROM golang:1.24.10 WORKDIR /go/src/app COPY . . diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare-k6/Dockerfile b/examples/language-sdk-instrumentation/golang-push/rideshare-k6/Dockerfile index d09e153497..38bc94cdf4 100644 --- a/examples/language-sdk-instrumentation/golang-push/rideshare-k6/Dockerfile +++ b/examples/language-sdk-instrumentation/golang-push/rideshare-k6/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.9 +FROM golang:1.24.10 WORKDIR /go/src/app COPY . . diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare-k6/Dockerfile.load-generator b/examples/language-sdk-instrumentation/golang-push/rideshare-k6/Dockerfile.load-generator index bcd760f7d8..c3549cb756 100644 --- a/examples/language-sdk-instrumentation/golang-push/rideshare-k6/Dockerfile.load-generator +++ b/examples/language-sdk-instrumentation/golang-push/rideshare-k6/Dockerfile.load-generator @@ -1,4 +1,4 @@ -FROM golang:1.24.9 +FROM golang:1.24.10 WORKDIR /go/src/app COPY . . diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare/Dockerfile b/examples/language-sdk-instrumentation/golang-push/rideshare/Dockerfile index d09e153497..38bc94cdf4 100644 --- a/examples/language-sdk-instrumentation/golang-push/rideshare/Dockerfile +++ b/examples/language-sdk-instrumentation/golang-push/rideshare/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.9 +FROM golang:1.24.10 WORKDIR /go/src/app COPY . . diff --git a/examples/language-sdk-instrumentation/golang-push/rideshare/Dockerfile.load-generator b/examples/language-sdk-instrumentation/golang-push/rideshare/Dockerfile.load-generator index bcd760f7d8..c3549cb756 100644 --- a/examples/language-sdk-instrumentation/golang-push/rideshare/Dockerfile.load-generator +++ b/examples/language-sdk-instrumentation/golang-push/rideshare/Dockerfile.load-generator @@ -1,4 +1,4 @@ -FROM golang:1.24.9 +FROM golang:1.24.10 WORKDIR /go/src/app COPY . . diff --git a/examples/language-sdk-instrumentation/golang-push/simple/Dockerfile b/examples/language-sdk-instrumentation/golang-push/simple/Dockerfile index 4d31606b9c..88cd4cf11e 100644 --- a/examples/language-sdk-instrumentation/golang-push/simple/Dockerfile +++ b/examples/language-sdk-instrumentation/golang-push/simple/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.9 +FROM golang:1.24.10 WORKDIR /go/src/app diff --git a/examples/tracing/golang-push/Dockerfile b/examples/tracing/golang-push/Dockerfile index d09e153497..38bc94cdf4 100644 --- a/examples/tracing/golang-push/Dockerfile +++ b/examples/tracing/golang-push/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.9 +FROM golang:1.24.10 WORKDIR /go/src/app COPY . . diff --git a/examples/tracing/golang-push/Dockerfile.load-generator b/examples/tracing/golang-push/Dockerfile.load-generator index bcd760f7d8..c3549cb756 100644 --- a/examples/tracing/golang-push/Dockerfile.load-generator +++ b/examples/tracing/golang-push/Dockerfile.load-generator @@ -1,4 +1,4 @@ -FROM golang:1.24.9 +FROM golang:1.24.10 WORKDIR /go/src/app COPY . . diff --git a/tools/upgrade-go-version.sh b/tools/upgrade-go-version.sh index fa0fd2ceb2..d1d307afa6 100755 --- a/tools/upgrade-go-version.sh +++ b/tools/upgrade-go-version.sh @@ -13,6 +13,9 @@ git ls-files .github/workflows | xargs sed -i 's/go-version:\([ \["]\+\)\([0-9\. # update goreleaser check sed -i 's/go version go[0-9\.]\+/go version go'$1'/g' .goreleaser.yaml +# update .pyroscope.yaml +sed -i 's/ref: go[0-9\.]\+/ref: go'$1'/g' .pyroscope.yaml + # update all dockerfile versions, skips the elf tests from ebpf DOCKER_FILES=$(git ls-files '**/Dockerfile*' | grep -v ebpf/symtab/elf/testdata/Dockerfile) sed -i 's/golang:[0-9\.]\+/golang:'$1'/g' $DOCKER_FILES