Update golangci lint (#679)

roidelapluie · prombot · web-flow · commit cd4bcc02f447 · 2024-08-20T13:59:27.000+02:00
* Update common Prometheus files

Signed-off-by: prombot &lt;prometheus-team@googlegroups.com&gt;

* Fix golint ci

Signed-off-by: Julien &lt;roidelapluie@o11y.eu&gt;

---------

Signed-off-by: prombot &lt;prometheus-team@googlegroups.com&gt;
Signed-off-by: Julien &lt;roidelapluie@o11y.eu&gt;
Co-authored-by: prombot &lt;prometheus-team@googlegroups.com&gt;
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -36,4 +36,4 @@ jobs:
         uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
         with:
           args: --verbose
-          version: v1.59.1
+          version: v1.60.1
diff --git a/Makefile.common b/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.59.1
+GOLANGCI_LINT_VERSION ?= v1.60.1
 # 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 --git a/model/metric.go b/model/metric.go
@@ -452,6 +452,6 @@ func ToEscapingScheme(s string) (EscapingScheme, error) {
 	case EscapeValues:
 		return ValueEncodingEscaping, nil
 	default:
-		return NoEscaping, fmt.Errorf("unknown format scheme " + s)
+		return NoEscaping, fmt.Errorf("unknown format scheme %s", s)
 	}
 }
diff --git a/model/metric_test.go b/model/metric_test.go
@@ -595,10 +595,10 @@ func TestEscapeMetricFamily(t *testing.T) {
 			original := proto.Clone(scenario.input)
 			got := EscapeMetricFamily(scenario.input, scenario.scheme)
 			if !cmp.Equal(scenario.expected, got, cmpopts.IgnoreUnexported(unexportList...)) {
-				t.Errorf("unexpected difference in escaped output:" + cmp.Diff(scenario.expected, got, cmpopts.IgnoreUnexported(unexportList...)))
+				t.Errorf("unexpected difference in escaped output:\n%s", cmp.Diff(scenario.expected, got, cmpopts.IgnoreUnexported(unexportList...)))
 			}
 			if !cmp.Equal(scenario.input, original, cmpopts.IgnoreUnexported(unexportList...)) {
-				t.Errorf("input was mutated during escaping" + cmp.Diff(scenario.expected, got, cmpopts.IgnoreUnexported(unexportList...)))
+				t.Errorf("input was mutated during escaping:\n%s", cmp.Diff(scenario.expected, got, cmpopts.IgnoreUnexported(unexportList...)))
 			}
 		})
 	}

Original file line number	Diff line number	Diff line change
`@@ -452,6 +452,6 @@ func ToEscapingScheme(s string) (EscapingScheme, error) {`
`452`	`452`	`case EscapeValues:`
`453`	`453`	`return ValueEncodingEscaping, nil`
`454`	`454`	`default:`
`455`		`- return NoEscaping, fmt.Errorf("unknown format scheme " + s)`
	`455`	`+ return NoEscaping, fmt.Errorf("unknown format scheme %s", s)`
`456`	`456`	`}`
`457`	`457`	`}`
Original file line number	Diff line number	Diff line change
`@@ -595,10 +595,10 @@ func TestEscapeMetricFamily(t *testing.T) {`
`595`	`595`	`original := proto.Clone(scenario.input)`
`596`	`596`	`got := EscapeMetricFamily(scenario.input, scenario.scheme)`
`597`	`597`	`if !cmp.Equal(scenario.expected, got, cmpopts.IgnoreUnexported(unexportList...)) {`
`598`		`- t.Errorf("unexpected difference in escaped output:" + cmp.Diff(scenario.expected, got, cmpopts.IgnoreUnexported(unexportList...)))`
	`598`	`+ t.Errorf("unexpected difference in escaped output:\n%s", cmp.Diff(scenario.expected, got, cmpopts.IgnoreUnexported(unexportList...)))`
`599`	`599`	`}`
`600`	`600`	`if !cmp.Equal(scenario.input, original, cmpopts.IgnoreUnexported(unexportList...)) {`
`601`		`- t.Errorf("input was mutated during escaping" + cmp.Diff(scenario.expected, got, cmpopts.IgnoreUnexported(unexportList...)))`
	`601`	`+ t.Errorf("input was mutated during escaping:\n%s", cmp.Diff(scenario.expected, got, cmpopts.IgnoreUnexported(unexportList...)))`
`602`	`602`	`}`
`603`	`603`	`})`
`604`	`604`	`}`