Fix CI lint failures: upgrade golangci-lint and Go version in CI

.github/workflows/validate_pr.yml

@@ -12,20 +12,20 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: '1.24'
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.54
+          version: v1.64
   unit_tests:
     name: Unit-Tests
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: '1.24'
       - name: Unit Tests
         run: make test
   build:
@@ -35,6 +35,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: '1.24'
       - name: Build All
         run: make all

.golangci.yml

@@ -6,17 +6,17 @@ run:
     - require_docker
 
 output:
-  format: line-number
+  formats:
+    - format: line-number
 
 linters:
+  disable-all: true
   enable:
     - goimports
     - revive
     - misspell
     - gofmt
 
 linters-settings:
-  errcheck:
-    exclude: .errcheck-exclude
   goimports:
     local-prefixes: "github.com/cortexproject/cortex-tools"

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 Order should be `CHANGE`, `FEATURE`, `ENHANCEMENT`, and `BUGFIX`
 
+## v0.20.1
+* [CHANGE] Upgrade cortex to v1.20.1
+
+## v0.19.1
+* [CHANGE] Upgrade cortex to v1.19.1
+
+## v0.18.1
+* [CHANGE] Upgrade cortex to v1.18.1
+
 ## v0.17.0
 * [CHANGE] Upgrade cortex to v1.17.0
 

changelogs/v0.18.1.md

@@ -0,0 +1,33 @@
+# v0.18.1 Release
+
+## Changes
+
+* [CHANGE] Upgrade cortex to v1.18.1
+
+## Installation
+
+## cortextool
+
+```console
+# download the binary (adapt os and arch as needed)
+$ curl -fSL -o "cortextool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.18.1/cortextool_0.18.1_linux_x86_64"
+
+# make it executable
+$ chmod a+x "cortextool"
+
+# have fun :)
+$ ./cortextool --help
+```
+
+## benchtool
+
+```console
+# download the binary (adapt os and arch as needed)
+$ curl -fSL -o "benchtool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.18.1/benchtool_0.18.1_linux_x86_64"
+
+# make it executable
+$ chmod a+x "benchtool"
+
+# have fun :)
+$ ./benchtool --help
+```

changelogs/v0.19.1.md

@@ -0,0 +1,33 @@
+# v0.19.1 Release
+
+## Changes
+
+* [CHANGE] Upgrade cortex to v1.19.1
+
+## Installation
+
+## cortextool
+
+```console
+# download the binary (adapt os and arch as needed)
+$ curl -fSL -o "cortextool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.19.1/cortextool_0.19.1_linux_x86_64"
+
+# make it executable
+$ chmod a+x "cortextool"
+
+# have fun :)
+$ ./cortextool --help
+```
+
+## benchtool
+
+```console
+# download the binary (adapt os and arch as needed)
+$ curl -fSL -o "benchtool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.19.1/benchtool_0.19.1_linux_x86_64"
+
+# make it executable
+$ chmod a+x "benchtool"
+
+# have fun :)
+$ ./benchtool --help
+```

changelogs/v0.20.1.md

@@ -0,0 +1,33 @@
+# v0.20.1 Release
+
+## Changes
+
+* [CHANGE] Upgrade cortex to v1.20.1
+
+## Installation
+
+## cortextool
+
+```console
+# download the binary (adapt os and arch as needed)
+$ curl -fSL -o "cortextool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.20.1/cortextool_0.20.1_linux_x86_64"
+
+# make it executable
+$ chmod a+x "cortextool"
+
+# have fun :)
+$ ./cortextool --help
+```
+
+## benchtool
+
+```console
+# download the binary (adapt os and arch as needed)
+$ curl -fSL -o "benchtool" "https://github.com/cortexproject/cortex-tools/releases/download/v0.20.1/benchtool_0.20.1_linux_x86_64"
+
+# make it executable
+$ chmod a+x "benchtool"
+
+# have fun :)
+$ ./benchtool --help
+```

cmd/blockscopy/main.go

@@ -19,7 +19,7 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/concurrency"
-	"github.com/oklog/ulid"
+	"github.com/oklog/ulid/v2"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"

cmd/sim/main.go

@@ -116,8 +116,8 @@ func run(k int, sizer func(float64) int) {
 
 	fmt.Printf("%d, %d, %d, %d, %f, %f\n",
 		k,
-		int(min(nodeSeries)),
-		int(max(nodeSeries)),
+		int(minFloat64(nodeSeries)),
+		int(maxFloat64(nodeSeries)),
 		int(stat.Mean(nodeSeries, nil)),
 		stat.StdDev(nodeSeries, nil),
 		float64(maxAffectedTenants)/float64(numTenants))
@@ -168,7 +168,7 @@ func shuffleShard(entropy *rand.Rand, shardSize, numReplicas int) []int {
 	return ids
 }
 
-func min(fs []float64) float64 {
+func minFloat64(fs []float64) float64 {
 	result := math.MaxFloat64
 	for _, f := range fs {
 		if f < result {
@@ -178,7 +178,7 @@ func min(fs []float64) float64 {
 	return result
 }
 
-func max(fs []float64) float64 {
+func maxFloat64(fs []float64) float64 {
 	result := 0.0
 	for _, f := range fs {
 		if f > result {