diff --git a/.github/actions/setup-go-tip/action.yml b/.github/actions/setup-go-tip/action.yml index 4d0be775881..3f3ba22a5cc 100644 --- a/.github/actions/setup-go-tip/action.yml +++ b/.github/actions/setup-go-tip/action.yml @@ -45,7 +45,7 @@ runs: if: steps.download.outputs.success == 'false' uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Build Go Tip from source if: steps.download.outputs.success == 'false' diff --git a/.github/workflows/ci-build-binaries.yml b/.github/workflows/ci-build-binaries.yml index c0ff2b7927b..7e4764eb012 100644 --- a/.github/workflows/ci-build-binaries.yml +++ b/.github/workflows/ci-build-binaries.yml @@ -52,7 +52,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Setup Node.js version uses: ./.github/actions/setup-node.js diff --git a/.github/workflows/ci-crossdock.yml b/.github/workflows/ci-crossdock.yml index 013195306e6..97fe88f3089 100644 --- a/.github/workflows/ci-crossdock.yml +++ b/.github/workflows/ci-crossdock.yml @@ -35,7 +35,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Export BRANCH variable uses: ./.github/actions/setup-branch diff --git a/.github/workflows/ci-docker-all-in-one.yml b/.github/workflows/ci-docker-all-in-one.yml index 6874f737af1..95bb409f2f7 100644 --- a/.github/workflows/ci-docker-all-in-one.yml +++ b/.github/workflows/ci-docker-all-in-one.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Setup Node.js version uses: ./.github/actions/setup-node.js diff --git a/.github/workflows/ci-docker-build.yml b/.github/workflows/ci-docker-build.yml index 5e4ccf4b9ab..fcbed368af6 100644 --- a/.github/workflows/ci-docker-build.yml +++ b/.github/workflows/ci-docker-build.yml @@ -35,7 +35,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Setup Node.js version uses: ./.github/actions/setup-node.js diff --git a/.github/workflows/ci-docker-hotrod.yml b/.github/workflows/ci-docker-hotrod.yml index 54bf1d13cca..3bb9e902a40 100644 --- a/.github/workflows/ci-docker-hotrod.yml +++ b/.github/workflows/ci-docker-hotrod.yml @@ -34,7 +34,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Export BRANCH variable uses: ./.github/actions/setup-branch diff --git a/.github/workflows/ci-e2e-badger.yaml b/.github/workflows/ci-e2e-badger.yaml index 3a05f57fd0e..754de61e306 100644 --- a/.github/workflows/ci-e2e-badger.yaml +++ b/.github/workflows/ci-e2e-badger.yaml @@ -31,7 +31,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Run Badger storage integration tests run: | diff --git a/.github/workflows/ci-e2e-cassandra.yml b/.github/workflows/ci-e2e-cassandra.yml index 5bb72dfc7fd..6ba76478f6a 100644 --- a/.github/workflows/ci-e2e-cassandra.yml +++ b/.github/workflows/ci-e2e-cassandra.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Run cassandra integration tests id: test-execution diff --git a/.github/workflows/ci-e2e-elasticsearch.yml b/.github/workflows/ci-e2e-elasticsearch.yml index 4217092429f..2a5165b3bf3 100644 --- a/.github/workflows/ci-e2e-elasticsearch.yml +++ b/.github/workflows/ci-e2e-elasticsearch.yml @@ -51,7 +51,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 - name: Run ${{ matrix.version.distribution }} integration tests diff --git a/.github/workflows/ci-e2e-grpc.yml b/.github/workflows/ci-e2e-grpc.yml index 76fc22c4772..8c555ec67e1 100644 --- a/.github/workflows/ci-e2e-grpc.yml +++ b/.github/workflows/ci-e2e-grpc.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Run gRPC storage integration tests run: | diff --git a/.github/workflows/ci-e2e-kafka.yml b/.github/workflows/ci-e2e-kafka.yml index a4754e1d89d..0b1dfa79250 100644 --- a/.github/workflows/ci-e2e-kafka.yml +++ b/.github/workflows/ci-e2e-kafka.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Run Kafka integration tests id: test-execution diff --git a/.github/workflows/ci-e2e-memory.yaml b/.github/workflows/ci-e2e-memory.yaml index de7f30c06a1..369f4e93a8e 100644 --- a/.github/workflows/ci-e2e-memory.yaml +++ b/.github/workflows/ci-e2e-memory.yaml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Run Memory storage integration tests run: | diff --git a/.github/workflows/ci-e2e-opensearch.yml b/.github/workflows/ci-e2e-opensearch.yml index 725d59c89a3..a25f3ed8f26 100644 --- a/.github/workflows/ci-e2e-opensearch.yml +++ b/.github/workflows/ci-e2e-opensearch.yml @@ -48,7 +48,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0 diff --git a/.github/workflows/ci-e2e-spm.yml b/.github/workflows/ci-e2e-spm.yml index 2952237fa45..18df0f7cfdc 100644 --- a/.github/workflows/ci-e2e-spm.yml +++ b/.github/workflows/ci-e2e-spm.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Setup Node.js version uses: ./.github/actions/setup-node.js diff --git a/.github/workflows/ci-lint-checks.yaml b/.github/workflows/ci-lint-checks.yaml index c724050cb66..552cf848786 100644 --- a/.github/workflows/ci-lint-checks.yaml +++ b/.github/workflows/ci-lint-checks.yaml @@ -41,7 +41,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Print Jaeger version run: make echo-version diff --git a/.github/workflows/ci-lint-protogen.yml b/.github/workflows/ci-lint-protogen.yml index 781fc43d327..d9d23613677 100644 --- a/.github/workflows/ci-lint-protogen.yml +++ b/.github/workflows/ci-lint-protogen.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Verify Protobuf types are up to date run: make proto && git diff --name-status --exit-code diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index ed549f0d24f..79ca8acfa9b 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Setup Node.js version uses: ./.github/actions/setup-node.js diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml index 6da6bd517b4..2fd01310245 100644 --- a/.github/workflows/ci-unit-tests.yml +++ b/.github/workflows/ci-unit-tests.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x cache-dependency-path: ./go.sum # download dependencies separately to keep unit test step's output cleaner diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index 2d0a9269f4b..141f934a113 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: 1.22.x + go-version: 1.23.x - name: Add GOPATH run: | diff --git a/.golangci.yml b/.golangci.yml index cd25a013c21..7a45e156e89 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -240,5 +240,5 @@ linters-settings: - suite-extra-assert-call run: - go: "1.21" + go: "1.22" timeout: 20m diff --git a/Makefile b/Makefile index 7f8089bd1e8..cf498ff11d0 100644 --- a/Makefile +++ b/Makefile @@ -493,8 +493,10 @@ init-submodules: MOCKERY_FLAGS := --all --disable-version-string .PHONY: generate-mocks +# TODO remove GODEBUG=gotypesalias=0 +# once this is fixed: https://github.com/vektra/mockery/issues/803 generate-mocks: $(MOCKERY) - $(MOCKERY) + GODEBUG=gotypesalias=0 $(MOCKERY) .PHONY: certs certs: diff --git a/docker/debug/Dockerfile b/docker/debug/Dockerfile index b3fcbf724a9..e14b048c97b 100644 --- a/docker/debug/Dockerfile +++ b/docker/debug/Dockerfile @@ -1,7 +1,7 @@ # Copyright (c) 2024 The Jaeger Authors. # SPDX-License-Identifier: Apache-2.0 -FROM golang:1.22.6-alpine AS build +FROM golang:1.23.0-alpine AS build ARG TARGETARCH ENV GOPATH /go RUN apk add --update --no-cache ca-certificates make git build-base mailcap @@ -13,7 +13,7 @@ RUN if [[ "$TARGETARCH" == "s390x" || "$TARGETARCH" == "ppc64le" ]] ; then \ go install github.com/go-delve/delve/cmd/dlv@latest; \ fi -FROM golang:1.22.6-alpine +FROM golang:1.23.0-alpine COPY --from=build /go/bin/dlv /go/bin/dlv COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=build /etc/mime.types /etc/mime.types diff --git a/go.mod b/go.mod index f54bb7056e4..e659817e2e5 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/jaegertracing/jaeger -go 1.21.0 +go 1.22.0 -toolchain go1.22.6 +toolchain go1.23.0 require ( github.com/HdrHistogram/hdrhistogram-go v1.1.2 diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 155758494a1..6a8ffed0957 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,6 @@ module github.com/jaegertracing/jaeger/internal/tools -go 1.22.3 +go 1.23.0 require ( github.com/golangci/golangci-lint v1.60.0 diff --git a/scripts/check-go-version.sh b/scripts/check-go-version.sh index d331059eeea..b2c74881481 100755 --- a/scripts/check-go-version.sh +++ b/scripts/check-go-version.sh @@ -64,7 +64,7 @@ function check() { if [ "$go_version" = "$target" ]; then mismatch='' else - mismatch='*** needs update ***' + mismatch="*** needs update to $target ***" files_to_update=$((files_to_update+1)) fi