Update Go

* Update Go to 1.24.
* Update golangci-lint to v2.
* Fixup linting issues.

Signed-off-by: SuperQ <[email protected]>

Author: SuperQ

Diff for: .github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     name: Go tests
     runs-on: ubuntu-latest
     container:
-      image: quay.io/prometheus/golang-builder:1.23-base
+      image: quay.io/prometheus/golang-builder:1.24-base
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: prometheus/promci@443c7fc2397e946bc9f5029e313a9c3441b9b86d # v0.4.7
@@ -62,7 +62,7 @@ jobs:
     name: Verify
     runs-on: ubuntu-latest
     container:
-      image: quay.io/prometheus/golang-builder:1.23-base
+      image: quay.io/prometheus/golang-builder:1.24-base
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: make build

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@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
+        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
           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@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
+        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
         with:
           args: --verbose
-          version: v1.64.6
+          version: v2.0.2

Diff for: .golangci.yml

@@ -1,24 +1,18 @@
-run:
-  timeout: 5m
-
+version: "2"
 output:
   formats:
-    - format: line-number
+    text:
       path: stderr
-
+      colors: false
 linters:
-  disable-all: true
+  default: none
   enable:
     - asasalint
     - bodyclose
     - copyloopvar
     - errcheck
     - errorlint
     - exhaustive
-    - gofmt
-    - gofumpt
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - misspell
@@ -27,12 +21,33 @@ linters:
     - nonamedreturns
     - predeclared
     - revive
+    - sloglint
     - staticcheck
-    - typecheck
     - unconvert
     - unused
-    - sloglint
-
-linters-settings:
-  goimports:
-    local-prefixes: "github.com/prometheus-community/yet-another-cloudwatch-exporter"
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/prometheus-community/yet-another-cloudwatch-exporter
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Diff for: .promu.yml

@@ -1,6 +1,6 @@
 go:
     # This must match .circle/config.yml.
-    version: 1.23
+    version: 1.24
 repository:
     path: github.com/prometheus-community/yet-another-cloudwatch-exporter
 build:

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.64.6
+GOLANGCI_LINT_VERSION ?= v2.0.2
 # 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: cmd/yace/main.go

@@ -260,7 +260,7 @@ func startScraper(c *cli.Context) error {
 	cfg := config.ScrapeConf{}
 	jobsCfg, err := cfg.Load(configFile, logger)
 	if err != nil {
-		return fmt.Errorf("Couldn't read %s: %w", configFile, err)
+		return fmt.Errorf("couldn't read %s: %w", configFile, err)
 	}
 
 	featureFlags := c.StringSlice(enableFeatureFlag)
@@ -269,7 +269,7 @@ func startScraper(c *cli.Context) error {
 	var cache cachingFactory
 	cache, err = v2.NewFactory(logger, jobsCfg, fips)
 	if err != nil {
-		return fmt.Errorf("Failed to construct aws sdk v2 client cache: %w", err)
+		return fmt.Errorf("failed to construct aws sdk v2 client cache: %w", err)
 	}
 
 	// Switch to v1 SDK if feature flag is enabled
@@ -301,7 +301,7 @@ func startScraper(c *cli.Context) error {
 			pprofLink = htmlPprof
 		}
 
-		_, _ = w.Write([]byte(fmt.Sprintf(htmlVersion, version.Version, pprofLink)))
+		_, _ = fmt.Fprintf(w, htmlVersion, version.Version, pprofLink)
 	})
 
 	mux.HandleFunc("/healthz", func(w http.ResponseWriter, _ *http.Request) {

Diff for: pkg/clients/v2/factory.go

@@ -79,13 +79,14 @@ var _ clients.Factory = &CachingFactory{}
 func NewFactory(logger *slog.Logger, jobsCfg model.JobsConfig, fips bool) (*CachingFactory, error) {
 	var options []func(*aws_config.LoadOptions) error
 	options = append(options, aws_config.WithLogger(aws_logging.LoggerFunc(func(classification aws_logging.Classification, format string, v ...interface{}) {
-		if classification == aws_logging.Debug {
+		switch classification {
+		case aws_logging.Debug:
 			if logger.Enabled(context.Background(), slog.LevelDebug) {
 				logger.Debug(fmt.Sprintf(format, v...))
 			}
-		} else if classification == aws_logging.Warn {
+		case aws_logging.Warn:
 			logger.Warn(fmt.Sprintf(format, v...))
-		} else { // AWS logging only supports debug or warn, log everything else as error
+		default: // AWS logging only supports debug or warn, log everything else as error
 			logger.Error(fmt.Sprintf(format, v...), "err", "unexected aws error classification", "classification", classification)
 		}
 	})))

Diff for: pkg/config/config.go

@@ -154,7 +154,7 @@ func (c *ScrapeConf) Load(file string, logger *slog.Logger) (model.JobsConfig, e
 
 func (c *ScrapeConf) Validate(logger *slog.Logger) (model.JobsConfig, error) {
 	if c.Discovery.Jobs == nil && c.Static == nil && c.CustomNamespace == nil {
-		return model.JobsConfig{}, fmt.Errorf("At least 1 Discovery job, 1 Static or one CustomNamespace must be defined")
+		return model.JobsConfig{}, fmt.Errorf("at least 1 Discovery job, 1 Static or one CustomNamespace must be defined")
 	}
 
 	if c.Discovery.Jobs != nil {

Diff for: pkg/job/maxdimassociator/associator.go

@@ -185,11 +185,8 @@ func (assoc Associator) AssociateMetricToResource(cwMetric *model.Metric) (*mode
 			mappingFound = true
 			dimFixApplied := false
 			shouldTryFixDimension := true
-			for {
-				if !dimFixApplied && !shouldTryFixDimension {
-					// If no dimension fixes were applied, no need to try running again without the fixer
-					break
-				}
+			// If no dimension fixes were applied, no need to try running again without the fixer.
+			for dimFixApplied || shouldTryFixDimension {
 
 				var labels map[string]string
 				labels, dimFixApplied = buildLabelsMap(cwMetric, regexpMapping, shouldTryFixDimension)

Diff for: pkg/job/scraper_test.go

@@ -556,7 +556,7 @@ func TestScrapeRunner_Run(t *testing.T) {
 
 			// We don't want to check the exact error just the message
 			changelog, err = diff.Diff(tc.expectedErrs, errs, diff.Filter(func(_ []string, _ reflect.Type, field reflect.StructField) bool {
-				return !(field.Name == "Err")
+				return field.Name != "Err"
 			}))
 			assert.NoError(t, err, "failed to diff errs")
 			assert.Len(t, changelog, 0, changelog)