From 51b2bf3fc848fddbd3c8eea063dbac2dcbd5d7fa Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Thu, 8 May 2025 16:09:01 +0200 Subject: [PATCH] [release-11.2.10] Chore: Bump Go version to 1.24.3 (#105113) Chore: Bump Go version to 1.24.3 --- .bingo/golangci-lint.mod | 2 +- .drone.yml | 222 +++++++++++------------ Dockerfile | 2 +- Makefile | 2 +- go.mod | 2 +- go.work | 2 +- pkg/apimachinery/go.mod | 2 +- pkg/apiserver/go.mod | 2 +- pkg/build/go.mod | 2 +- pkg/build/wire/go.mod | 2 +- pkg/promlib/go.mod | 2 +- pkg/promlib/go.sum | 2 + pkg/semconv/go.mod | 2 +- pkg/storage/unified/resource/go.mod | 2 +- pkg/util/xorm/go.mod | 2 +- scripts/build/ci-windows-test/Dockerfile | 2 +- scripts/drone/variables.star | 2 +- scripts/go-workspace/go.mod | 2 +- scripts/modowners/go.mod | 2 +- 19 files changed, 130 insertions(+), 128 deletions(-) diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod index c649e6549b6..9e5d2318f23 100644 --- a/.bingo/golangci-lint.mod +++ b/.bingo/golangci-lint.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.24.2 +go 1.24.3 require github.com/golangci/golangci-lint v1.64.2 // cmd/golangci-lint diff --git a/.drone.yml b/.drone.yml index e04496f3db7..4c488e6a35e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -75,7 +75,7 @@ steps: - go install github.com/bazelbuild/buildtools/buildifier@latest - buildifier --lint=warn -mode=check -r . depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: lint-starlark trigger: event: @@ -424,7 +424,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -433,21 +433,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend - commands: - apk add --update build-base @@ -456,7 +456,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend-integration trigger: event: @@ -510,7 +510,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - echo $(/usr/bin/github-app-external-token) > /github-app/token @@ -554,16 +554,16 @@ steps: - apk add --update make - make gen-go depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-openapi-spec trigger: event: @@ -638,7 +638,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -648,7 +648,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -657,14 +657,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - yarn install --immutable || yarn install --immutable @@ -700,7 +700,7 @@ steps: - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*' - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - -a targz:grafana:linux/arm/v7 --go-version=1.24.2 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.24.3 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - yarn-install @@ -946,7 +946,7 @@ steps: - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER - --go-version=1.24.2 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --tag-format='{{ + --go-version=1.24.3 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i @@ -1107,7 +1107,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1121,7 +1121,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1130,14 +1130,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -1158,7 +1158,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -1179,7 +1179,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -1200,7 +1200,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -1216,7 +1216,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -1232,7 +1232,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -1249,7 +1249,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -1334,7 +1334,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue trigger: event: @@ -1454,7 +1454,7 @@ steps: && return 1; fi depends_on: - clone-enterprise - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: swagger-gen trigger: event: @@ -1569,7 +1569,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1580,7 +1580,7 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - clone-enterprise - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1590,14 +1590,14 @@ steps: - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: - clone-enterprise - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update build-base @@ -1605,7 +1605,7 @@ steps: - go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES} depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: sqlite-benchmark-integration-tests - commands: - apk add --update build-base @@ -1617,7 +1617,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-benchmark-integration-tests - commands: - apk add --update build-base @@ -1628,7 +1628,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-benchmark-integration-tests - commands: - apk add --update build-base @@ -1639,7 +1639,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-benchmark-integration-tests trigger: event: @@ -1714,7 +1714,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue trigger: branch: main @@ -1887,7 +1887,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -1896,21 +1896,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend - commands: - apk add --update build-base @@ -1919,7 +1919,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend-integration trigger: branch: main @@ -1964,22 +1964,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-openapi-spec - commands: - ./bin/build verify-drone @@ -2110,7 +2110,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2120,7 +2120,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2129,14 +2129,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - yarn install --immutable || yarn install --immutable @@ -2171,7 +2171,7 @@ steps: - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*' - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64 - -a targz:grafana:linux/arm/v7 --go-version=1.24.2 --yarn-cache=$$YARN_CACHE_FOLDER + -a targz:grafana:linux/arm/v7 --go-version=1.24.3 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER --grafana-dir=$$PWD > packages.txt depends_on: - update-package-json-version @@ -2453,7 +2453,7 @@ steps: - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER - --go-version=1.24.2 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --tag-format='{{ + --go-version=1.24.3 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i @@ -2657,7 +2657,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -2671,7 +2671,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -2680,14 +2680,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -2708,7 +2708,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -2729,7 +2729,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -2750,7 +2750,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -2766,7 +2766,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -2782,7 +2782,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -2799,7 +2799,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: remote-alertmanager-integration-tests trigger: branch: main @@ -3061,7 +3061,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3070,21 +3070,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend - commands: - apk add --update build-base @@ -3093,7 +3093,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend-integration trigger: branch: @@ -3136,22 +3136,22 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - apk add --update make - make gen-go depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - go run scripts/modowners/modowners.go check go.mod - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-modfile - commands: - apk add --update make - make swagger-validate - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: validate-openapi-spec trigger: branch: @@ -3241,7 +3241,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -3255,7 +3255,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -3264,14 +3264,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -3292,7 +3292,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -3313,7 +3313,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -3334,7 +3334,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -3350,7 +3350,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3366,7 +3366,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -3383,7 +3383,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: remote-alertmanager-integration-tests trigger: branch: @@ -3486,7 +3486,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3616,7 +3616,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3757,7 +3757,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - ./bin/build artifacts packages --artifacts-editions=oss --tag $${DRONE_TAG} --src-bucket @@ -3848,7 +3848,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - commands: - yarn install --immutable || yarn install --immutable @@ -3948,7 +3948,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: compile-build-cmd - depends_on: - compile-build-cmd @@ -4064,7 +4064,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4139,7 +4139,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4256,7 +4256,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4407,7 +4407,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4416,21 +4416,21 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - apk add --update build-base shared-mime-info shared-mime-info-lang - go list -f '{{.Dir}}/...' -m | xargs go test -short -covermode=atomic -timeout=5m depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend - commands: - apk add --update build-base @@ -4439,7 +4439,7 @@ steps: | grep -o '\(.*\)/' | sort -u) depends_on: - wire-install - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: test-backend-integration trigger: cron: @@ -4493,7 +4493,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4637,7 +4637,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4743,7 +4743,7 @@ steps: - export GITHUB_TOKEN=$(cat /github-app/token) - 'dagger run --silent /src/grafana-build artifacts -a $${ARTIFACTS} --grafana-ref=$${GRAFANA_REF} --enterprise-ref=$${ENTERPRISE_REF} --grafana-repo=$${GRAFANA_REPO} --version=$${VERSION} ' - - --go-version=1.24.2 + - --go-version=1.24.3 depends_on: - github-app-generate-token environment: @@ -4764,7 +4764,7 @@ steps: from_secret: grafana_api_key GCP_KEY_BASE64: from_secret: gcp_key_base64 - GO_VERSION: 1.24.2 + GO_VERSION: 1.24.3 GPG_PASSPHRASE: from_secret: packages_gpg_passphrase GPG_PRIVATE_KEY: @@ -4909,7 +4909,7 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-cue - commands: - '# It is required that generated jsonnet is committed and in sync with its inputs.' @@ -4918,14 +4918,14 @@ steps: - apk add --update make - CODEGEN_VERIFY=1 make gen-jsonnet depends_on: [] - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: verify-gen-jsonnet - commands: - apk add --update make - make gen-go depends_on: - verify-gen-cue - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: wire-install - commands: - dockerize -wait tcp://postgres:5432 -timeout 120s @@ -4946,7 +4946,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: postgres-integration-tests - commands: - dockerize -wait tcp://mysql57:3306 -timeout 120s @@ -4967,7 +4967,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql57 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-5.7-integration-tests - commands: - dockerize -wait tcp://mysql80:3306 -timeout 120s @@ -4988,7 +4988,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql80 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: mysql-8.0-integration-tests - commands: - dockerize -wait tcp://redis:6379 -timeout 120s @@ -5004,7 +5004,7 @@ steps: - wait-for-redis environment: REDIS_URL: redis://redis:6379/0 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5020,7 +5020,7 @@ steps: - wait-for-memcached environment: MEMCACHED_HOSTS: memcached:11211 - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: memcached-integration-tests - commands: - dockerize -wait tcp://mimir_backend:8080 -timeout 120s @@ -5037,7 +5037,7 @@ steps: AM_TENANT_ID: test AM_URL: http://mimir_backend:8080 failure: ignore - image: golang:1.24.2-alpine + image: golang:1.24.3-alpine name: remote-alertmanager-integration-tests trigger: event: @@ -5343,7 +5343,7 @@ steps: - commands: - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM docker:27-cli - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1 - - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.2-alpine + - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.24.3-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20-bookworm - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 @@ -5382,7 +5382,7 @@ steps: - commands: - trivy --exit-code 1 --severity HIGH,CRITICAL docker:27-cli - trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1 - - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.2-alpine + - trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.24.3-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20-bookworm - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 @@ -5640,6 +5640,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: f0da71ffaa44671a6c0666891461ea51386f1c5c6b3b0c8bda1c056fdb501989 +hmac: 049337c510fd6ac65a603e821339ecedeebfe90149535cbc1e504e3f12869d49 ... diff --git a/Dockerfile b/Dockerfile index 90691308f6d..29cb901d5b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG BASE_IMAGE=alpine:3.21 ARG JS_IMAGE=node:20-alpine ARG JS_PLATFORM=linux/amd64 -ARG GO_IMAGE=golang:1.24.2-alpine +ARG GO_IMAGE=golang:1.24.3-alpine # Default to building locally ARG GO_SRC=go-builder diff --git a/Makefile b/Makefile index 9df3137f171..9e898803a8c 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .bingo/Variables.mk GO = go -GO_VERSION = 1.24.2 +GO_VERSION = 1.24.3 GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh) GO_TEST_FILES ?= $(shell ./scripts/go-workspace/test-includes.sh) SH_FILES ?= $(shell find ./scripts -name *.sh) diff --git a/go.mod b/go.mod index 041402aacb2..f3813bdb370 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.24.2 +go 1.24.3 // contains openapi encoder fixes. remove ASAP replace cuelang.org/go => github.com/grafana/cue v0.0.0-20230926092038-971951014e3f // @grafana/grafana-as-code diff --git a/go.work b/go.work index 520bf8a65e5..36360d8c102 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.24.2 +go 1.24.3 // The `skip:golangci-lint` comment tag is used to exclude the package from the `golangci-lint` GitHub Action. // The module at the root of the repo (`.`) is excluded because ./pkg/... is included manually in the `golangci-lint` configuration. diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod index 9252caa1f08..8845dbe6d57 100644 --- a/pkg/apimachinery/go.mod +++ b/pkg/apimachinery/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apimachinery -go 1.24.2 +go 1.24.3 require ( github.com/grafana/authlib v0.0.0-20240730122259-a0d13672efb1 diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod index 0045c0fa2d6..2e7386a9a40 100644 --- a/pkg/apiserver/go.mod +++ b/pkg/apiserver/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apiserver -go 1.24.2 +go 1.24.3 require ( github.com/google/go-cmp v0.6.0 diff --git a/pkg/build/go.mod b/pkg/build/go.mod index a851fa127af..a548931ada1 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.24.2 +go 1.24.3 // Override docker/docker to avoid: // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires diff --git a/pkg/build/wire/go.mod b/pkg/build/wire/go.mod index 2ef3afb3b08..02a2c3e77f8 100644 --- a/pkg/build/wire/go.mod +++ b/pkg/build/wire/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build/wire -go 1.24.2 +go 1.24.3 require ( github.com/google/go-cmp v0.6.0 diff --git a/pkg/promlib/go.mod b/pkg/promlib/go.mod index dcee38f1adc..244fd44f717 100644 --- a/pkg/promlib/go.mod +++ b/pkg/promlib/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/promlib -go 1.24.2 +go 1.24.3 require ( github.com/grafana/grafana-plugin-sdk-go v0.241.0 diff --git a/pkg/promlib/go.sum b/pkg/promlib/go.sum index f8d2e88fba2..b038e2d6f7c 100644 --- a/pkg/promlib/go.sum +++ b/pkg/promlib/go.sum @@ -267,7 +267,9 @@ go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0. go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I= go.opentelemetry.io/contrib/propagators/jaeger v1.29.0 h1:+YPiqF5rR6PqHBlmEFLPumbSP0gY0WmCGFayXRcCLvs= +go.opentelemetry.io/contrib/propagators/jaeger v1.29.0/go.mod h1:6PD7q7qquWSp3Z4HeM3e/2ipRubaY1rXZO8NIHVDZjs= go.opentelemetry.io/contrib/samplers/jaegerremote v0.23.0 h1:qKi9ntCcronqWqfuKxqrxZlZd82jXJEgGiAWH1+phxo= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.23.0/go.mod h1:1kbAgQa5lgYC3rC6cE3jSxQ/Q13l33wv/WI8U+htwag= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod index cec583fccc4..a17b4c5707c 100644 --- a/pkg/semconv/go.mod +++ b/pkg/semconv/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/semconv -go 1.24.2 +go 1.24.3 require go.opentelemetry.io/otel v1.34.0 diff --git a/pkg/storage/unified/resource/go.mod b/pkg/storage/unified/resource/go.mod index ea6781114b5..06c7d132754 100644 --- a/pkg/storage/unified/resource/go.mod +++ b/pkg/storage/unified/resource/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/storage/unified/resource -go 1.24.2 +go 1.24.3 require ( github.com/fullstorydev/grpchan v1.1.1 diff --git a/pkg/util/xorm/go.mod b/pkg/util/xorm/go.mod index 55256669007..c0c03e62929 100644 --- a/pkg/util/xorm/go.mod +++ b/pkg/util/xorm/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/util/xorm -go 1.24.2 +go 1.24.3 require ( github.com/mattn/go-sqlite3 v1.14.22 diff --git a/scripts/build/ci-windows-test/Dockerfile b/scripts/build/ci-windows-test/Dockerfile index f5573d1cb9f..41d18ffc62c 100644 --- a/scripts/build/ci-windows-test/Dockerfile +++ b/scripts/build/ci-windows-test/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.2-windowsservercore-1809 +FROM golang:1.24.3-windowsservercore-1809 SHELL ["powershell", "-command"] diff --git a/scripts/drone/variables.star b/scripts/drone/variables.star index 54b76ba1804..511223cc91e 100644 --- a/scripts/drone/variables.star +++ b/scripts/drone/variables.star @@ -3,7 +3,7 @@ global variables """ grabpl_version = "v3.1.2" -golang_version = "1.24.2" +golang_version = "1.24.3" # nodejs_version should match what's in ".nvmrc", but without the v prefix. nodejs_version = "20.9.0" diff --git a/scripts/go-workspace/go.mod b/scripts/go-workspace/go.mod index 0fecdb95ce7..3f63f74e724 100644 --- a/scripts/go-workspace/go.mod +++ b/scripts/go-workspace/go.mod @@ -1,5 +1,5 @@ module github.com/grafana/grafana/scripts/go-workspace -go 1.24.2 +go 1.24.3 require golang.org/x/mod v0.20.0 diff --git a/scripts/modowners/go.mod b/scripts/modowners/go.mod index e0963d9a06a..b6401606139 100644 --- a/scripts/modowners/go.mod +++ b/scripts/modowners/go.mod @@ -1,5 +1,5 @@ module github.com/grafana/grafana/scripts/modowners -go 1.24.2 +go 1.24.3 require golang.org/x/mod v0.17.0