From 001d3d835af237dae96a4ee9645f053b48fd953e Mon Sep 17 00:00:00 2001 From: Nicholas Wiersma Date: Wed, 11 Mar 2026 06:50:29 +0200 Subject: [PATCH] chore: bump linter --- .github/dependabot.yml | 4 +-- .github/workflows/test.yml | 2 +- go.mod | 6 ++-- go.sum | 16 ++++------ reporter/prometheus/prometheus_test.go | 32 +++++++++---------- .../victoriametrics/victoria_metrics_test.go | 20 ++++++------ 6 files changed, 38 insertions(+), 42 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 68e1fdc..0fa9bc8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,7 +3,7 @@ updates: - package-ecosystem: gomod directory: "/" schedule: - interval: weekly + interval: monthly groups: all: patterns: @@ -12,7 +12,7 @@ updates: - package-ecosystem: "github-actions" directory: "/" schedule: - interval: weekly + interval: monthly groups: all: patterns: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dd51762..b115f03 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: go-version: [ "1.25", "1.26" ] runs-on: ubuntu-latest env: - GOLANGCI_LINT_VERSION: v2.9.0 + GOLANGCI_LINT_VERSION: v2.11.3 steps: - name: Checkout code diff --git a/go.mod b/go.mod index 3897768..a0e565d 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/VictoriaMetrics/metrics v1.41.2 github.com/cactus/go-statsd-client/v5 v5.1.0 github.com/go4org/hashtriemap v0.0.0-20251130024219-545ba229f689 - github.com/hamba/logger/v2 v2.9.0 + github.com/hamba/logger/v2 v2.9.1 github.com/prometheus/client_golang v1.23.2 github.com/stretchr/testify v1.11.1 github.com/valyala/fastrand v1.1.0 @@ -25,8 +25,8 @@ require ( github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/valyala/histogram v1.2.0 // indirect - go.opentelemetry.io/otel v1.38.0 // indirect - go.opentelemetry.io/otel/trace v1.38.0 // indirect + go.opentelemetry.io/otel v1.42.0 // indirect + go.opentelemetry.io/otel/trace v1.42.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect golang.org/x/sys v0.41.0 // indirect google.golang.org/protobuf v1.36.8 // indirect diff --git a/go.sum b/go.sum index 1988295..d89c61a 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/VictoriaMetrics/metrics v1.41.1 h1:xYQilpPmq5BPB+uIbe4Iygdw1cSiI4obYQjfLdQN2Xo= -github.com/VictoriaMetrics/metrics v1.41.1/go.mod h1:xDM82ULLYCYdFRgQ2JBxi8Uf1+8En1So9YUwlGTOqTc= github.com/VictoriaMetrics/metrics v1.41.2 h1:pLQ4Mw9TqXFq3ZsZVJkz88JHpjL9LY5NHTY3v2gBNAw= github.com/VictoriaMetrics/metrics v1.41.2/go.mod h1:xDM82ULLYCYdFRgQ2JBxi8Uf1+8En1So9YUwlGTOqTc= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -16,8 +14,8 @@ github.com/go4org/hashtriemap v0.0.0-20251130024219-545ba229f689 h1:0psnKZ+N2IP4 github.com/go4org/hashtriemap v0.0.0-20251130024219-545ba229f689/go.mod h1:OGmRfY/9QEK2P5zCRtmqfbCF283xPkU2dvVA4MvbvpI= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/hamba/logger/v2 v2.9.0 h1:gLa4AuoQ17XTBovyIewOK7sALX/sHDJO3kfPUQBUA2o= -github.com/hamba/logger/v2 v2.9.0/go.mod h1:i+ohrYJ5XKaicZAJD+64lsYd3ZqLOjFXzt210lmZ/iQ= +github.com/hamba/logger/v2 v2.9.1 h1:NRV+6j0SEdGag1DkjWtV/k3JGOFAByx6IEc/nJNpYLs= +github.com/hamba/logger/v2 v2.9.1/go.mod h1:IveSM7xeUVbtmlgXsXoAdNvhQ+JG1CgFMBlKG7hRH/4= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= @@ -49,16 +47,14 @@ github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ= github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OLoQ= github.com/valyala/histogram v1.2.0/go.mod h1:Hb4kBwb4UxsaNbbbh+RRz8ZR6pdodR57tzWUS3BUzXY= -go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= -go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= -go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= -go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= +go.opentelemetry.io/otel v1.42.0 h1:lSQGzTgVR3+sgJDAU/7/ZMjN9Z+vUip7leaqBKy4sho= +go.opentelemetry.io/otel v1.42.0/go.mod h1:lJNsdRMxCUIWuMlVJWzecSMuNjE7dOYyWlqOXWkdqCc= +go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY= +go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= -golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk= -golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc= diff --git a/reporter/prometheus/prometheus_test.go b/reporter/prometheus/prometheus_test.go index 0a17c87..f3abfc7 100644 --- a/reporter/prometheus/prometheus_test.go +++ b/reporter/prometheus/prometheus_test.go @@ -39,7 +39,7 @@ func TestPrometheus_Counter(t *testing.T) { p.Counter("test", 2, [][2]string{{"test", "test"}, {"foo", "bar"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test_test_test{foo=\"bar\",test=\"test\"} 2") @@ -54,7 +54,7 @@ func TestPrometheus_RemoveCounter(t *testing.T) { p.RemoveCounter("test", [][2]string{{"test", "test"}, {"foo", "bar"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.NotContains(t, rr.Body.String(), "test_test_test{foo=\"bar\",test=\"test\"} 2") @@ -67,7 +67,7 @@ func TestPrometheus_Gauge(t *testing.T) { p.Gauge("test", 2.1, [][2]string{{"foo", "bar"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test_test_test{foo=\"bar\"} 2.1") @@ -82,7 +82,7 @@ func TestPrometheus_RemoveGauge(t *testing.T) { p.RemoveGauge("test", [][2]string{{"foo", "bar"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.NotContains(t, rr.Body.String(), "test_test_test{foo=\"bar\"} 2.1") @@ -95,7 +95,7 @@ func TestPrometheus_Histogram(t *testing.T) { p.Histogram("test", [][2]string{{"foo", "bar"}})(0.0123) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",le=\"0.1\"} 1") @@ -113,7 +113,7 @@ func TestPrometheus_RemoveHistogram(t *testing.T) { p.RemoveHistogram("test", [][2]string{{"foo", "bar"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.NotContains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",le=\"0.1\"} 1") @@ -129,7 +129,7 @@ func TestPrometheus_Timing(t *testing.T) { p.Timing("test", [][2]string{{"foo", "bar"}})(1234500 * time.Nanosecond) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",le=\"0.1\"} 1") @@ -147,7 +147,7 @@ func TestPrometheus_RemoveTiming(t *testing.T) { p.RemoveTiming("test", [][2]string{{"foo", "bar"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.NotContains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",le=\"0.1\"} 1") @@ -163,7 +163,7 @@ func TestPrometheus_ConvertsLabels(t *testing.T) { p.Counter("test", 2, [][2]string{{"test-label", "test"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test_test_test{test_label=\"test\"} 2") @@ -176,7 +176,7 @@ func TestPrometheus_NoPrefixNoTags(t *testing.T) { p.Counter("test", 2, [][2]string{}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test 2") @@ -199,8 +199,8 @@ func TestRegisterCounter(t *testing.T) { p.Counter("baz.bat", 1, [][2]string{{"label1", "value1"}}) - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) rec := httptest.NewRecorder() + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rec, req) assert.Contains(t, rec.Body.String(), `HELP foo_bar_baz_bat my awesome counter`) @@ -215,8 +215,8 @@ func TestRegisterGauge(t *testing.T) { p.Gauge("baz.bat", 1.23, [][2]string{{"label1", "value1"}}) - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) rec := httptest.NewRecorder() + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rec, req) assert.Contains(t, rec.Body.String(), `HELP foo_bar_baz_bat my awesome gauge`) @@ -231,8 +231,8 @@ func TestRegisterHistogram(t *testing.T) { p.Histogram("baz.bat", [][2]string{{"label1", "value1"}})(0.0123) - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) rec := httptest.NewRecorder() + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rec, req) assert.Contains(t, rec.Body.String(), `HELP foo_bar_baz_bat my awesome histogram`) @@ -250,8 +250,8 @@ func TestRegisterHistogram_HandlesNoBuckets(t *testing.T) { p.Histogram("baz.bat", [][2]string{{"label1", "value1"}})(0.0123) - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) rec := httptest.NewRecorder() + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rec, req) assert.Contains(t, rec.Body.String(), `HELP foo_bar_baz_bat my awesome histogram`) @@ -271,7 +271,7 @@ func TestSetBuckets_Histogram(t *testing.T) { p.Histogram("test", [][2]string{{"foo", "bar"}})(0.0123) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",le=\"0.1\"} 1") @@ -289,7 +289,7 @@ func TestSetBuckets_Timing(t *testing.T) { p.Timing("test", [][2]string{{"foo", "bar"}})(1234500 * time.Nanosecond) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",le=\"0.1\"} 1") diff --git a/reporter/victoriametrics/victoria_metrics_test.go b/reporter/victoriametrics/victoria_metrics_test.go index 9f34af9..c4955b5 100644 --- a/reporter/victoriametrics/victoria_metrics_test.go +++ b/reporter/victoriametrics/victoria_metrics_test.go @@ -39,7 +39,7 @@ func TestVictoriaMetrics_Counter(t *testing.T) { p.Counter("test.test.test", 2, [][2]string{{"test", "test"}, {"foo", "bar"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test_test_test{foo=\"bar\",test=\"test\"} 2") @@ -54,7 +54,7 @@ func TestVictoriaMetrics_RemoveCounter(t *testing.T) { p.RemoveCounter("test.test.test", [][2]string{{"test", "test"}, {"foo", "bar"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.NotContains(t, rr.Body.String(), "test_test_test{foo=\"bar\",test=\"test\"} 2") @@ -67,7 +67,7 @@ func TestVictoriaMetrics_Gauge(t *testing.T) { p.Gauge("test.test.test", 2.1, [][2]string{{"foo", "bar"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test_test_test{foo=\"bar\"} 2.1") @@ -82,7 +82,7 @@ func TestVictoriaMetrics_RemoveGauge(t *testing.T) { p.RemoveGauge("test.test.test", [][2]string{{"foo", "bar"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.NotContains(t, rr.Body.String(), "test_test_test{foo=\"bar\"} 2.1") @@ -95,7 +95,7 @@ func TestVictoriaMetrics_Histogram(t *testing.T) { p.Histogram("test.test.test", [][2]string{{"foo", "bar"}})(0.0123) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",vmrange=\"1.136e-02...1.292e-02\"} 1") @@ -112,7 +112,7 @@ func TestVictoriaMetrics_RemoveHistogram(t *testing.T) { p.RemoveHistogram("test.test.test", [][2]string{{"foo", "bar"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.NotContains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",vmrange=\"1.136e-02...1.292e-02\"} 1") @@ -127,7 +127,7 @@ func TestVictoriaMetrics_Timing(t *testing.T) { p.Timing("test.test.test", [][2]string{{"foo", "bar"}})(1234500 * time.Nanosecond) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",vmrange=\"1.136e-03...1.292e-03\"} 1") @@ -144,7 +144,7 @@ func TestVictoriaMetrics_RemoveTiming(t *testing.T) { p.RemoveTiming("test.test.test", [][2]string{{"foo", "bar"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.NotContains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",vmrange=\"1.136e-03...1.292e-03\"} 1") @@ -159,7 +159,7 @@ func TestVictoriaMetrics_ConvertsLabels(t *testing.T) { p.Counter("foo.bar.baz", 2, [][2]string{{"test-label", "test"}, {"a", "b"}}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "foo_bar_baz{a=\"b\",test_label=\"test\"} 2") @@ -172,7 +172,7 @@ func TestVictoriaMetrics_NoTags(t *testing.T) { p.Counter("test", 2, [][2]string{}) rr := httptest.NewRecorder() - req := httptest.NewRequest(http.MethodGet, "/metrics", nil) + req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) p.Handler().ServeHTTP(rr, req) assert.Contains(t, rr.Body.String(), "test 2")