Synchronize common files from prometheus/prometheus (#606)

prombot · SuperQ · web-flow · commit 617b51d6132c · 2024-03-21T16:47:13.000+01:00
* Update common Prometheus files

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

* Fixup gofumpt.

Signed-off-by: SuperQ &lt;superq@gmail.com&gt;

---------

Signed-off-by: prombot &lt;prometheus-team@googlegroups.com&gt;
Signed-off-by: SuperQ &lt;superq@gmail.com&gt;
Co-authored-by: SuperQ &lt;superq@gmail.com&gt;
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -35,4 +35,4 @@ jobs:
       - name: Lint
         uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
         with:
-          version: v1.55.2
+          version: v1.56.2
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.55.2
+GOLANGCI_LINT_VERSION ?= v1.56.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 --git a/model/fingerprinting_test.go b/model/fingerprinting_test.go
@@ -33,7 +33,6 @@ func TestFingerprintFromString(t *testing.T) {
 	}
 
 	f, err = ParseFingerprint(fs)
-
 	if err != nil {
 		t.Errorf("unexpected error while getting Fingerprint from string: %s", err.Error())
 	}

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ func TestFingerprintFromString(t *testing.T) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`f, err = ParseFingerprint(fs)`
`36`		`-`
`37`	`36`	`if err != nil {`
`38`	`37`	`t.Errorf("unexpected error while getting Fingerprint from string: %s", err.Error())`
`39`	`38`	`}`