From b8fd1b6c6b1e8b33f6e1a308fbbcde5892d4e8a5 Mon Sep 17 00:00:00 2001 From: Ryan McKinley Date: Thu, 23 Apr 2026 17:40:14 +0300 Subject: [PATCH] Chore: use go 1.26.2 (#123379) * golang 1.26 * bump all modules and docker file * fix plugins test --------- Co-authored-by: Matheus Macabu --- .citools/src/air/go.mod | 2 +- .citools/src/cog/go.mod | 2 +- .citools/src/cue/go.mod | 2 +- .citools/src/golangci-lint/go.mod | 2 +- .citools/src/jb/go.mod | 2 +- .citools/src/lefthook/go.mod | 2 +- .citools/src/swagger/go.mod | 2 +- Dockerfile | 2 +- Makefile | 2 +- apps/advisor/go.mod | 2 +- apps/alerting/alertenrichment/go.mod | 2 +- apps/alerting/historian/go.mod | 2 +- apps/alerting/notifications/go.mod | 2 +- apps/alerting/rules/go.mod | 2 +- apps/annotation/go.mod | 2 +- apps/collections/go.mod | 2 +- apps/correlations/go.mod | 2 +- apps/dashboard/go.mod | 2 +- apps/dashvalidator/go.mod | 2 +- apps/example/go.mod | 2 +- apps/folder/go.mod | 2 +- apps/iam/go.mod | 2 +- apps/live/go.mod | 2 +- apps/logsdrilldown/go.mod | 2 +- apps/playlist/go.mod | 2 +- apps/plugins/go.mod | 2 +- apps/preferences/go.mod | 2 +- apps/provisioning/go.mod | 2 +- apps/quotas/go.mod | 2 +- apps/scope/go.mod | 2 +- apps/secret/go.mod | 2 +- apps/shorturl/go.mod | 2 +- devenv/docker/blocks/prometheus_high_card/go.mod | 2 +- devenv/docker/blocks/prometheus_utf8/go.mod | 2 +- devenv/docker/blocks/stateful_webhook/Dockerfile | 2 +- go.mod | 2 +- go.work | 2 +- hack/go.mod | 2 +- pkg/aggregator/go.mod | 2 +- pkg/api/plugins_test.go | 6 +----- pkg/apimachinery/go.mod | 2 +- pkg/apiserver/go.mod | 2 +- pkg/build/go.mod | 2 +- pkg/build/wire/go.mod | 2 +- pkg/codegen/go.mod | 2 +- pkg/infra/features/go.mod | 2 +- pkg/plugins/codegen/go.mod | 2 +- pkg/plugins/go.mod | 2 +- pkg/semconv/go.mod | 2 +- pkg/storage/unified/resource/kv/go.mod | 2 +- scripts/go-workspace/go.mod | 2 +- scripts/modowners/go.mod | 2 +- 52 files changed, 52 insertions(+), 56 deletions(-) diff --git a/.citools/src/air/go.mod b/.citools/src/air/go.mod index 69d75bd0b6d..d7265917cb7 100644 --- a/.citools/src/air/go.mod +++ b/.citools/src/air/go.mod @@ -1,6 +1,6 @@ module air -go 1.25.9 +go 1.26.2 tool github.com/air-verse/air diff --git a/.citools/src/cog/go.mod b/.citools/src/cog/go.mod index 049effdd788..4c2b3d59b85 100644 --- a/.citools/src/cog/go.mod +++ b/.citools/src/cog/go.mod @@ -1,6 +1,6 @@ module cog -go 1.25.9 +go 1.26.2 tool github.com/grafana/cog/cmd/cli diff --git a/.citools/src/cue/go.mod b/.citools/src/cue/go.mod index b7cf8746ef6..176f1c89190 100644 --- a/.citools/src/cue/go.mod +++ b/.citools/src/cue/go.mod @@ -1,6 +1,6 @@ module cue -go 1.25.9 +go 1.26.2 tool cuelang.org/go/cmd/cue diff --git a/.citools/src/golangci-lint/go.mod b/.citools/src/golangci-lint/go.mod index 689b8cd77aa..dc92ae7c608 100644 --- a/.citools/src/golangci-lint/go.mod +++ b/.citools/src/golangci-lint/go.mod @@ -1,6 +1,6 @@ module golangci-lint -go 1.25.9 +go 1.26.2 tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint diff --git a/.citools/src/jb/go.mod b/.citools/src/jb/go.mod index 5e4b7f00a2d..2031570ea1b 100644 --- a/.citools/src/jb/go.mod +++ b/.citools/src/jb/go.mod @@ -1,6 +1,6 @@ module jb -go 1.25.9 +go 1.26.2 tool github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb diff --git a/.citools/src/lefthook/go.mod b/.citools/src/lefthook/go.mod index ed716d955cf..2ee3838f56d 100644 --- a/.citools/src/lefthook/go.mod +++ b/.citools/src/lefthook/go.mod @@ -1,6 +1,6 @@ module lefthook -go 1.25.9 +go 1.26.2 tool github.com/evilmartians/lefthook diff --git a/.citools/src/swagger/go.mod b/.citools/src/swagger/go.mod index 5eaf6115926..7f6ad1cd020 100644 --- a/.citools/src/swagger/go.mod +++ b/.citools/src/swagger/go.mod @@ -1,6 +1,6 @@ module swagger -go 1.25.9 +go 1.26.2 tool github.com/go-swagger/go-swagger/cmd/swagger diff --git a/Dockerfile b/Dockerfile index f5ca32bbea3..e9aceb8d25b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG JS_SRC=js-builder # By using FROM instructions we can delegate dependency updates to dependabot FROM alpine:3.23.4 AS alpine-base FROM ubuntu:24.04 AS ubuntu-base -FROM golang:1.25.9-alpine AS go-builder-base +FROM golang:1.26.2-alpine AS go-builder-base FROM --platform=${JS_PLATFORM} node:24-alpine AS js-builder-base # Javascript build stage FROM --platform=${JS_PLATFORM} ${JS_IMAGE} AS js-builder diff --git a/Makefile b/Makefile index 8830157151f..39488ba4384 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ WIRE_TAGS = "oss" include .citools/Variables.mk GO = go -GO_VERSION = 1.25.9 +GO_VERSION = 1.26.2 GO_HOST_OS := $(shell $(GO) env GOHOSTOS) GO_HOST_ARCH := $(shell $(GO) env GOHOSTARCH) GO_LINT_FILES ?= $(shell ./scripts/go-workspace/golangci-lint-includes.sh) diff --git a/apps/advisor/go.mod b/apps/advisor/go.mod index b8d4e3d6920..62c3603b59b 100644 --- a/apps/advisor/go.mod +++ b/apps/advisor/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/advisor -go 1.25.9 +go 1.26.2 require ( github.com/Masterminds/semver/v3 v3.4.0 diff --git a/apps/alerting/alertenrichment/go.mod b/apps/alerting/alertenrichment/go.mod index 98c5fa38932..28184918042 100644 --- a/apps/alerting/alertenrichment/go.mod +++ b/apps/alerting/alertenrichment/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/alertenrichment -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana/pkg/apimachinery v0.0.0-20260118065639-60cb766a97d6 diff --git a/apps/alerting/historian/go.mod b/apps/alerting/historian/go.mod index 55b456d1c97..6d8b3211b11 100644 --- a/apps/alerting/historian/go.mod +++ b/apps/alerting/historian/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/historian -go 1.25.9 +go 1.26.2 require ( github.com/go-kit/log v0.2.1 diff --git a/apps/alerting/notifications/go.mod b/apps/alerting/notifications/go.mod index 46b5cb0caa2..fee2a501740 100644 --- a/apps/alerting/notifications/go.mod +++ b/apps/alerting/notifications/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/notifications -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/apps/alerting/rules/go.mod b/apps/alerting/rules/go.mod index db4e532ab87..9c953ba06ac 100644 --- a/apps/alerting/rules/go.mod +++ b/apps/alerting/rules/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/alerting/rules -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/apps/annotation/go.mod b/apps/annotation/go.mod index 2cf8b00129d..d37a19b13f1 100644 --- a/apps/annotation/go.mod +++ b/apps/annotation/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/annotation -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/apps/collections/go.mod b/apps/collections/go.mod index 709b8882a28..3aff38d0ee9 100644 --- a/apps/collections/go.mod +++ b/apps/collections/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/collections -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/apps/correlations/go.mod b/apps/correlations/go.mod index 84691afa4af..de66bfed9d7 100644 --- a/apps/correlations/go.mod +++ b/apps/correlations/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/correlations -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/apps/dashboard/go.mod b/apps/dashboard/go.mod index 540aad535e6..768b3dd73d5 100644 --- a/apps/dashboard/go.mod +++ b/apps/dashboard/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/dashboard -go 1.25.9 +go 1.26.2 require ( cuelang.org/go v0.11.1 diff --git a/apps/dashvalidator/go.mod b/apps/dashvalidator/go.mod index 8aac880b965..fbcc02693c9 100644 --- a/apps/dashvalidator/go.mod +++ b/apps/dashvalidator/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/dashvalidator -go 1.25.9 +go 1.26.2 require ( github.com/grafana/authlib/types v0.0.0-20260414201248-d766c8627a66 diff --git a/apps/example/go.mod b/apps/example/go.mod index b60d3fc9b68..db10fedb9d4 100644 --- a/apps/example/go.mod +++ b/apps/example/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/example -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/apps/folder/go.mod b/apps/folder/go.mod index 1a183af4dce..0061c6dc3e7 100644 --- a/apps/folder/go.mod +++ b/apps/folder/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/folder -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/apps/iam/go.mod b/apps/iam/go.mod index 135e48a5fbb..c760f0355dd 100644 --- a/apps/iam/go.mod +++ b/apps/iam/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/iam -go 1.25.9 +go 1.26.2 // transitive dependencies that need replaced // TODO: stop depending on grafana core( diff --git a/apps/live/go.mod b/apps/live/go.mod index 47b3d31ba4b..1ecffe012ae 100644 --- a/apps/live/go.mod +++ b/apps/live/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/live -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/apps/logsdrilldown/go.mod b/apps/logsdrilldown/go.mod index 4f0c3fa9829..41aac0ea3de 100644 --- a/apps/logsdrilldown/go.mod +++ b/apps/logsdrilldown/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/logsdrilldown -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/apps/playlist/go.mod b/apps/playlist/go.mod index 40f863215f8..aef71d95e73 100644 --- a/apps/playlist/go.mod +++ b/apps/playlist/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/playlist -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/apps/plugins/go.mod b/apps/plugins/go.mod index fa97b195393..25874bd8af4 100644 --- a/apps/plugins/go.mod +++ b/apps/plugins/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/plugins -go 1.25.9 +go 1.26.2 replace github.com/grafana/grafana => ../.. diff --git a/apps/preferences/go.mod b/apps/preferences/go.mod index e6124bd31e0..c560f9e8d87 100644 --- a/apps/preferences/go.mod +++ b/apps/preferences/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/preferences -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/apps/provisioning/go.mod b/apps/provisioning/go.mod index 86b46cd6e5e..042840735f4 100644 --- a/apps/provisioning/go.mod +++ b/apps/provisioning/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/provisioning -go 1.25.9 +go 1.26.2 require ( github.com/bwmarrin/snowflake v0.3.0 diff --git a/apps/quotas/go.mod b/apps/quotas/go.mod index ed578809a96..f7babd6d849 100644 --- a/apps/quotas/go.mod +++ b/apps/quotas/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/quotas -go 1.25.9 +go 1.26.2 // transitive dependencies that need replaced // TODO: stop depending on grafana core( diff --git a/apps/scope/go.mod b/apps/scope/go.mod index 61195b40c98..9482c4689d7 100644 --- a/apps/scope/go.mod +++ b/apps/scope/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/scope -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana/pkg/apimachinery v0.0.0-20260118065639-60cb766a97d6 diff --git a/apps/secret/go.mod b/apps/secret/go.mod index 551f6f39a07..1eaf5a2115e 100644 --- a/apps/secret/go.mod +++ b/apps/secret/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/secret -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/apps/shorturl/go.mod b/apps/shorturl/go.mod index daadfc406f8..1f774d12f37 100644 --- a/apps/shorturl/go.mod +++ b/apps/shorturl/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/apps/shorturl -go 1.25.9 +go 1.26.2 require ( github.com/grafana/grafana-app-sdk v0.53.1 diff --git a/devenv/docker/blocks/prometheus_high_card/go.mod b/devenv/docker/blocks/prometheus_high_card/go.mod index 0642d0f80f5..84a476e134f 100644 --- a/devenv/docker/blocks/prometheus_high_card/go.mod +++ b/devenv/docker/blocks/prometheus_high_card/go.mod @@ -1,6 +1,6 @@ module high-card -go 1.25.9 +go 1.26.2 require github.com/prometheus/client_golang v1.23.2 diff --git a/devenv/docker/blocks/prometheus_utf8/go.mod b/devenv/docker/blocks/prometheus_utf8/go.mod index de2c5d53bc8..73c72d9e39d 100644 --- a/devenv/docker/blocks/prometheus_utf8/go.mod +++ b/devenv/docker/blocks/prometheus_utf8/go.mod @@ -1,6 +1,6 @@ module utf8-support -go 1.25.9 +go 1.26.2 require ( github.com/prometheus/client_golang v1.23.2 diff --git a/devenv/docker/blocks/stateful_webhook/Dockerfile b/devenv/docker/blocks/stateful_webhook/Dockerfile index ae5c14b7274..43dc01871eb 100644 --- a/devenv/docker/blocks/stateful_webhook/Dockerfile +++ b/devenv/docker/blocks/stateful_webhook/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25.9 +FROM golang:1.26.2 ADD main.go /go/src/webhook/main.go diff --git a/go.mod b/go.mod index 8c503e106b8..500679a75e4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.25.9 +go 1.26.2 // Direct requirements -- every entry needs an owner require ( diff --git a/go.work b/go.work index 30c9c320aa6..2b7138fb48d 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.25.9 +go 1.26.2 // 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/hack/go.mod b/hack/go.mod index d676b4fff76..7bda0051609 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/hack -go 1.25.9 +go 1.26.2 require k8s.io/code-generator v0.35.0 diff --git a/pkg/aggregator/go.mod b/pkg/aggregator/go.mod index ee84bb6be7f..6272eeb28d9 100644 --- a/pkg/aggregator/go.mod +++ b/pkg/aggregator/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/aggregator -go 1.25.9 +go 1.26.2 require ( github.com/emicklei/go-restful/v3 v3.13.0 diff --git a/pkg/api/plugins_test.go b/pkg/api/plugins_test.go index aeca340abed..78653aab0c7 100644 --- a/pkg/api/plugins_test.go +++ b/pkg/api/plugins_test.go @@ -423,11 +423,7 @@ func TestMakePluginResourceRequestContentTypeEmpty(t *testing.T) { // Go 1.26's httptest.ResponseRecorder.Write returns http.ErrBodyNotAllowed // for status codes that disallow a body (204, 304). The error is expected // because HTTPResponseSender unconditionally calls Write on the response. - //require.ErrorContains(t, err, "request method or response status code does not allow body") - // Uncomment when we finally upgrade and delete the one below - //require.Zero(t, resp.Header().Get("Content-Type")) - require.NoError(t, err) - require.True(t, resp.Flushed, "response should be flushed after request is processed") + require.ErrorContains(t, err, "request method or response status code does not allow body") require.Zero(t, resp.Header().Get("Content-Type")) } diff --git a/pkg/apimachinery/go.mod b/pkg/apimachinery/go.mod index 829a3de8dd5..67369e80ad9 100644 --- a/pkg/apimachinery/go.mod +++ b/pkg/apimachinery/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apimachinery -go 1.25.9 +go 1.26.2 require ( github.com/go-jose/go-jose/v4 v4.1.4 diff --git a/pkg/apiserver/go.mod b/pkg/apiserver/go.mod index 790f2949a36..75005119ae2 100644 --- a/pkg/apiserver/go.mod +++ b/pkg/apiserver/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/apiserver -go 1.25.9 +go 1.26.2 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/build/go.mod b/pkg/build/go.mod index f45bc4ae2c3..f217bf55bc3 100644 --- a/pkg/build/go.mod +++ b/pkg/build/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/build -go 1.25.9 +go 1.26.2 replace ( // TODO: remove these - the build system should not depend on Grafana code. diff --git a/pkg/build/wire/go.mod b/pkg/build/wire/go.mod index 613132e1e30..4caf071eb5c 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.25.9 +go 1.26.2 require ( github.com/google/go-cmp v0.7.0 diff --git a/pkg/codegen/go.mod b/pkg/codegen/go.mod index 4a87b07f9d0..22fb130343f 100644 --- a/pkg/codegen/go.mod +++ b/pkg/codegen/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/codegen -go 1.25.9 +go 1.26.2 require ( cuelang.org/go v0.11.1 diff --git a/pkg/infra/features/go.mod b/pkg/infra/features/go.mod index 6704bc9adb0..5c1c14df81f 100644 --- a/pkg/infra/features/go.mod +++ b/pkg/infra/features/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/infra/features -go 1.25.9 +go 1.26.2 require ( github.com/cespare/xxhash/v2 v2.3.0 diff --git a/pkg/plugins/codegen/go.mod b/pkg/plugins/codegen/go.mod index 52e823dbfce..339cddba4ea 100644 --- a/pkg/plugins/codegen/go.mod +++ b/pkg/plugins/codegen/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/plugins/codegen -go 1.25.9 +go 1.26.2 replace github.com/grafana/grafana/pkg/codegen => ../../codegen diff --git a/pkg/plugins/go.mod b/pkg/plugins/go.mod index be952b0a067..d587f2412a4 100644 --- a/pkg/plugins/go.mod +++ b/pkg/plugins/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/plugins -go 1.25.9 +go 1.26.2 require ( github.com/Machiel/slugify v1.0.1 diff --git a/pkg/semconv/go.mod b/pkg/semconv/go.mod index 2f060d48f05..b6e5e37b02c 100644 --- a/pkg/semconv/go.mod +++ b/pkg/semconv/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/semconv -go 1.25.9 +go 1.26.2 require go.opentelemetry.io/otel v1.43.0 diff --git a/pkg/storage/unified/resource/kv/go.mod b/pkg/storage/unified/resource/kv/go.mod index a2b82bb3b27..211f7ec193b 100644 --- a/pkg/storage/unified/resource/kv/go.mod +++ b/pkg/storage/unified/resource/kv/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana/pkg/storage/unified/resource/kv -go 1.25.9 +go 1.26.2 require ( github.com/DATA-DOG/go-sqlmock v1.5.2 diff --git a/scripts/go-workspace/go.mod b/scripts/go-workspace/go.mod index 5866b485be7..57a68af15fa 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.25.9 +go 1.26.2 require golang.org/x/mod v0.33.0 diff --git a/scripts/modowners/go.mod b/scripts/modowners/go.mod index 596cbce856e..abfb1141a07 100644 --- a/scripts/modowners/go.mod +++ b/scripts/modowners/go.mod @@ -1,5 +1,5 @@ module github.com/grafana/grafana/scripts/modowners -go 1.25.9 +go 1.26.2 require golang.org/x/mod v0.33.0