From da3c7a9116ce4b35df593bf81940fa5524dd769f Mon Sep 17 00:00:00 2001 From: PrometheusBot Date: Tue, 18 Jul 2023 10:46:59 +0200 Subject: [PATCH] Synchronize common files from prometheus/prometheus (#2736) * Update common Prometheus files Signed-off-by: prombot * Fixup linting issues * Disbale unused-parameter check. * Fixup minor linting issues. Signed-off-by: Ben Kochie --------- Signed-off-by: prombot Signed-off-by: Ben Kochie Co-authored-by: Ben Kochie --- .github/workflows/golangci-lint.yml | 4 +++- .golangci.yml | 6 ++++++ .yamllint | 3 +-- collector/ipvs_linux_test.go | 3 +-- collector/perf_linux_test.go | 2 ++ collector/systemd_linux.go | 4 +--- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 100cf93292..433f71b885 100644 --- 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/golangci-lint-action@v3.4.0 with: - version: v1.51.2 + version: v1.53.3 diff --git a/.golangci.yml b/.golangci.yml index bc18dcc3fc..3f7e4589cb 100644 --- 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 index 19552574b2..955a5a6270 100644 --- 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 index 0632296b39..8c43ad8b8c 100644 --- 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 index bd2a591b93..c4990d7711 100644 --- 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 index 84db9edbab..3323251114 100644 --- 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)