Skip to content

Commit 8bc2f24

Browse files
authored
chore: bump versions (#192)
1 parent ce7621a commit 8bc2f24

7 files changed

Lines changed: 72 additions & 66 deletions

File tree

.github/workflows/govulncheck.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,8 @@ jobs:
1515

1616
runs-on: ubuntu-latest
1717
steps:
18-
- name: Checkout code
19-
uses: actions/checkout@v6
20-
21-
- name: Install Go
22-
id: install-go
23-
uses: actions/setup-go@v6
24-
with:
25-
go-version-file: go.mod
26-
2718
- name: Run govalncheck
28-
run: |
29-
go run golang.org/x/vuln/cmd/govulncheck@latest ./...
19+
uses: golang/govulncheck-action@v1
20+
with:
21+
go-version-input: ''
22+
go-version-file: 'go.mod'

.github/workflows/test.yml

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ on:
66

77
name: run tests
88
jobs:
9-
test:
10-
11-
strategy:
12-
matrix:
13-
go-version: [ "1.25", "1.26" ]
9+
lint:
1410
runs-on: ubuntu-latest
1511
env:
1612
GOLANGCI_LINT_VERSION: v2.11.3
@@ -23,8 +19,7 @@ jobs:
2319
id: install-go
2420
uses: actions/setup-go@v6
2521
with:
26-
go-version: ${{ matrix.go-version }}
27-
check-latest: 'true'
22+
go-version-file: 'go.mod'
2823

2924
- name: Download dependencies
3025
run: go mod download
@@ -35,19 +30,34 @@ jobs:
3530
with:
3631
version: ${{ env.GOLANGCI_LINT_VERSION }}
3732

33+
test:
34+
strategy:
35+
matrix:
36+
go-version: [ "1.25", "1.26" ]
37+
runs-on: ubuntu-latest
38+
39+
steps:
40+
- name: Checkout code
41+
uses: actions/checkout@v6
42+
43+
- name: Install Go
44+
id: install-go
45+
uses: actions/setup-go@v6
46+
with:
47+
go-version: ${{ matrix.go-version }}
48+
check-latest: true
49+
50+
- name: Download dependencies
51+
run: go mod download
52+
if: steps.install-go.outputs.cache-hit != 'true'
53+
3854
- name: Setup gotestsum
3955
uses: gertd/action-gotestsum@v3.0.0
4056
with:
4157
gotestsum_version: v1.13.0
4258

4359
- name: Run Tests
44-
run: gotestsum --junitfile tests.xml --format pkgname -- -covermode=atomic -coverprofile=coverage.out -race ./...
45-
46-
- name: Test Summary
47-
uses: test-summary/action@v2
48-
with:
49-
paths: "tests.xml"
50-
if: always()
60+
run: gotestsum --format pkgname -- -covermode=atomic -coverprofile=coverage.out -race ./...
5161

5262
- name: Coveralls
5363
uses: coverallsapp/github-action@v2
@@ -58,7 +68,7 @@ jobs:
5868
parallel: true
5969
flag-name: go-${{ matrix.go-version }}
6070

61-
finish:
71+
test-results:
6272
needs: test
6373
if: ${{ always() }}
6474
runs-on: ubuntu-latest
@@ -69,3 +79,7 @@ jobs:
6979
with:
7080
github-token: ${{ secrets.GITHUB_TOKEN }}
7181
parallel-finished: true
82+
83+
- name: Check matrix results
84+
if: ${{ contains(needs.test.result, 'failure') || contains(needs.test.result, 'cancelled') }}
85+
run: exit 1

go.mod

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

3-
go 1.25.8
3+
go 1.25.10
44

55
require (
6-
github.com/hamba/logger/v2 v2.9.1
7-
github.com/hamba/statter/v2 v2.8.1
6+
github.com/hamba/logger/v2 v2.10.0
7+
github.com/hamba/statter/v2 v2.9.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.67.0
12-
golang.org/x/net v0.52.0
11+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0
12+
golang.org/x/net v0.53.0
1313
)
1414

1515
require (
@@ -30,14 +30,13 @@ require (
3030
github.com/prometheus/common v0.66.1 // indirect
3131
github.com/prometheus/procfs v0.16.1 // indirect
3232
github.com/stretchr/objx v0.5.2 // indirect
33-
github.com/valyala/fastrand v1.1.0 // indirect
3433
go.opentelemetry.io/auto/sdk v1.2.1 // 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
34+
go.opentelemetry.io/otel v1.43.0 // indirect
35+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
36+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
3837
go.yaml.in/yaml/v2 v2.4.2 // indirect
39-
golang.org/x/sys v0.42.0 // indirect
40-
golang.org/x/text v0.35.0 // indirect
38+
golang.org/x/sys v0.43.0 // indirect
39+
golang.org/x/text v0.36.0 // indirect
4140
google.golang.org/protobuf v1.36.8 // indirect
4241
gopkg.in/yaml.v3 v3.0.1 // indirect
4342
)

go.sum

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX
2121
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
2222
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
2323
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
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=
24+
github.com/hamba/logger/v2 v2.10.0 h1:3ZOAB2ddJnaSad+p3r66lBVrID0RtdXO2KPka9HtwCw=
25+
github.com/hamba/logger/v2 v2.10.0/go.mod h1:IveSM7xeUVbtmlgXsXoAdNvhQ+JG1CgFMBlKG7hRH/4=
26+
github.com/hamba/statter/v2 v2.9.1 h1:gFFUsbNDq0WNmOLZEV99QlP+aWxrKR9HZ45suYnwMwM=
27+
github.com/hamba/statter/v2 v2.9.1/go.mod h1:bJBokob/hMSAhtsLmfz+mZ/ijDUZeFNGxVXDS/YkHOk=
2828
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
2929
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
3030
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
@@ -62,32 +62,30 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
6262
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
6363
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
6464
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
65-
github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8=
66-
github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ=
6765
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
6866
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
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=
67+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 h1:CqXxU8VOmDefoh0+ztfGaymYbhdB/tT3zs79QaZTNGY=
68+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0/go.mod h1:BuhAPThV8PBHBvg8ZzZ/Ok3idOdhWIodywz2xEcRbJo=
69+
go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
70+
go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
71+
go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
72+
go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
73+
go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
74+
go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
75+
go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
76+
go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
77+
go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
78+
go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
8179
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
8280
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
8381
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
8482
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
85-
golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
86-
golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
87-
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
88-
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
89-
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
90-
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
83+
golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
84+
golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
85+
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
86+
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
87+
golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
88+
golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
9189
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
9290
google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
9391
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

http/middleware/middleware_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"errors"
77
"net/http"
88
"net/http/httptest"
9-
"sort"
109
"testing"
1110
"time"
1211

@@ -120,10 +119,7 @@ func TestStats(t *testing.T) {
120119

121120
m := &mockReporter{}
122121
m.On("Counter", "requests", int64(1), test.wantTags)
123-
wantTags := append(test.wantTags, [][2]string{{"code", "305"}, {"code-group", "3xx"}}...) //nolint:gocritic
124-
sort.Slice(wantTags, func(i, j int) bool {
125-
return wantTags[i][0] < wantTags[j][0]
126-
})
122+
wantTags := append(test.wantTags, [][2]string{{"code-group", "3xx"}, {"code", "305"}}...) //nolint:gocritic
127123
m.On("Counter", "responses", int64(1), wantTags)
128124
m.On("Histogram", "response.size", wantTags).Return(func(_ float64) {})
129125
m.On("Timing", "response.duration", wantTags).Return(func(_ time.Duration) {})

http/server.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ var testHookServerServe func(net.Listener)
5050

5151
// Server is a convenience wrapper around the standard
5252
// library HTTP server.
53+
//
54+
// Deprecated: Use server.GenericServer instead of this type. This type is not
55+
// needed and will be removed in a future release.
5356
type Server struct {
5457
srv *http.Server
5558
}

ptr/ptr.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
package ptr
33

44
// Of returns a pointer to v.
5+
//
6+
// Deprecated: Use the built-in new operator instead of this function. This function is not needed
7+
// and will be removed in a future release.
58
func Of[T any](v T) *T {
69
return &v
710
}

0 commit comments

Comments
 (0)