Skip to content

Commit b6112ea

Browse files
authored
Update Go version (#3429)
* Update default builds to Go 1.25.x. * Bump Go modules. * Bump FreeBSD action. * Fixup MacOS e2e test. * Fixup FreeBSD e2e test. Signed-off-by: Ben Kochie <[email protected]>
1 parent b959d48 commit b6112ea

File tree

9 files changed

+63
-19
lines changed

9 files changed

+63
-19
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ executors:
77
# should also be updated.
88
golang:
99
docker:
10-
- image: cimg/go:1.24
10+
- image: cimg/go:1.25
1111
arm:
1212
docker:
13-
- image: cimg/go:1.24
13+
- image: cimg/go:1.25
1414
resource_class: arm.medium
1515

1616
jobs:
@@ -70,7 +70,7 @@ jobs:
7070
machine:
7171
image: ubuntu-2404:current
7272
environment:
73-
DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.24-base
73+
DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.25-base
7474
REPO_PATH: github.com/prometheus/node_exporter
7575
steps:
7676
- prometheus/setup_environment

.github/workflows/bsd.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ permissions:
1313

1414
env:
1515
GNU_TAR_VERSION: "1.35"
16-
GO_VERSION_DRAGONFLY: "1.24.1"
17-
GO_VERSION_FREEBSD: "123"
18-
GO_VERSION_NETBSD: "1.24.1"
16+
GO_VERSION_DRAGONFLY: "1.25.1"
17+
GO_VERSION_FREEBSD: "125"
18+
GO_VERSION_NETBSD: "1.25.1"
1919
GO_VERSION_OPENBSD: "1.24.1"
20-
GO_VERSION_SOLARIS: "1.24.1"
20+
GO_VERSION_SOLARIS: "1.25.1"
2121

2222
# To spin up one of the VMs below, see the "Debug Shell" section here: https://github.com/vmactions
2323
jobs:
@@ -28,8 +28,9 @@ jobs:
2828
- name: Checkout the repository
2929
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3030
- name: test-e2e
31-
uses: vmactions/freebsd-vm@05856381fab64eeee9b038a0818f6cec649ca17a # v1.2.3
31+
uses: vmactions/freebsd-vm@487ce35b96fae3e60d45b521735f5aa436ecfade # v1.2.4
3232
with:
33+
release: "15.0"
3334
copyback: false
3435
envs: 'GO_VERSION_FREEBSD GNU_TAR_VERSION'
3536
usesh: true

.promu-cgo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
go:
22
# Whenever the Go version is updated here, .circle/config.yml and
33
# .promu.yml should also be updated.
4-
version: 1.24
4+
version: 1.25
55
cgo: true
66
repository:
77
path: github.com/prometheus/node_exporter

.promu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
go:
22
# Whenever the Go version is updated here, .circle/config.yml and
33
# .promu-cgo.yml should also be updated.
4-
version: 1.24
4+
version: 1.25
55
repository:
66
path: github.com/prometheus/node_exporter
77
build:

collector/fixtures/e2e-output-darwin.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,19 @@ node_buddyinfo_blocks{node="0",size="9",zone="Normal"} 0
9494
# HELP node_disk_read_errors_total The total number of read errors.
9595
# TYPE node_disk_read_errors_total counter
9696
node_disk_read_errors_total{device="disk0"} 0
97+
node_disk_read_errors_total{device="disk4"} 0
9798
# HELP node_disk_read_retries_total The total number of read retries.
9899
# TYPE node_disk_read_retries_total counter
99100
node_disk_read_retries_total{device="disk0"} 0
101+
node_disk_read_retries_total{device="disk4"} 0
100102
# HELP node_disk_write_errors_total The total number of write errors.
101103
# TYPE node_disk_write_errors_total counter
102104
node_disk_write_errors_total{device="disk0"} 0
105+
node_disk_write_errors_total{device="disk4"} 0
103106
# HELP node_disk_write_retries_total The total number of write retries.
104107
# TYPE node_disk_write_retries_total counter
105108
node_disk_write_retries_total{device="disk0"} 0
109+
node_disk_write_retries_total{device="disk4"} 0
106110
# HELP node_exporter_build_info A metric with a constant '1' value labeled by version, revision, branch, goversion from which node_exporter was built, and the goos and goarch for the build.
107111
# TYPE node_exporter_build_info gauge
108112
# HELP node_memory_swap_total_bytes Memory information field swap_total_bytes.

collector/fixtures/e2e-output-freebsd.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,18 @@ node_xfrm_out_state_proto_error_packets_total 4542
261261
# HELP node_xfrm_out_state_seq_error_packets_total Sequence error i.e. Sequence number overflow
262262
# TYPE node_xfrm_out_state_seq_error_packets_total counter
263263
node_xfrm_out_state_seq_error_packets_total 543
264+
# HELP node_zfs_arcstats_c_min_bytes ZFS ARC minimum size
265+
# TYPE node_zfs_arcstats_c_min_bytes gauge
266+
node_zfs_arcstats_c_min_bytes 1.99932544e+08
267+
# HELP node_zfs_arcstats_mfu_ghost_size ZFS ARC MFU ghost size
268+
# TYPE node_zfs_arcstats_mfu_ghost_size gauge
269+
node_zfs_arcstats_mfu_ghost_size 0
270+
# HELP node_zfs_arcstats_mru_ghost_hits_total ZFS ARC MRU ghost hits
271+
# TYPE node_zfs_arcstats_mru_ghost_hits_total counter
272+
node_zfs_arcstats_mru_ghost_hits_total 0
273+
# HELP node_zfs_arcstats_pm_bytes ZFS ARC meta MRU target frac
274+
# TYPE node_zfs_arcstats_pm_bytes gauge
275+
node_zfs_arcstats_pm_bytes 2.147483648e+09
264276
# HELP promhttp_metric_handler_errors_total Total number of internal errors encountered by the promhttp metric handler.
265277
# TYPE promhttp_metric_handler_errors_total counter
266278
promhttp_metric_handler_errors_total{cause="encoding"} 0

end-to-end-test.sh

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,33 @@ non_deterministic_metrics=$(cat << METRICS
365365
node_network_receive_bytes_total
366366
node_network_receive_multicast_total
367367
node_network_transmit_multicast_total
368+
node_zfs_abdstats_linear_count_total
369+
node_zfs_abdstats_linear_data_bytes
370+
node_zfs_abdstats_scatter_chunk_waste_bytes
371+
node_zfs_abdstats_scatter_count_total
372+
node_zfs_abdstats_scatter_data_bytes
373+
node_zfs_abdstats_struct_bytes
374+
node_zfs_arcstats_anon_bytes
375+
node_zfs_arcstats_c_bytes
376+
node_zfs_arcstats_c_max_bytes
377+
node_zfs_arcstats_data_bytes
378+
node_zfs_arcstats_demand_data_hits_total
379+
node_zfs_arcstats_demand_data_misses_total
380+
node_zfs_arcstats_demand_metadata_hits_total
381+
node_zfs_arcstats_demand_metadata_misses_total
382+
node_zfs_arcstats_hdr_bytes
383+
node_zfs_arcstats_hits_total
384+
node_zfs_arcstats_meta_bytes
385+
node_zfs_arcstats_mfu_bytes
386+
node_zfs_arcstats_mfu_ghost_hits_total
387+
node_zfs_arcstats_misses_total
388+
node_zfs_arcstats_mru_bytes
389+
node_zfs_arcstats_mru_ghost_bytes
390+
node_zfs_arcstats_other_bytes
391+
node_zfs_arcstats_pd_bytes
392+
node_zfs_arcstats_size_bytes
393+
node_zfs_zfetchstats_hits_total
394+
node_zfs_zfetchstats_misses_total
368395
METRICS
369396
)
370397

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/alecthomas/kingpin/v2 v2.4.0
77
github.com/beevik/ntp v1.4.3
88
github.com/coreos/go-systemd/v22 v22.6.0
9-
github.com/dennwc/btrfs v0.0.0-20240418142341-0167142bde7a
9+
github.com/dennwc/btrfs v0.0.0-20241002142654-12ae127e0bf6
1010
github.com/ema/qdisc v1.0.0
1111
github.com/godbus/dbus/v5 v5.1.0
1212
github.com/hashicorp/go-envparse v0.1.0
@@ -27,7 +27,7 @@ require (
2727
github.com/prometheus/exporter-toolkit v0.14.1
2828
github.com/prometheus/procfs v0.17.0
2929
github.com/safchain/ethtool v0.6.2
30-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
30+
golang.org/x/exp v0.0.0-20250911091902-df9299821621
3131
golang.org/x/sys v0.36.0
3232
howett.net/plist v1.0.1
3333
)
@@ -53,7 +53,7 @@ require (
5353
golang.org/x/crypto v0.41.0 // indirect
5454
golang.org/x/net v0.43.0 // indirect
5555
golang.org/x/oauth2 v0.30.0 // indirect
56-
golang.org/x/sync v0.16.0 // indirect
56+
golang.org/x/sync v0.17.0 // indirect
5757
golang.org/x/text v0.28.0 // indirect
5858
google.golang.org/protobuf v1.36.8 // indirect
5959
)

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X
1515
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1616
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1717
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
18-
github.com/dennwc/btrfs v0.0.0-20240418142341-0167142bde7a h1:KfFsGLJFVdCXlySUkV2FmxNtmiztpJb6tV+XYBmmv8E=
19-
github.com/dennwc/btrfs v0.0.0-20240418142341-0167142bde7a/go.mod h1:MYsOV9Dgsec3FFSOjywi0QK5r6TeBbdWxdrMGtiYXHA=
18+
github.com/dennwc/btrfs v0.0.0-20241002142654-12ae127e0bf6 h1:fV+JlCY0cCJh3l0jfE7iB3ZmrdfJSgfcjdrCQhPokGg=
19+
github.com/dennwc/btrfs v0.0.0-20241002142654-12ae127e0bf6/go.mod h1:MYsOV9Dgsec3FFSOjywi0QK5r6TeBbdWxdrMGtiYXHA=
2020
github.com/dennwc/ioctl v1.0.0 h1:DsWAAjIxRqNcLn9x6mwfuf2pet3iB7aK90K4tF16rLg=
2121
github.com/dennwc/ioctl v1.0.0/go.mod h1:ellh2YB5ldny99SBU/VX7Nq0xiZbHphf1DrtHxxjMk0=
2222
github.com/ema/qdisc v1.0.0 h1:EHLG08FVRbWLg8uRICa3xzC9Zm0m7HyMHfXobWFnXYg=
@@ -105,14 +105,14 @@ go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
105105
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
106106
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
107107
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
108-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
109-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
108+
golang.org/x/exp v0.0.0-20250911091902-df9299821621 h1:2id6c1/gto0kaHYyrixvknJ8tUK/Qs5IsmBtrc+FtgU=
109+
golang.org/x/exp v0.0.0-20250911091902-df9299821621/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk=
110110
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
111111
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
112112
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
113113
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
114-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
115-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
114+
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
115+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
116116
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
117117
golang.org/x/sys v0.0.0-20211031064116-611d5d643895/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
118118
golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=

0 commit comments

Comments
 (0)