Synchronize common files from prometheus/prometheus (prometheus#2736)

* Update common Prometheus files Signed-off-by: prombot <[email protected]> * Fixup linting issues * Disbale unused-parameter check. * Fixup minor linting issues. Signed-off-by: Ben Kochie <[email protected]> --------- Signed-off-by: prombot <[email protected]> Signed-off-by: Ben Kochie <[email protected]> Co-authored-by: Ben Kochie <[email protected]>
shatteredsilicon · Apr 9, 2024 · ce964ab · ce964ab
1 parent 038a129
commit ce964ab
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -1,3 +1,5 @@
+---
+# This action is synced from https://github.com/prometheus/prometheus
 name: golangci-lint
 on:
   push:
@@ -27,4 +29,4 @@ jobs:
       - name: Lint
         uses: golangci/[email protected]
         with:
-          version: v1.51.2
+          version: v1.53.3
diff --git a/.golangci.yml b/.golangci.yml
@@ -25,3 +25,9 @@ linters-settings:
       - (net/http.ResponseWriter).Write
       # Never check for logger errors.
       - (github.com/go-kit/log.Logger).Log
+  revive:
+    rules:
+      # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#unused-parameter
+      - name: unused-parameter
+        severity: warning
+        disabled: true
diff --git a/.yamllint b/.yamllint
@@ -20,5 +20,4 @@ rules:
       config/testdata/section_key_dup.bad.yml
   line-length: disable
   truthy:
-    ignore: |
-      .github/workflows/*.yml
+    check-keys: false
diff --git a/collector/ipvs_linux_test.go b/collector/ipvs_linux_test.go
@@ -209,9 +209,8 @@ func TestIPVSCollectorResponse(t *testing.T) {
 					if want == got {
 						// this is a line we are interested in, and it is correct
 						continue wantLoop
-					} else {
-						gotLinesIdx++
 					}
+					gotLinesIdx++
 				}
 				// if this point is reached, the line we want was missing
 				t.Fatalf("Missing expected output line(s), first missing line is %s", want)

diff --git a/collector/perf_linux_test.go b/collector/perf_linux_test.go
@@ -54,7 +54,9 @@ func TestPerfCollector(t *testing.T) {
 	metrics := make(chan prometheus.Metric)
 	defer close(metrics)
 	go func() {
+		i := 0
 		for range metrics {
+			i++
 		}
 	}()
 	if err := collector.Update(metrics); err != nil {

diff --git a/collector/systemd_linux.go b/collector/systemd_linux.go
@@ -335,9 +335,7 @@ func (c *systemdCollector) collectSockets(conn *dbus.Conn, ch chan<- prometheus.
 
 		// NRefused wasn't added until systemd 239.
 		refusedConnectionCount, err := conn.GetUnitTypePropertyContext(context.TODO(), unit.Name, "Socket", "NRefused")
-		if err != nil {
-			//log.Debugf("couldn't get unit '%s' NRefused: %s", unit.Name, err)
-		} else {
+		if err == nil {
 			ch <- prometheus.MustNewConstMetric(
 				c.socketRefusedConnectionsDesc, prometheus.GaugeValue,
 				float64(refusedConnectionCount.Value.Value().(uint32)), unit.Name)