Skip to content

Commit a62947c

Browse files
nrwiersmanrwiersma
authored
chore: bump deps and linter (#189)
1 parent d031781 commit a62947c

File tree

8 files changed

+36
-36
lines changed

8 files changed

+36
-36
lines changed

‎.github/dependabot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ updates:
33
- package-ecosystem: gomod
44
directory: "/"
55
schedule:
6-
interval: weekly
6+
interval: monthly
77
groups:
88
all:
99
patterns:
@@ -12,7 +12,7 @@ updates:
1212
- package-ecosystem: "github-actions"
1313
directory: "/"
1414
schedule:
15-
interval: weekly
15+
interval: monthly
1616
groups:
1717
all:
1818
patterns:

‎.github/workflows/govulncheck.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ on:
33
branches:
44
- main
55
pull_request:
6-
schedule: # daily at 04:00 UTC
7-
- cron: '0 4 * * *'
6+
schedule: # Monday at 04:00 UTC
7+
- cron: '0 4 * * Mon'
88

99
permissions:
1010
contents: read

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
go-version: [ "1.25", "1.26" ]
1414
runs-on: ubuntu-latest
1515
env:
16-
GOLANGCI_LINT_VERSION: v2.9.0
16+
GOLANGCI_LINT_VERSION: v2.11.3
1717

1818
steps:
1919
- name: Checkout code

‎go.mod‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/hamba/pkg/v2
22

3-
go 1.25.7
3+
go 1.25.8
44

55
require (
6-
github.com/hamba/logger/v2 v2.9.0
7-
github.com/hamba/statter/v2 v2.8.0
6+
github.com/hamba/logger/v2 v2.9.1
7+
github.com/hamba/statter/v2 v2.8.1
88
github.com/json-iterator/go v1.1.12
99
github.com/segmentio/ksuid v1.0.4
1010
github.com/stretchr/testify v1.11.1
11-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0
11+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0
1212
golang.org/x/net v0.51.0
1313
)
1414

@@ -20,6 +20,7 @@ require (
2020
github.com/go-logr/logr v1.4.3 // indirect
2121
github.com/go-logr/stdr v1.2.2 // indirect
2222
github.com/go-stack/stack v1.8.1 // indirect
23+
github.com/go4org/hashtriemap v0.0.0-20251130024219-545ba229f689 // indirect
2324
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2425
github.com/modern-go/reflect2 v1.0.2 // indirect
2526
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -31,9 +32,9 @@ require (
3132
github.com/stretchr/objx v0.5.2 // indirect
3233
github.com/valyala/fastrand v1.1.0 // indirect
3334
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
34-
go.opentelemetry.io/otel v1.40.0 // indirect
35-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
36-
go.opentelemetry.io/otel/trace v1.40.0 // indirect
35+
go.opentelemetry.io/otel v1.42.0 // indirect
36+
go.opentelemetry.io/otel/metric v1.42.0 // indirect
37+
go.opentelemetry.io/otel/trace v1.42.0 // indirect
3738
go.yaml.in/yaml/v2 v2.4.2 // indirect
3839
golang.org/x/sys v0.41.0 // indirect
3940
golang.org/x/text v0.34.0 // indirect

‎go.sum‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,17 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
1414
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
1515
github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
1616
github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
17+
github.com/go4org/hashtriemap v0.0.0-20251130024219-545ba229f689 h1:0psnKZ+N2IP43/SZC8SKx6OpFJwLmQb9m9QyV9BC2f8=
18+
github.com/go4org/hashtriemap v0.0.0-20251130024219-545ba229f689/go.mod h1:OGmRfY/9QEK2P5zCRtmqfbCF283xPkU2dvVA4MvbvpI=
1719
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
1820
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
1921
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
2022
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
2123
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
22-
github.com/hamba/logger/v2 v2.9.0 h1:gLa4AuoQ17XTBovyIewOK7sALX/sHDJO3kfPUQBUA2o=
23-
github.com/hamba/logger/v2 v2.9.0/go.mod h1:i+ohrYJ5XKaicZAJD+64lsYd3ZqLOjFXzt210lmZ/iQ=
24-
github.com/hamba/statter/v2 v2.8.0 h1:5rLx+e/wODnvtkzpmEQim4hHcWEJbeI+KJuPHTkQCLQ=
25-
github.com/hamba/statter/v2 v2.8.0/go.mod h1:V3pzf51ZQG5tpVQdbbkoTm3mA5GtxeQ30Yr+GPUa3Is=
24+
github.com/hamba/logger/v2 v2.9.1 h1:NRV+6j0SEdGag1DkjWtV/k3JGOFAByx6IEc/nJNpYLs=
25+
github.com/hamba/logger/v2 v2.9.1/go.mod h1:IveSM7xeUVbtmlgXsXoAdNvhQ+JG1CgFMBlKG7hRH/4=
26+
github.com/hamba/statter/v2 v2.8.1 h1:Y6mEOXPxBLfBvKzb31BjPhtSLyza/ghFu+Kez7t0CaY=
27+
github.com/hamba/statter/v2 v2.8.1/go.mod h1:DTwNCeix6cqciNDhT8CzzKa5k2nCWPWGjIAru4jRtpA=
2628
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
2729
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
2830
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
@@ -64,18 +66,18 @@ github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G
6466
github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ=
6567
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
6668
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
67-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 h1:7iP2uCb7sGddAr30RRS6xjKy7AZ2JtTOPA3oolgVSw8=
68-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0/go.mod h1:c7hN3ddxs/z6q9xwvfLPk+UHlWRQyaeR1LdgfL/66l0=
69-
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
70-
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
71-
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
72-
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
73-
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
74-
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
75-
go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
76-
go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=
77-
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
78-
go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
69+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 h1:OyrsyzuttWTSur2qN/Lm0m2a8yqyIjUVBZcxFPuXq2o=
70+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0/go.mod h1:C2NGBr+kAB4bk3xtMXfZ94gqFDtg/GkI7e9zqGh5Beg=
71+
go.opentelemetry.io/otel v1.42.0 h1:lSQGzTgVR3+sgJDAU/7/ZMjN9Z+vUip7leaqBKy4sho=
72+
go.opentelemetry.io/otel v1.42.0/go.mod h1:lJNsdRMxCUIWuMlVJWzecSMuNjE7dOYyWlqOXWkdqCc=
73+
go.opentelemetry.io/otel/metric v1.42.0 h1:2jXG+3oZLNXEPfNmnpxKDeZsFI5o4J+nz6xUlaFdF/4=
74+
go.opentelemetry.io/otel/metric v1.42.0/go.mod h1:RlUN/7vTU7Ao/diDkEpQpnz3/92J9ko05BIwxYa2SSI=
75+
go.opentelemetry.io/otel/sdk v1.42.0 h1:LyC8+jqk6UJwdrI/8VydAq/hvkFKNHZVIWuslJXYsDo=
76+
go.opentelemetry.io/otel/sdk v1.42.0/go.mod h1:rGHCAxd9DAph0joO4W6OPwxjNTYWghRWmkHuGbayMts=
77+
go.opentelemetry.io/otel/sdk/metric v1.42.0 h1:D/1QR46Clz6ajyZ3G8SgNlTJKBdGp84q9RKCAZ3YGuA=
78+
go.opentelemetry.io/otel/sdk/metric v1.42.0/go.mod h1:Ua6AAlDKdZ7tdvaQKfSmnFTdHx37+J4ba8MwVCYM5hc=
79+
go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY=
80+
go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc=
7981
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
8082
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
8183
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=

‎http/healthz/healthz_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestHandler(t *testing.T) {
1818
gotOutput = output
1919
}, goodCheck)
2020

21-
req := httptest.NewRequest(http.MethodGet, "/readyz", nil)
21+
req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/readyz", nil)
2222
rec := httptest.NewRecorder()
2323

2424
h.ServeHTTP(rec, req)
@@ -36,7 +36,7 @@ func TestHandler_Verbose(t *testing.T) {
3636
gotOutput = output
3737
}, goodCheck)
3838

39-
req := httptest.NewRequest(http.MethodGet, "/readyz?verbose=1", nil)
39+
req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/readyz?verbose=1", nil)
4040
rec := httptest.NewRecorder()
4141

4242
h.ServeHTTP(rec, req)
@@ -55,7 +55,7 @@ func TestHandler_WithFailingChecks(t *testing.T) {
5555
gotOutput = output
5656
}, goodCheck, badCheck)
5757

58-
req := httptest.NewRequest(http.MethodGet, "/readyz", nil)
58+
req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/readyz", nil)
5959
rec := httptest.NewRecorder()
6060

6161
h.ServeHTTP(rec, req)

‎http/middleware/middleware_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,7 @@ func TestRequestID(t *testing.T) {
8383
assert.NotEmpty(t, got)
8484
})
8585

86-
ctx, cancel := context.WithCancel(context.Background())
87-
t.Cleanup(cancel)
88-
89-
req := httptest.NewRequestWithContext(ctx, http.MethodGet, "/some/thing", nil)
86+
req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/some/thing", nil)
9087
rec := httptest.NewRecorder()
9188

9289
middleware.RequestID()(next).ServeHTTP(rec, req)

‎http/server/server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func (s *GenericServer[T]) runServer(
159159
}
160160

161161
serverShutdownCh := make(chan struct{})
162-
go func() {
162+
go func() { //nolint:gosec // This must use a new context, so shutdown can complete properly.
163163
defer close(serverShutdownCh)
164164

165165
<-doneCh

0 commit comments

Comments
 (0)