Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to go 1.22 #3757

Merged
merged 3 commits into from
Jun 10, 2024
+42 −10,300
Merged

Upgrade to go 1.22 #3757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29f40ff
1.21 -> 1.22
joe-elliott Jun 7, 2024
8d1fc66
changelog
joe-elliott Jun 7, 2024
8c19236
vendor-check
joe-elliott Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .drone/drone.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ local image_tag_for_cd() = {

local build_binaries(arch) = {
name: 'build-tempo-binaries',
image: 'golang:1.21.3-alpine',
image: 'golang:1.22-alpine',
commands: [
'apk --update --no-cache add make git bash',
] + [
Expand Down Expand Up @@ -251,7 +251,7 @@ local deploy_to_dev() = {
steps+: [
{
name: 'build-tempo-serverless',
image: 'golang:1.21.3-alpine',
image: 'golang:1.22-alpine',
commands: [
'apk add make git zip bash',
'./tools/image-tag | cut -d, -f 1 | tr A-Z a-z > .tags', // values in .tags are used by the next step when pushing the image
Expand Down Expand Up @@ -348,7 +348,7 @@ local deploy_to_dev() = {
},
{
name: 'write-key',
image: 'golang:1.21.3',
image: 'golang:1.22',
commands: ['printf "%s" "$NFPM_SIGNING_KEY" > $NFPM_SIGNING_KEY_FILE'],
environment: {
NFPM_SIGNING_KEY: { from_secret: gpg_private_key.name },
Expand All @@ -357,7 +357,7 @@ local deploy_to_dev() = {
},
{
name: 'test release',
image: 'golang:1.21.3',
image: 'golang:1.22',
commands: ['make release-snapshot'],
environment: {
NFPM_DEFAULT_PASSPHRASE: { from_secret: gpg_passphrase.name },
Expand Down Expand Up @@ -390,7 +390,7 @@ local deploy_to_dev() = {
},
{
name: 'release',
image: 'golang:1.21.3',
image: 'golang:1.22',
commands: ['make release'],
environment: {
GITHUB_TOKEN: { from_secret: gh_token_secret.name },
Expand Down
12 changes: 6 additions & 6 deletions .drone/drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
- COMPONENT=tempo GOARCH=amd64 make exe
- COMPONENT=tempo-vulture GOARCH=amd64 make exe
- COMPONENT=tempo-query GOARCH=amd64 make exe
image: golang:1.21.3-alpine
image: golang:1.22-alpine
name: build-tempo-binaries
- image: plugins/docker
name: build-tempo-image
Expand Down Expand Up @@ -81,7 +81,7 @@ steps:
- COMPONENT=tempo GOARCH=arm64 make exe
- COMPONENT=tempo-vulture GOARCH=arm64 make exe
- COMPONENT=tempo-query GOARCH=arm64 make exe
image: golang:1.21.3-alpine
image: golang:1.22-alpine
name: build-tempo-binaries
- image: plugins/docker
name: build-tempo-image
Expand Down Expand Up @@ -342,7 +342,7 @@ steps:
- cd ./cmd/tempo-serverless
- make build-docker-gcr-binary
- make build-lambda-zip
image: golang:1.21.3-alpine
image: golang:1.22-alpine
name: build-tempo-serverless
- image: plugins/gcr
name: deploy-tempo-serverless-gcr
Expand Down Expand Up @@ -412,15 +412,15 @@ steps:
NFPM_SIGNING_KEY:
from_secret: gpg_private_key
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: golang:1.21.3
image: golang:1.22
name: write-key
- commands:
- make release-snapshot
environment:
NFPM_DEFAULT_PASSPHRASE:
from_secret: gpg_passphrase
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: golang:1.21.3
image: golang:1.22
name: test release
- commands:
- ./tools/packaging/verify-deb-install.sh
Expand All @@ -446,7 +446,7 @@ steps:
NFPM_DEFAULT_PASSPHRASE:
from_secret: gpg_passphrase
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: golang:1.21.3
image: golang:1.22
name: release
when:
event:
Expand Down
44 changes: 22 additions & 22 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
name: Lint
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code
uses: actions/checkout@v4
Expand All @@ -45,10 +45,10 @@ jobs:
name: Test packages - pkg
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code
uses: actions/checkout@v4
Expand All @@ -60,10 +60,10 @@ jobs:
name: Test packages - tempodb
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code
uses: actions/checkout@v4
Expand All @@ -75,10 +75,10 @@ jobs:
name: Test packages - tempodb/wal
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code
uses: actions/checkout@v4
Expand All @@ -90,10 +90,10 @@ jobs:
name: Test packages - others
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code
uses: actions/checkout@v4
Expand All @@ -105,10 +105,10 @@ jobs:
name: Test integration e2e suite
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code
uses: actions/checkout@v4
Expand All @@ -123,10 +123,10 @@ jobs:
name: Test serverless integration e2e suite
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code
uses: actions/checkout@v4
Expand All @@ -138,10 +138,10 @@ jobs:
name: Build
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code
uses: actions/checkout@v4
Expand All @@ -162,10 +162,10 @@ jobs:
name: Benchmark
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code
uses: actions/checkout@v4
Expand All @@ -177,10 +177,10 @@ jobs:
name: Vendor check
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code
uses: actions/checkout@v4
Expand All @@ -197,10 +197,10 @@ jobs:
name: Check jsonnet & tempo-mixin
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependabot_serverless_gomod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
steps:
- name: Set up Go 1.21
- name: Set up Go 1.22
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x

- name: Check out code
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## main / unreleased
* [CHANGE] Bump Jaeger query docker image to 1.57.0 [#3652](https://github.com/grafana/tempo/issues/3652) (@iblancasa)

* [CHANGE] Update Go to 1.22 [#3757](https://github.com/grafana/tempo/pull/3757) (@joe-elliott)
* [FEATURE] TraceQL support for link scope and link:traceID and link:spanID [#3741](https://github.com/grafana/tempo/pull/3741) (@stoewer)
* [FEATURE] TraceQL support for event scope and event:name intrinsic [#3708](https://github.com/grafana/tempo/pull/3708) (@stoewer)
* [FEATURE] Flush and query RF1 blocks for TraceQL metric queries [#3628](https://github.com/grafana/tempo/pull/3628) [#3691](https://github.com/grafana/tempo/pull/3691) [#3723](https://github.com/grafana/tempo/pull/3723) (@mapno)
Expand Down
4 changes: 2 additions & 2 deletions cmd/tempo-serverless/cloud-run/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/grafana/tempo/cmd/tempo-serverless/cloud-run

go 1.21
go 1.22

toolchain go1.21.0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the .0 important? would it be better to specify the minor version only and let the patch float?

toolchain go1.22.0

require (
github.com/gogo/protobuf v1.3.2
Expand Down
4 changes: 2 additions & 2 deletions cmd/tempo-serverless/lambda/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/grafana/tempo/cmd/tempo-serverless/lambda

go 1.21
go 1.22

toolchain go1.21.0
toolchain go1.22.0

require (
github.com/aws/aws-lambda-go v1.28.0
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/grafana/tempo

go 1.21
go 1.22

require (
cloud.google.com/go/storage v1.36.0
Expand Down
2 changes: 1 addition & 1 deletion tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/grafana/tempo/tools

go 1.21
go 1.22

require (
github.com/golangci/golangci-lint v1.57.2
Expand Down
Binary file removed ...r/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_intermediate_cert.der
View file
Open in desktop
Binary file not shown.
Binary file removed vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_leaf_cert.der
View file
Open in desktop
Binary file not shown.
Binary file removed vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_root_cert.der
View file
Open in desktop
Binary file not shown.
Binary file removed ...r/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_intermediate_cert.der
View file
Open in desktop
Binary file not shown.
Binary file removed vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_leaf_cert.der
View file
Open in desktop
Binary file not shown.
Binary file removed vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_root_cert.der
View file
Open in desktop
Binary file not shown.
Binary file removed vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.der
View file
Open in desktop
Binary file not shown.
24 changes: 0 additions & 24 deletions vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.pem
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_key.pem
View file
Open in desktop

This file was deleted.

Binary file removed vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.der
View file
Open in desktop
Binary file not shown.
24 changes: 0 additions & 24 deletions vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.pem
View file
Open in desktop

This file was deleted.

Loading
Loading