Merge branch 'main' into compass-receiver

Author: ploddi

Diff for: .circleci/config.yml

@@ -2,7 +2,7 @@
 version: 2.1
 orbs:
   prometheus: prometheus/[email protected]
-  go: circleci/go@1.12.0
+  go: circleci/go@3.0.0
 jobs:
   test_frontend:
     # We need to use a machine executor because the front-end validation runs
@@ -18,7 +18,7 @@ jobs:
           command: sudo rm -rf /usr/local/go
       # Whenever the Go version is updated here, .promu.yml should also be updated.
       - go/install:
-          version: "1.23.2"
+          version: "1.24.1"
       - run:
           name: Remove generated code
           command: make clean
@@ -47,7 +47,7 @@ jobs:
   test:
     docker:
       # Whenever the Go version is updated here, .promu.yml should also be updated.
-      - image: quay.io/prometheus/golang-builder:1.22-base
+      - image: quay.io/prometheus/golang-builder:1.24-base
       # maildev containers are for running the email tests against a "real" SMTP server.
       # See notify/email_test.go for details.
       - image: maildev/maildev:2.1.0
@@ -69,7 +69,7 @@ jobs:
       EMAIL_AUTH_CONFIG: /tmp/smtp_auth.yml
     steps:
       - prometheus/setup_environment
-      - go/load-cache:
+      - go/load-mod-cache:
           key: v1-go-mod
       - run:
           command: |
@@ -97,14 +97,14 @@ jobs:
           file: alertmanager
       - prometheus/store_artifact:
           file: amtool
-      - go/save-cache:
+      - go/save-mod-cache:
           key: v1-go-mod
       - store_test_results:
           path: test-results
   mixin:
     docker:
       # Whenever the Go version is updated here, .promu.yml should also be updated.
-      - image: quay.io/prometheus/golang-builder:1.22-base
+      - image: quay.io/prometheus/golang-builder:1.24-base
     steps:
       - checkout
       # pin the mixtool version until https://github.com/monitoring-mixins/mixtool/issues/135 is merged.

Diff for: .github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
     # Whenever the Go version is updated here, .promu.yml
     # should also be updated.
     container:
-      image: quay.io/prometheus/golang-builder:1.23-base
+      image: quay.io/prometheus/golang-builder:1.24-base
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: prometheus/promci@c3c93a50d581b928af720f0134b2b2dad32a6c41 # v0.4.6

Diff for: .github/workflows/golangci-lint.yml

@@ -26,14 +26,14 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Install Go
-        uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
+        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
         with:
-          go-version: 1.23.x
+          go-version: 1.24.x
       - name: Install snmp_exporter/generator dependencies
         run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
         if: github.repository == 'prometheus/snmp_exporter'
       - name: Lint
-        uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
+        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
         with:
           args: --verbose
-          version: v1.61.0
+          version: v1.64.6

Diff for: .github/workflows/mixin.yml

@@ -14,7 +14,7 @@ jobs:
       - name: install Go
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:
-          go-version: 1.23.x
+          go-version: 1.24.x
       # pin the mixtool version until https://github.com/monitoring-mixins/mixtool/issues/135 is merged.
       - run: go install github.com/monitoring-mixins/mixtool/cmd/mixtool@2282201396b69055bb0f92f187049027a16d2130
       - run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest

Diff for: .golangci.yml

@@ -23,6 +23,8 @@ issues:
   exclude-files:
     # Skip autogenerated files.
     - ^.*\.(pb|y)\.go$
+
+run:
   timeout: 5m
 
 linters-settings:

Diff for: .promu.yml

@@ -1,7 +1,7 @@
 go:
     # Whenever the Go version is updated here,
     # .circle/config.yml should also be updated.
-    version: 1.23
+    version: 1.24
 repository:
     path: github.com/prometheus/alertmanager
 build:

Diff for: Makefile

@@ -65,7 +65,7 @@ SWAGGER = docker run \
 	--user=$(shell id -u $(USER)):$(shell id -g $(USER)) \
 	--rm \
 	-v $(shell pwd):/go/src/github.com/prometheus/alertmanager \
-	-w /go/src/github.com/prometheus/alertmanager quay.io/goswagger/swagger:v0.30.5
+	-w /go/src/github.com/prometheus/alertmanager quay.io/goswagger/swagger:v0.31.0
 
 api/v2/models api/v2/restapi api/v2/client: api/v2/openapi.yaml
 	-rm -r api/v2/{client,models,restapi}

Diff for: Makefile.common

@@ -61,7 +61,7 @@ PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_
 SKIP_GOLANGCI_LINT :=
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v1.61.0
+GOLANGCI_LINT_VERSION ?= v1.64.6
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
 # windows isn't included here because of the path separator being different.
 ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))

Diff for: api/v2/api_test.go

@@ -16,7 +16,6 @@ package v2
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -206,7 +205,7 @@ func TestDeleteSilenceHandler(t *testing.T) {
 		responder.WriteResponse(w, p)
 		body, _ := io.ReadAll(w.Result().Body)
 
-		require.Equal(t, tc.expectedCode, w.Code, fmt.Sprintf("test case: %d, response: %s", i, string(body)))
+		require.Equal(t, tc.expectedCode, w.Code, "test case: %d, response: %s", i, string(body))
 	}
 }
 
@@ -280,7 +279,7 @@ func TestPostSilencesHandler(t *testing.T) {
 				w := httptest.NewRecorder()
 				postSilences(t, w, api.postSilencesHandler, sil)
 				body, _ := io.ReadAll(w.Result().Body)
-				require.Equal(t, tc.expectedCode, w.Code, fmt.Sprintf("test case: %d, response: %s", i, string(body)))
+				require.Equal(t, tc.expectedCode, w.Code, "test case: %d, response: %s", i, string(body))
 			})
 		}
 	})