update go version (#7236)

* update go version

* update go to 1.24.10

* switching from bullseye to bookworm

Author: jharvey10

.github/workflows/check-linux-build-image.yml

@@ -29,7 +29,7 @@ jobs:
           tags: grafana/agent-build-image:latest
           platforms: 'linux/amd64,linux/arm64'
           build-args: |
-            GO_RUNTIME=golang:1.24.6-bullseye
+            GO_RUNTIME=golang:1.24.10-bookworm
 
       - name: Check Linux boringcrypto build image
         uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6
@@ -39,4 +39,4 @@ jobs:
           tags: grafana/agent-build-image:latest
           platforms: 'linux/amd64,linux/arm64'
           build-args: |
-            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.24.6-bullseye
+            GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.24.10-bookworm

.github/workflows/update-build-images.yml

@@ -20,8 +20,8 @@ jobs:
     strategy:
       matrix:
         build:
-          - runtime: golang:1.24.6-bullseye
-          - runtime: mcr.microsoft.com/oss/go/microsoft/golang:1.24.6-bullseye
+          - runtime: golang:1.24.10-bookworm
+          - runtime: mcr.microsoft.com/oss/go/microsoft/golang:1.24.10-bookworm
             suffix: "-boringcrypto"
     steps:
       - name: Checkout code 🛎️

build-image/Dockerfile

@@ -4,7 +4,7 @@
 # default when running `docker buildx build` or when DOCKER_BUILDKIT=1 is set
 # in environment variables.
 
-# NOTE: The GO_RUNTIME is used to switch between the default Google go runtime and mcr.microsoft.com/oss/go/microsoft/golang:1.24.6-bullseye which is a Microsoft
+# NOTE: The GO_RUNTIME is used to switch between the default Google go runtime and mcr.microsoft.com/oss/go/microsoft/golang:1.24.10-bookworm which is a Microsoft
 # fork of go that allows using windows crypto instead of boring crypto. Details at https://github.com/microsoft/go/tree/microsoft/main/eng/doc/fips
 ARG GO_RUNTIME=mustoverride
 
@@ -59,12 +59,12 @@ RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@$CONTROLLER_GEN_V
 # dependencies.
 FROM rfratto/viceroy:v0.4.0
 
-# Fix apt sources - restrict main bullseye to supported architectures
+# Fix apt sources - restrict main bookworm to supported architectures
 RUN rm -f /etc/apt/sources.list \
  && rm -rf /etc/apt/sources.list.d/* \
- && echo "deb [arch=amd64,arm64,armhf,i386] https://ftp.debian.org/debian bullseye main" > /etc/apt/sources.list \
- && echo "deb https://ftp.debian.org/debian bullseye-updates main" >> /etc/apt/sources.list \
- && echo "deb https://security.debian.org/debian-security bullseye-security main" >> /etc/apt/sources.list
+ && echo "deb [arch=amd64,arm64,armhf,i386] https://ftp.debian.org/debian bookworm main" > /etc/apt/sources.list \
+ && echo "deb https://ftp.debian.org/debian bookworm-updates main" >> /etc/apt/sources.list \
+ && echo "deb https://security.debian.org/debian-security bookworm-security main" >> /etc/apt/sources.list
 
 # Install other dependencies.
 #

build-image/windows/Dockerfile

@@ -1,4 +1,4 @@
-FROM library/golang:1.24.6-windowsservercore-ltsc2022
+FROM library/golang:1.24.10-windowsservercore-ltsc2022
 
 SHELL ["powershell", "-command"]
 

cmd/grafana-agent/Dockerfile.windows

@@ -14,7 +14,7 @@ RUN ""C:\Program Files\git\bin\bash.exe" -c "RELEASE_BUILD=${RELEASE_BUILD} VERS
 RUN ""C:\Program Files\git\bin\bash.exe" -c "RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} GO_TAGS='builtinassets' make agent""
 # In this case, we're separating the clean command from make agent to avoid an issue where access to some mod cache
 # files is denied immediately after make agent, for example:
-# "go: remove C:\go\pkg\mod\golang.org\[email protected].6.windows-amd64\bin\go.exe: Access is denied."
+# "go: remove C:\go\pkg\mod\golang.org\[email protected].10.windows-amd64\bin\go.exe: Access is denied."
 RUN ""C:\Program Files\git\bin\bash.exe" -c "go clean -cache -modcache""
 
 # Use the smallest container possible for the final image

cmd/grafana-agentctl/Dockerfile.windows

@@ -10,7 +10,7 @@ SHELL ["cmd", "/S", "/C"]
 RUN ""C:\Program Files\git\bin\bash.exe" -c "RELEASE_BUILD=${RELEASE_BUILD} VERSION=${VERSION} make agentctl""
 # We're separating the clean command from make agent to avoid an issue where access to some mod cache
 # files is denied immediately after make agentctl, for example:
-# "go: remove C:\go\pkg\mod\golang.org\[email protected].6.windows-amd64\bin\go.exe: Access is denied."
+# "go: remove C:\go\pkg\mod\golang.org\[email protected].10.windows-amd64\bin\go.exe: Access is denied."
 RUN ""C:\Program Files\git\bin\bash.exe" -c "go clean -cache -modcache""
 
 # Use the smallest container possible for the final image

docs/Makefile

@@ -11,11 +11,11 @@ include docs.mk
 docs: check-cloudwatch-integration
 
 check-cloudwatch-integration:
-	$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.24.6-bullseye go run static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/static/configuration/integrations/cloudwatch-exporter-config.md
-	$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.24.6-bullseye go run static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md
+	$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.24.10-bookworm go run static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/static/configuration/integrations/cloudwatch-exporter-config.md
+	$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.24.10-bookworm go run static/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md
 
 generate-cloudwatch-integration:
-	$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.24.6-bullseye go run static/integrations/cloudwatch_exporter/docs/doc.go generate
+	$(PODMAN) run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.24.10-bookworm go run static/integrations/cloudwatch_exporter/docs/doc.go generate
 
 sources/assets/hierarchy.svg: sources/operator/hierarchy.dot
 	cat $< | $(PODMAN) run --rm -i nshine/dot dot -Tsvg > $@

docs/developer/updating-go.md

@@ -9,14 +9,14 @@ You will need to submit two pull requests:
    At this point you can just search and replace all instances of the old version with the new one.
    For example, "1.22.1" would be replaced with "1.22.5".
 
-The Go image which is used may sometimes have a name, like "bullseye". 
+The Go image which is used may sometimes have a name, like "bookworm".
 The origins of the name are explained in more detail in [Go's DockerHub repository][go-dockerhub]:
 
-> Some of these tags may have names like bookworm or bullseye in them. 
-> These are the suite code names for releases of Debian⁠ and indicate which release the image is based on. 
-> If your image needs to install any additional packages beyond what comes with the image, 
+> Some of these tags may have names like bookworm or bullseye in them.
+> These are the suite code names for releases of Debian⁠ and indicate which release the image is based on.
+> If your image needs to install any additional packages beyond what comes with the image,
 > you'll likely want to specify one of these explicitly to minimize breakage when there are new releases of Debian.
 
 [build-image-instructions]:../../build-image/README.md
 [go-dockerhub]:https://hub.docker.com/_/golang
-[example-pr]:https://github.com/grafana/agent/pull/6646/files
+[example-pr]:https://github.com/grafana/agent/pull/6646/files

go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/agent
 
-go 1.24.6
+go 1.24.10
 
 retract (
 	v1.3.191 // Published accidentally

go.sum

@@ -784,8 +784,6 @@ github.com/go-openapi/validate v0.22.1/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUri
 github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
-github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
-github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
 github.com/go-resty/resty/v2 v2.11.0 h1:i7jMfNOJYMp69lq7qozJP+bjgzfAzeOhuGlyDrqxT/8=
 github.com/go-resty/resty/v2 v2.11.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
@@ -803,8 +801,6 @@ github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr6
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
 github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c=
-github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
 github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg=
@@ -2618,7 +2614,6 @@ golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=