Skip to content

Commit 3cea6f6

Browse files
authored
Upgrade prometheus/client_golang (#34)
Upgrade to prometheus/client_golang@[3692d7faba80](prometheus/client_golang@3692d7faba80). Also upgrading to Go v1.24.6 in CI, since it won't build with the old version (v1.19). --------- Signed-off-by: Arve Knudsen <[email protected]>
1 parent d6c7cce commit 3cea6f6

File tree

4 files changed

+94
-65
lines changed

4 files changed

+94
-65
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020
- uses: actions/setup-go@v5
2121
with:
22-
go-version: "1.19"
22+
go-version: "1.24.6"
2323
- name: Go test
2424
run: make test
2525
lint:
@@ -30,7 +30,7 @@ jobs:
3030
persist-credentials: false
3131
- uses: actions/setup-go@v5
3232
with:
33-
go-version: "1.19"
33+
go-version: "1.24.6"
3434
- name: Lint
3535
run: make lint
3636

@@ -48,7 +48,7 @@ jobs:
4848
options: --privileged
4949
- uses: actions/setup-go@v5
5050
with:
51-
go-version: "1.19"
51+
go-version: "1.24.6"
5252
- name: Integration Tests
5353
run: |
5454
make integration

go.mod

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module github.com/grafana/e2e
22

3-
go 1.19
3+
go 1.23.0
44

55
require (
66
github.com/go-kit/log v0.2.1
77
github.com/grafana/dskit v0.0.0-20230914143233-4b32fbf08128
88
github.com/pkg/errors v0.9.1
9-
github.com/prometheus/client_model v0.4.0
10-
github.com/prometheus/common v0.44.0
9+
github.com/prometheus/client_model v0.6.2
10+
github.com/prometheus/common v0.65.1-0.20250825082953-9deefbac4820
1111
github.com/prometheus/prometheus v0.44.0
12-
github.com/stretchr/testify v1.8.2
12+
github.com/stretchr/testify v1.10.0
1313
github.com/thanos-io/objstore v0.0.0-20220809103346-8ef1f215e2bf
1414
github.com/twmb/franz-go v1.15.4
1515
github.com/twmb/franz-go/pkg/kadm v1.10.0
@@ -32,43 +32,42 @@ require (
3232
github.com/aws/aws-sdk-go-v2/service/sts v1.16.1 // indirect
3333
github.com/aws/smithy-go v1.11.1 // indirect
3434
github.com/beorn7/perks v1.0.1 // indirect
35-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
35+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3636
github.com/davecgh/go-spew v1.1.1 // indirect
3737
github.com/dustin/go-humanize v1.0.0 // indirect
3838
github.com/efficientgo/tools/core v0.0.0-20220225185207-fe763185946b // indirect
3939
github.com/go-logfmt/logfmt v0.6.0 // indirect
4040
github.com/gogo/protobuf v1.3.2 // indirect
41-
github.com/golang/protobuf v1.5.3 // indirect
4241
github.com/google/uuid v1.3.0 // indirect
4342
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
4443
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
4544
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/klauspost/compress v1.17.0 // indirect
45+
github.com/klauspost/compress v1.18.0 // indirect
4746
github.com/klauspost/cpuid v1.3.1 // indirect
48-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4947
github.com/minio/md5-simd v1.1.0 // indirect
5048
github.com/minio/minio-go/v7 v7.0.23 // indirect
5149
github.com/minio/sha256-simd v0.1.1 // indirect
5250
github.com/mitchellh/go-homedir v1.1.0 // indirect
5351
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5452
github.com/modern-go/reflect2 v1.0.2 // indirect
53+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5554
github.com/opentracing/opentracing-go v1.2.0 // indirect
5655
github.com/pierrec/lz4/v4 v4.1.19 // indirect
5756
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
58-
github.com/prometheus/client_golang v1.15.1 // indirect
59-
github.com/prometheus/procfs v0.9.0 // indirect
57+
github.com/prometheus/client_golang v1.23.1-0.20250825092754-3692d7faba80 // indirect
58+
github.com/prometheus/procfs v0.17.0 // indirect
6059
github.com/rs/xid v1.2.1 // indirect
6160
github.com/sirupsen/logrus v1.8.1 // indirect
6261
github.com/twmb/franz-go/pkg/kmsg v1.7.0 // indirect
63-
go.uber.org/goleak v1.2.1 // indirect
64-
golang.org/x/crypto v0.17.0 // indirect
62+
go.uber.org/goleak v1.3.0 // indirect
63+
golang.org/x/crypto v0.40.0 // indirect
6564
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
66-
golang.org/x/net v0.10.0 // indirect
67-
golang.org/x/sync v0.3.0 // indirect
68-
golang.org/x/sys v0.15.0 // indirect
69-
golang.org/x/text v0.14.0 // indirect
65+
golang.org/x/net v0.42.0 // indirect
66+
golang.org/x/sync v0.16.0 // indirect
67+
golang.org/x/sys v0.34.0 // indirect
68+
golang.org/x/text v0.27.0 // indirect
7069
google.golang.org/api v0.126.0 // indirect
71-
google.golang.org/protobuf v1.31.0 // indirect
70+
google.golang.org/protobuf v1.36.6 // indirect
7271
gopkg.in/ini.v1 v1.67.0 // indirect
7372
gopkg.in/yaml.v2 v2.4.0 // indirect
7473
)

0 commit comments

Comments
 (0)