Upgrade go to 1.24.6 and fix linters

.github/workflows/test-build-deploy.yml

@@ -11,7 +11,7 @@ jobs:
   lint:
     runs-on: ubuntu-24.04
     container:
-      image: quay.io/cortexproject/build-image:master-0ddced051
+      image: quay.io/cortexproject/build-image:master-59491e9aae
     steps:
       - name: Checkout Repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -48,7 +48,7 @@ jobs:
   test:
     runs-on: ubuntu-24.04
     container:
-      image: quay.io/cortexproject/build-image:master-0ddced051
+      image: quay.io/cortexproject/build-image:master-59491e9aae
     steps:
       - name: Checkout Repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.golangci.yml

@@ -0,0 +1 @@
+version: "2"

Makefile

@@ -24,7 +24,7 @@ check-protos: protos
 	git diff --exit-code || (echo "Please rebuild protobuf code by running 'make protos'" && false)
 
 lint:
-	golangci-lint run --new-from-rev d2f56921e6b0
+	golangci-lint run
 
 test:
 	go test ./...

go.mod

@@ -1,12 +1,9 @@
 module github.com/weaveworks/common
 
-go 1.22
-
-toolchain go1.23.2
+go 1.24
 
 require (
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
-	github.com/davecgh/go-spew v1.1.1
 	github.com/felixge/httpsnoop v1.0.3
 	github.com/go-kit/log v0.2.1
 	github.com/gogo/googleapis v1.1.0
@@ -19,7 +16,6 @@ require (
 	github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/pmezard/go-difflib v1.0.0
 	github.com/prometheus/client_golang v1.15.1
 	github.com/prometheus/exporter-toolkit v0.8.2
 	github.com/rantav/go-grpc-channelz v0.0.4
@@ -41,6 +37,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
 	github.com/coreos/go-systemd/v22 v22.4.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-chi/chi/v5 v5.0.7 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
@@ -51,6 +48,7 @@ require (
 	github.com/mattn/go-isatty v0.0.4 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.42.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect

httpgrpc/server/server_test.go

@@ -46,7 +46,8 @@ func newTestServer(handler http.Handler) (*testServer, error) {
 
 func TestBasic(t *testing.T) {
 	server, err := newTestServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprint(w, "world")
+		_, err := fmt.Fprint(w, "world")
+		require.NoError(t, err)
 	}))
 	require.NoError(t, err)
 	defer server.grpcServer.GracefulStop()
@@ -115,12 +116,16 @@ func TestTracePropagation(t *testing.T) {
 	jaeger := jaegercfg.Configuration{}
 	closer, err := jaeger.InitGlobalTracer("test")
 	require.NoError(t, err)
-	defer closer.Close()
+	defer func() {
+		err := closer.Close()
+		require.NoError(t, err)
+	}()
 
 	server, err := newTestServer(middleware.Tracer{}.Wrap(
 		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			span := opentracing.SpanFromContext(r.Context())
-			fmt.Fprint(w, span.BaggageItem("name"))
+			_, err := fmt.Fprint(w, span.BaggageItem("name"))
+			require.NoError(t, err)
 		}),
 	))