diff --git a/.golangci.yml b/.golangci.yml index 26d1f5ad57..16bec0de7f 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -33,16 +33,12 @@ linters: - linters: - errcheck path: _test.go - paths: - - third_party$ - - builtin$ - - examples$ formatters: enable: - goimports exclusions: generated: lax - paths: - - third_party$ - - builtin$ - - examples$ + settings: + goimports: + local-prefixes: + - github.com/prometheus/node_exporter diff --git a/Makefile.common b/Makefile.common index 6762d0f830..143bf03fbc 100644 --- a/Makefile.common +++ b/Makefile.common @@ -61,7 +61,7 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_ SKIP_GOLANGCI_LINT := GOLANGCI_LINT := GOLANGCI_LINT_OPTS ?= -GOLANGCI_LINT_VERSION ?= v2.4.0 +GOLANGCI_LINT_VERSION ?= v2.6.0 GOLANGCI_FMT_OPTS ?= # golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64. # windows isn't included here because of the path separator being different. diff --git a/collector/arp_linux.go b/collector/arp_linux.go index e1ba52c8c2..c3d4715163 100644 --- a/collector/arp_linux.go +++ b/collector/arp_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noarp -// +build !noarp package collector diff --git a/collector/bcache_linux.go b/collector/bcache_linux.go index 97064e2197..90366cc32a 100644 --- a/collector/bcache_linux.go +++ b/collector/bcache_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nobcache -// +build !nobcache package collector diff --git a/collector/bonding_linux.go b/collector/bonding_linux.go index 4e30cac573..a1e0a98735 100644 --- a/collector/bonding_linux.go +++ b/collector/bonding_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nobonding -// +build !nobonding package collector diff --git a/collector/bonding_linux_test.go b/collector/bonding_linux_test.go index 98af73fad8..874819225c 100644 --- a/collector/bonding_linux_test.go +++ b/collector/bonding_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nobonding -// +build !nobonding package collector diff --git a/collector/boot_time_bsd.go b/collector/boot_time_bsd.go index 49b4145cff..fe1ddcac89 100644 --- a/collector/boot_time_bsd.go +++ b/collector/boot_time_bsd.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build (freebsd || dragonfly || openbsd || netbsd || darwin) && !noboottime -// +build freebsd dragonfly openbsd netbsd darwin -// +build !noboottime package collector diff --git a/collector/boot_time_solaris.go b/collector/boot_time_solaris.go index 4c336fb3c9..4b2ef4577c 100644 --- a/collector/boot_time_solaris.go +++ b/collector/boot_time_solaris.go @@ -12,14 +12,14 @@ // limitations under the License. //go:build !noboottime -// +build !noboottime package collector import ( + "log/slog" + "github.com/illumos/go-kstat" "github.com/prometheus/client_golang/prometheus" - "log/slog" ) type bootTimeCollector struct { diff --git a/collector/btrfs_linux.go b/collector/btrfs_linux.go index acb7e64c85..bc6fb6048d 100644 --- a/collector/btrfs_linux.go +++ b/collector/btrfs_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nobtrfs -// +build !nobtrfs package collector diff --git a/collector/btrfs_linux_test.go b/collector/btrfs_linux_test.go index c2ed57e5de..7be7bc39bb 100644 --- a/collector/btrfs_linux_test.go +++ b/collector/btrfs_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nobtrfs -// +build !nobtrfs package collector diff --git a/collector/buddyinfo.go b/collector/buddyinfo.go index 62392b9624..e0b54fb36b 100644 --- a/collector/buddyinfo.go +++ b/collector/buddyinfo.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nobuddyinfo && !netbsd -// +build !nobuddyinfo,!netbsd package collector diff --git a/collector/cgroups_linux.go b/collector/cgroups_linux.go index 2a4e288e18..f8da892ee4 100644 --- a/collector/cgroups_linux.go +++ b/collector/cgroups_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nostat -// +build !nostat package collector diff --git a/collector/conntrack_linux.go b/collector/conntrack_linux.go index 309857c767..376ab05af5 100644 --- a/collector/conntrack_linux.go +++ b/collector/conntrack_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noconntrack -// +build !noconntrack package collector diff --git a/collector/cpu_aix.go b/collector/cpu_aix.go index 017e1a0c22..1368f1b368 100644 --- a/collector/cpu_aix.go +++ b/collector/cpu_aix.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpu_common.go b/collector/cpu_common.go index 6f644516bf..cb34facbfa 100644 --- a/collector/cpu_common.go +++ b/collector/cpu_common.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpu_darwin.go b/collector/cpu_darwin.go index 31b11702b0..e4e312aeb3 100644 --- a/collector/cpu_darwin.go +++ b/collector/cpu_darwin.go @@ -15,7 +15,6 @@ // BSD. See https://github.com/shirou/gopsutil/blob/master/LICENSE for details. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpu_dragonfly.go b/collector/cpu_dragonfly.go index c53aaef00a..3571f436d5 100644 --- a/collector/cpu_dragonfly.go +++ b/collector/cpu_dragonfly.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpu_dragonfly_test.go b/collector/cpu_dragonfly_test.go index 31f55c2ea0..c5d006fa9e 100644 --- a/collector/cpu_dragonfly_test.go +++ b/collector/cpu_dragonfly_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpu_freebsd.go b/collector/cpu_freebsd.go index 39b0118567..6532029ec1 100644 --- a/collector/cpu_freebsd.go +++ b/collector/cpu_freebsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpu_linux.go b/collector/cpu_linux.go index 31618f117b..1fef28908e 100644 --- a/collector/cpu_linux.go +++ b/collector/cpu_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpu_linux_test.go b/collector/cpu_linux_test.go index 158ae8ff40..6d4bc4506d 100644 --- a/collector/cpu_linux_test.go +++ b/collector/cpu_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpu_netbsd.go b/collector/cpu_netbsd.go index 459365d60f..49051a6efd 100644 --- a/collector/cpu_netbsd.go +++ b/collector/cpu_netbsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpu_netbsd_test.go b/collector/cpu_netbsd_test.go index 08498d52bf..4a872bffa9 100644 --- a/collector/cpu_netbsd_test.go +++ b/collector/cpu_netbsd_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpu_openbsd.go b/collector/cpu_openbsd.go index 2d59f5476c..2c8ce9a81f 100644 --- a/collector/cpu_openbsd.go +++ b/collector/cpu_openbsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpu_solaris.go b/collector/cpu_solaris.go index 550ba37462..471d29f03c 100644 --- a/collector/cpu_solaris.go +++ b/collector/cpu_solaris.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpufreq_common.go b/collector/cpufreq_common.go index e1eda58947..4cd17808f8 100644 --- a/collector/cpufreq_common.go +++ b/collector/cpufreq_common.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpufreq_linux.go b/collector/cpufreq_linux.go index dbeaa49147..725e64e015 100644 --- a/collector/cpufreq_linux.go +++ b/collector/cpufreq_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/cpufreq_solaris.go b/collector/cpufreq_solaris.go index c13703e14f..41826a999c 100644 --- a/collector/cpufreq_solaris.go +++ b/collector/cpufreq_solaris.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nocpu -// +build !nocpu package collector diff --git a/collector/devstat_dragonfly.go b/collector/devstat_dragonfly.go index b1796860fa..28cc522831 100644 --- a/collector/devstat_dragonfly.go +++ b/collector/devstat_dragonfly.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nodevstat -// +build !nodevstat package collector diff --git a/collector/devstat_freebsd.go b/collector/devstat_freebsd.go index a9d4272003..0c8a11c9a0 100644 --- a/collector/devstat_freebsd.go +++ b/collector/devstat_freebsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nodevstat -// +build !nodevstat package collector diff --git a/collector/diskstats_aix.go b/collector/diskstats_aix.go index 4ad39ff38d..f77eef06bd 100644 --- a/collector/diskstats_aix.go +++ b/collector/diskstats_aix.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nodiskstats -// +build !nodiskstats package collector diff --git a/collector/diskstats_common.go b/collector/diskstats_common.go index 593d055847..c930ca48d0 100644 --- a/collector/diskstats_common.go +++ b/collector/diskstats_common.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build !nodiskstats && (openbsd || linux || darwin || aix) -// +build !nodiskstats -// +build openbsd linux darwin aix package collector diff --git a/collector/diskstats_darwin.go b/collector/diskstats_darwin.go index 98052fe7db..abcf854083 100644 --- a/collector/diskstats_darwin.go +++ b/collector/diskstats_darwin.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nodiskstats -// +build !nodiskstats package collector diff --git a/collector/diskstats_linux.go b/collector/diskstats_linux.go index 534be69a33..daca55d968 100644 --- a/collector/diskstats_linux.go +++ b/collector/diskstats_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nodiskstats -// +build !nodiskstats package collector diff --git a/collector/diskstats_linux_test.go b/collector/diskstats_linux_test.go index a1c53ccde8..08a5024c8a 100644 --- a/collector/diskstats_linux_test.go +++ b/collector/diskstats_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nodiskstats -// +build !nodiskstats package collector diff --git a/collector/diskstats_openbsd.go b/collector/diskstats_openbsd.go index 49415c17f4..c642a7bf6f 100644 --- a/collector/diskstats_openbsd.go +++ b/collector/diskstats_openbsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nodiskstats && !amd64 -// +build !nodiskstats,!amd64 package collector diff --git a/collector/diskstats_openbsd_amd64.go b/collector/diskstats_openbsd_amd64.go index b290d88920..bbb9e8b933 100644 --- a/collector/diskstats_openbsd_amd64.go +++ b/collector/diskstats_openbsd_amd64.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nodiskstats -// +build !nodiskstats package collector diff --git a/collector/dmi.go b/collector/dmi.go index 2282d7bd00..575c331950 100644 --- a/collector/dmi.go +++ b/collector/dmi.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build linux && !nodmi -// +build linux,!nodmi package collector diff --git a/collector/drbd_linux.go b/collector/drbd_linux.go index cbaf816193..f3102700c9 100644 --- a/collector/drbd_linux.go +++ b/collector/drbd_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nodrbd -// +build !nodrbd package collector diff --git a/collector/drm_linux.go b/collector/drm_linux.go index 61bb59ac77..80356ee84c 100644 --- a/collector/drm_linux.go +++ b/collector/drm_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nogpu -// +build !nogpu package collector diff --git a/collector/edac_linux.go b/collector/edac_linux.go index c14c96c36e..d3a2a07a83 100644 --- a/collector/edac_linux.go +++ b/collector/edac_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noedac -// +build !noedac package collector diff --git a/collector/entropy_linux.go b/collector/entropy_linux.go index 6da61125c6..1373bf3648 100644 --- a/collector/entropy_linux.go +++ b/collector/entropy_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noentropy -// +build !noentropy package collector diff --git a/collector/ethtool_linux.go b/collector/ethtool_linux.go index d9f66469cd..e4d86bcd8c 100644 --- a/collector/ethtool_linux.go +++ b/collector/ethtool_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noethtool -// +build !noethtool // The hard work of collecting data from the kernel via the ethtool interfaces is done by // https://github.com/safchain/ethtool/ diff --git a/collector/ethtool_linux_test.go b/collector/ethtool_linux_test.go index 3cd0080955..84cca88897 100644 --- a/collector/ethtool_linux_test.go +++ b/collector/ethtool_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noethtool -// +build !noethtool package collector diff --git a/collector/exec_bsd.go b/collector/exec_bsd.go index 07de879ee0..d3e5f70f25 100644 --- a/collector/exec_bsd.go +++ b/collector/exec_bsd.go @@ -12,14 +12,13 @@ // limitations under the License. //go:build (freebsd || dragonfly) && !noexec -// +build freebsd dragonfly -// +build !noexec package collector import ( - "github.com/prometheus/client_golang/prometheus" "log/slog" + + "github.com/prometheus/client_golang/prometheus" ) type execCollector struct { diff --git a/collector/fibrechannel_linux.go b/collector/fibrechannel_linux.go index cb8be9db1d..a0528d168a 100644 --- a/collector/fibrechannel_linux.go +++ b/collector/fibrechannel_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nofibrechannel -// +build !nofibrechannel package collector @@ -22,8 +21,9 @@ import ( "os" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/node_exporter/collector/utils" "github.com/prometheus/procfs/sysfs" + + "github.com/prometheus/node_exporter/collector/utils" ) const maxUint64 = ^uint64(0) diff --git a/collector/filefd_linux.go b/collector/filefd_linux.go index 39a72fcd43..c24215c43c 100644 --- a/collector/filefd_linux.go +++ b/collector/filefd_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nofilefd -// +build !nofilefd package collector diff --git a/collector/filefd_linux_test.go b/collector/filefd_linux_test.go index f31a5c2c5e..b43c1ed29f 100644 --- a/collector/filefd_linux_test.go +++ b/collector/filefd_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nofilefd -// +build !nofilefd package collector diff --git a/collector/filesystem_aix.go b/collector/filesystem_aix.go index 84bb89131d..e4db6bce99 100644 --- a/collector/filesystem_aix.go +++ b/collector/filesystem_aix.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nofilesystem -// +build !nofilesystem package collector diff --git a/collector/filesystem_bsd.go b/collector/filesystem_bsd.go index 2810a5a3d5..79dde087c3 100644 --- a/collector/filesystem_bsd.go +++ b/collector/filesystem_bsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build dragonfly && !nofilesystem -// +build dragonfly,!nofilesystem package collector diff --git a/collector/filesystem_common.go b/collector/filesystem_common.go index 1e61e8e705..efcd26a0f9 100644 --- a/collector/filesystem_common.go +++ b/collector/filesystem_common.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build !nofilesystem && (linux || freebsd || netbsd || openbsd || darwin || dragonfly || aix) -// +build !nofilesystem -// +build linux freebsd netbsd openbsd darwin dragonfly aix package collector diff --git a/collector/filesystem_freebsd.go b/collector/filesystem_freebsd.go index 502ae0a850..cbc99d9f02 100644 --- a/collector/filesystem_freebsd.go +++ b/collector/filesystem_freebsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nofilesystem -// +build !nofilesystem package collector diff --git a/collector/filesystem_linux.go b/collector/filesystem_linux.go index c3e6370b2d..3739f0fee8 100644 --- a/collector/filesystem_linux.go +++ b/collector/filesystem_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nofilesystem -// +build !nofilesystem package collector diff --git a/collector/filesystem_linux_test.go b/collector/filesystem_linux_test.go index 58b4dc6ba1..a838e93271 100644 --- a/collector/filesystem_linux_test.go +++ b/collector/filesystem_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nofilesystem -// +build !nofilesystem package collector diff --git a/collector/filesystem_macos.go b/collector/filesystem_macos.go index ff06e8c6e5..be0a49062f 100644 --- a/collector/filesystem_macos.go +++ b/collector/filesystem_macos.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build darwin && !nofilesystem -// +build darwin,!nofilesystem package collector diff --git a/collector/filesystem_netbsd.go b/collector/filesystem_netbsd.go index c7395893a7..21f73abba1 100644 --- a/collector/filesystem_netbsd.go +++ b/collector/filesystem_netbsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nofilesystem -// +build !nofilesystem package collector diff --git a/collector/filesystem_openbsd.go b/collector/filesystem_openbsd.go index fa9f8eb871..3ca929d845 100644 --- a/collector/filesystem_openbsd.go +++ b/collector/filesystem_openbsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nofilesystem -// +build !nofilesystem package collector diff --git a/collector/hwmon_linux.go b/collector/hwmon_linux.go index 905a43361e..fe4ac817aa 100644 --- a/collector/hwmon_linux.go +++ b/collector/hwmon_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nohwmon -// +build !nohwmon package collector diff --git a/collector/infiniband_linux.go b/collector/infiniband_linux.go index 7b1c438157..fa7ed91a89 100644 --- a/collector/infiniband_linux.go +++ b/collector/infiniband_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noinfiniband -// +build !noinfiniband package collector diff --git a/collector/interrupts_common.go b/collector/interrupts_common.go index 80cd71719c..4e4bad6ff1 100644 --- a/collector/interrupts_common.go +++ b/collector/interrupts_common.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build (linux || openbsd) && !nointerrupts -// +build linux openbsd -// +build !nointerrupts package collector diff --git a/collector/interrupts_linux.go b/collector/interrupts_linux.go index 77caf423c0..d70b0e042f 100644 --- a/collector/interrupts_linux.go +++ b/collector/interrupts_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nointerrupts -// +build !nointerrupts package collector diff --git a/collector/interrupts_linux_test.go b/collector/interrupts_linux_test.go index 82e536e4e9..d920916524 100644 --- a/collector/interrupts_linux_test.go +++ b/collector/interrupts_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nointerrupts -// +build !nointerrupts package collector diff --git a/collector/interrupts_openbsd.go b/collector/interrupts_openbsd.go index 60fcbf1d74..b9ab0d906d 100644 --- a/collector/interrupts_openbsd.go +++ b/collector/interrupts_openbsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nointerrupts && !amd64 -// +build !nointerrupts,!amd64 package collector diff --git a/collector/interrupts_openbsd_amd64.go b/collector/interrupts_openbsd_amd64.go index f52a1b81c4..5f40449696 100644 --- a/collector/interrupts_openbsd_amd64.go +++ b/collector/interrupts_openbsd_amd64.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nointerrupts -// +build !nointerrupts package collector diff --git a/collector/ipvs_linux.go b/collector/ipvs_linux.go index 7d7bae54a6..2ad30e07e9 100644 --- a/collector/ipvs_linux.go +++ b/collector/ipvs_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noipvs -// +build !noipvs package collector diff --git a/collector/ipvs_linux_test.go b/collector/ipvs_linux_test.go index bc3e40f975..b6870d8052 100644 --- a/collector/ipvs_linux_test.go +++ b/collector/ipvs_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noipvs -// +build !noipvs package collector diff --git a/collector/ksmd_linux.go b/collector/ksmd_linux.go index d504fe300d..2a68f43f94 100644 --- a/collector/ksmd_linux.go +++ b/collector/ksmd_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noksmd -// +build !noksmd package collector diff --git a/collector/kvm_bsd.go b/collector/kvm_bsd.go index c4a4479aff..feee6cc833 100644 --- a/collector/kvm_bsd.go +++ b/collector/kvm_bsd.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build !nokvm && (freebsd || dragonfly) -// +build !nokvm -// +build freebsd dragonfly package collector diff --git a/collector/lnstat_linux.go b/collector/lnstat_linux.go index 43bd7e0590..232e5ce4e1 100644 --- a/collector/lnstat_linux.go +++ b/collector/lnstat_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nolnstat -// +build !nolnstat package collector diff --git a/collector/loadavg.go b/collector/loadavg.go index 09b1df3a4b..48c271d9f5 100644 --- a/collector/loadavg.go +++ b/collector/loadavg.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build (darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || aix) && !noloadavg -// +build darwin dragonfly freebsd linux netbsd openbsd solaris aix -// +build !noloadavg package collector diff --git a/collector/loadavg_aix.go b/collector/loadavg_aix.go index 0f3db0d94f..8736dca846 100644 --- a/collector/loadavg_aix.go +++ b/collector/loadavg_aix.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noloadavg -// +build !noloadavg package collector diff --git a/collector/loadavg_bsd.go b/collector/loadavg_bsd.go index a1f5ae6643..23ab24a9e8 100644 --- a/collector/loadavg_bsd.go +++ b/collector/loadavg_bsd.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build (darwin || dragonfly || freebsd || netbsd || openbsd) && !noloadavg -// +build darwin dragonfly freebsd netbsd openbsd -// +build !noloadavg package collector diff --git a/collector/loadavg_linux.go b/collector/loadavg_linux.go index aab11b1851..f0d6c6e727 100644 --- a/collector/loadavg_linux.go +++ b/collector/loadavg_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noloadavg -// +build !noloadavg package collector diff --git a/collector/loadavg_linux_test.go b/collector/loadavg_linux_test.go index 2d56317dc5..271cc6b42f 100644 --- a/collector/loadavg_linux_test.go +++ b/collector/loadavg_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noloadavg -// +build !noloadavg package collector diff --git a/collector/loadavg_solaris.go b/collector/loadavg_solaris.go index 316233fa98..31b1105ef1 100644 --- a/collector/loadavg_solaris.go +++ b/collector/loadavg_solaris.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noloadavg -// +build !noloadavg package collector diff --git a/collector/logind_linux.go b/collector/logind_linux.go index 140a7b93cb..bd2c04848d 100644 --- a/collector/logind_linux.go +++ b/collector/logind_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nologind -// +build !nologind package collector diff --git a/collector/logind_linux_test.go b/collector/logind_linux_test.go index 5cfedff4db..b2592a74e0 100644 --- a/collector/logind_linux_test.go +++ b/collector/logind_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nologind -// +build !nologind package collector diff --git a/collector/mdadm_linux.go b/collector/mdadm_linux.go index 5f76db23f1..14dc20887c 100644 --- a/collector/mdadm_linux.go +++ b/collector/mdadm_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nomdadm -// +build !nomdadm package collector diff --git a/collector/mdadm_linux_test.go b/collector/mdadm_linux_test.go index f125d533b1..6aa216232e 100644 --- a/collector/mdadm_linux_test.go +++ b/collector/mdadm_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nomdadm -// +build !nomdadm package collector diff --git a/collector/meminfo.go b/collector/meminfo.go index 4eab27b155..cc69fe742f 100644 --- a/collector/meminfo.go +++ b/collector/meminfo.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build (darwin || linux || openbsd || netbsd || aix) && !nomeminfo -// +build darwin linux openbsd netbsd aix -// +build !nomeminfo package collector diff --git a/collector/meminfo_aix.go b/collector/meminfo_aix.go index f90b1fd827..52e84a1e23 100644 --- a/collector/meminfo_aix.go +++ b/collector/meminfo_aix.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nomeminfo -// +build !nomeminfo package collector diff --git a/collector/meminfo_darwin.go b/collector/meminfo_darwin.go index 26a6a1ac2d..947857f944 100644 --- a/collector/meminfo_darwin.go +++ b/collector/meminfo_darwin.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nomeminfo -// +build !nomeminfo package collector diff --git a/collector/meminfo_linux.go b/collector/meminfo_linux.go index 872689ddf2..88c18d76d3 100644 --- a/collector/meminfo_linux.go +++ b/collector/meminfo_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nomeminfo -// +build !nomeminfo package collector diff --git a/collector/meminfo_linux_test.go b/collector/meminfo_linux_test.go index 41a0133fe5..2ad7d50541 100644 --- a/collector/meminfo_linux_test.go +++ b/collector/meminfo_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nomeminfo -// +build !nomeminfo package collector diff --git a/collector/meminfo_netbsd.go b/collector/meminfo_netbsd.go index 54d23a128e..549cd6a55d 100644 --- a/collector/meminfo_netbsd.go +++ b/collector/meminfo_netbsd.go @@ -12,13 +12,13 @@ // limitations under the License. //go:build !nomeminfo -// +build !nomeminfo package collector import ( - "golang.org/x/sys/unix" "log/slog" + + "golang.org/x/sys/unix" ) type meminfoCollector struct { diff --git a/collector/meminfo_numa_linux.go b/collector/meminfo_numa_linux.go index fc26eba499..cd494928a3 100644 --- a/collector/meminfo_numa_linux.go +++ b/collector/meminfo_numa_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nomeminfo_numa -// +build !nomeminfo_numa package collector diff --git a/collector/meminfo_numa_linux_test.go b/collector/meminfo_numa_linux_test.go index 33bc362e39..1d251fcf9f 100644 --- a/collector/meminfo_numa_linux_test.go +++ b/collector/meminfo_numa_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nomeminfo_numa -// +build !nomeminfo_numa package collector diff --git a/collector/meminfo_openbsd.go b/collector/meminfo_openbsd.go index ca9f46ad8e..250905105a 100644 --- a/collector/meminfo_openbsd.go +++ b/collector/meminfo_openbsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nomeminfo && !amd64 -// +build !nomeminfo,!amd64 package collector diff --git a/collector/meminfo_openbsd_amd64.go b/collector/meminfo_openbsd_amd64.go index 906a36e41f..729507263f 100644 --- a/collector/meminfo_openbsd_amd64.go +++ b/collector/meminfo_openbsd_amd64.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nomeminfo -// +build !nomeminfo package collector diff --git a/collector/memory_bsd.go b/collector/memory_bsd.go index 1c3710523d..5bec6155d0 100644 --- a/collector/memory_bsd.go +++ b/collector/memory_bsd.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build (freebsd || dragonfly) && !nomeminfo -// +build freebsd dragonfly -// +build !nomeminfo package collector diff --git a/collector/mountstats_linux.go b/collector/mountstats_linux.go index 03f1a9b676..319b89149c 100644 --- a/collector/mountstats_linux.go +++ b/collector/mountstats_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nomountstats -// +build !nomountstats package collector diff --git a/collector/netclass_linux.go b/collector/netclass_linux.go index 87763c3b6e..7f8373dfb3 100644 --- a/collector/netclass_linux.go +++ b/collector/netclass_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetclass && linux -// +build !nonetclass,linux package collector diff --git a/collector/netclass_rtnl_linux.go b/collector/netclass_rtnl_linux.go index 44d89f8f05..6df34756a0 100644 --- a/collector/netclass_rtnl_linux.go +++ b/collector/netclass_rtnl_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetclass && linux -// +build !nonetclass,linux package collector diff --git a/collector/netdev_aix.go b/collector/netdev_aix.go index e29371b100..6c48600f33 100644 --- a/collector/netdev_aix.go +++ b/collector/netdev_aix.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetdev -// +build !nonetdev package collector diff --git a/collector/netdev_bsd.go b/collector/netdev_bsd.go index e1a947e7c2..7ec6ad576b 100644 --- a/collector/netdev_bsd.go +++ b/collector/netdev_bsd.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build !nonetdev && (freebsd || dragonfly) -// +build !nonetdev -// +build freebsd dragonfly package collector diff --git a/collector/netdev_common.go b/collector/netdev_common.go index c19e5df578..091f3464db 100644 --- a/collector/netdev_common.go +++ b/collector/netdev_common.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build !nonetdev && (linux || freebsd || openbsd || dragonfly || darwin || aix) -// +build !nonetdev -// +build linux freebsd openbsd dragonfly darwin aix package collector diff --git a/collector/netdev_darwin.go b/collector/netdev_darwin.go index 4283559441..7b70a0d09e 100644 --- a/collector/netdev_darwin.go +++ b/collector/netdev_darwin.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetdev -// +build !nonetdev package collector diff --git a/collector/netdev_linux.go b/collector/netdev_linux.go index 58ac4af578..8f694c2c97 100644 --- a/collector/netdev_linux.go +++ b/collector/netdev_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetdev -// +build !nonetdev package collector diff --git a/collector/netdev_linux_test.go b/collector/netdev_linux_test.go index 06700fd8ed..3f0515b3f5 100644 --- a/collector/netdev_linux_test.go +++ b/collector/netdev_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetdev -// +build !nonetdev package collector diff --git a/collector/netdev_openbsd.go b/collector/netdev_openbsd.go index 31c2640bb6..85df680182 100644 --- a/collector/netdev_openbsd.go +++ b/collector/netdev_openbsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetdev && !amd64 -// +build !nonetdev,!amd64 package collector diff --git a/collector/netdev_openbsd_amd64.go b/collector/netdev_openbsd_amd64.go index e98571648e..62b706d047 100644 --- a/collector/netdev_openbsd_amd64.go +++ b/collector/netdev_openbsd_amd64.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetdev -// +build !nonetdev package collector diff --git a/collector/netinterface_aix.go b/collector/netinterface_aix.go index 9a5b766828..913963e74f 100644 --- a/collector/netinterface_aix.go +++ b/collector/netinterface_aix.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetinterface -// +build !nonetinterface package collector diff --git a/collector/netisr_freebsd.go b/collector/netisr_freebsd.go index b3a4451c5c..608adbbf9e 100644 --- a/collector/netisr_freebsd.go +++ b/collector/netisr_freebsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetisr -// +build !nonetisr package collector diff --git a/collector/netstat_freebsd.go b/collector/netstat_freebsd.go index 3c34d8b33c..3688abca86 100644 --- a/collector/netstat_freebsd.go +++ b/collector/netstat_freebsd.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build freebsd -// +build freebsd package collector diff --git a/collector/netstat_freebsd_test.go b/collector/netstat_freebsd_test.go index 3b3f852335..2b3e05759e 100644 --- a/collector/netstat_freebsd_test.go +++ b/collector/netstat_freebsd_test.go @@ -12,15 +12,15 @@ // limitations under the License. //go:build freebsd -// +build freebsd package collector import ( - "github.com/prometheus/client_golang/prometheus" - "golang.org/x/sys/unix" "testing" "unsafe" + + "github.com/prometheus/client_golang/prometheus" + "golang.org/x/sys/unix" ) func TestNetStatCollectorDescribe(t *testing.T) { diff --git a/collector/netstat_linux.go b/collector/netstat_linux.go index c59183d787..5065a19af3 100644 --- a/collector/netstat_linux.go +++ b/collector/netstat_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetstat -// +build !nonetstat package collector diff --git a/collector/netstat_linux_test.go b/collector/netstat_linux_test.go index ec430bc3e3..a30f44a2c9 100644 --- a/collector/netstat_linux_test.go +++ b/collector/netstat_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetstat -// +build !nonetstat package collector diff --git a/collector/network_route_linux.go b/collector/network_route_linux.go index 5a5c34d29d..d290b202d3 100644 --- a/collector/network_route_linux.go +++ b/collector/network_route_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonetworkroute -// +build !nonetworkroute package collector diff --git a/collector/nfs_linux.go b/collector/nfs_linux.go index ea2a1b5259..7815dd0687 100644 --- a/collector/nfs_linux.go +++ b/collector/nfs_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonfs -// +build !nonfs package collector diff --git a/collector/nfsd_linux.go b/collector/nfsd_linux.go index 7f1bc24072..866be828f7 100644 --- a/collector/nfsd_linux.go +++ b/collector/nfsd_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonfsd -// +build !nonfsd package collector diff --git a/collector/ntp.go b/collector/ntp.go index 406920e359..e1465f5421 100644 --- a/collector/ntp.go +++ b/collector/ntp.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nontp -// +build !nontp package collector diff --git a/collector/nvme_linux.go b/collector/nvme_linux.go index d1a9a87b55..6de1b9368f 100644 --- a/collector/nvme_linux.go +++ b/collector/nvme_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nonvme -// +build !nonvme package collector diff --git a/collector/os_release.go b/collector/os_release.go index e589c4ff9e..6acf9bed02 100644 --- a/collector/os_release.go +++ b/collector/os_release.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noosrelease && !aix -// +build !noosrelease,!aix package collector diff --git a/collector/partition_aix.go b/collector/partition_aix.go index 3c54e0f41e..a6d9494148 100644 --- a/collector/partition_aix.go +++ b/collector/partition_aix.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nopartition -// +build !nopartition package collector diff --git a/collector/pcidevice_linux.go b/collector/pcidevice_linux.go index 21047a40f1..6f33db938f 100644 --- a/collector/pcidevice_linux.go +++ b/collector/pcidevice_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nopcidevice -// +build !nopcidevice package collector diff --git a/collector/pcidevice_linux_test.go b/collector/pcidevice_linux_test.go index 097cc391f5..aedc7c5f01 100644 --- a/collector/pcidevice_linux_test.go +++ b/collector/pcidevice_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nopcidevice -// +build !nopcidevice package collector diff --git a/collector/perf_linux.go b/collector/perf_linux.go index 2fc1676d5c..8b68205a6e 100644 --- a/collector/perf_linux.go +++ b/collector/perf_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noperf -// +build !noperf package collector diff --git a/collector/perf_linux_test.go b/collector/perf_linux_test.go index 1d39e8a95d..3176e7d2fb 100644 --- a/collector/perf_linux_test.go +++ b/collector/perf_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noperf -// +build !noperf package collector diff --git a/collector/powersupplyclass.go b/collector/powersupplyclass.go index a5e648c098..33142617f3 100644 --- a/collector/powersupplyclass.go +++ b/collector/powersupplyclass.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build !nopowersupplyclass && (linux || darwin) -// +build !nopowersupplyclass -// +build linux darwin package collector diff --git a/collector/powersupplyclass_darwin.go b/collector/powersupplyclass_darwin.go index 01d7f184f7..be3d778ce5 100644 --- a/collector/powersupplyclass_darwin.go +++ b/collector/powersupplyclass_darwin.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nopowersupplyclass -// +build !nopowersupplyclass package collector diff --git a/collector/powersupplyclass_linux.go b/collector/powersupplyclass_linux.go index 86e81fb6a2..b4fbf3510a 100644 --- a/collector/powersupplyclass_linux.go +++ b/collector/powersupplyclass_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nopowersupplyclass -// +build !nopowersupplyclass package collector diff --git a/collector/pressure_linux.go b/collector/pressure_linux.go index 63b32d2a2a..659c4b3768 100644 --- a/collector/pressure_linux.go +++ b/collector/pressure_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nopressure -// +build !nopressure package collector diff --git a/collector/processes_linux.go b/collector/processes_linux.go index add7f0dfa7..eff5cf06b5 100644 --- a/collector/processes_linux.go +++ b/collector/processes_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noprocesses -// +build !noprocesses package collector diff --git a/collector/processes_linux_test.go b/collector/processes_linux_test.go index f89ad12f2f..4b20ef8d63 100644 --- a/collector/processes_linux_test.go +++ b/collector/processes_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noprocesses -// +build !noprocesses package collector diff --git a/collector/qdisc_linux.go b/collector/qdisc_linux.go index 93a78e3b19..9062da122c 100644 --- a/collector/qdisc_linux.go +++ b/collector/qdisc_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noqdisc -// +build !noqdisc package collector diff --git a/collector/rapl_linux.go b/collector/rapl_linux.go index 25d78f295c..92c402d539 100644 --- a/collector/rapl_linux.go +++ b/collector/rapl_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !norapl -// +build !norapl package collector diff --git a/collector/runit.go b/collector/runit.go index 2813bfd0f3..9fabd3ffc5 100644 --- a/collector/runit.go +++ b/collector/runit.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !norunit -// +build !norunit package collector diff --git a/collector/schedstat_linux.go b/collector/schedstat_linux.go index 59b2bd8e1e..14882bdab8 100644 --- a/collector/schedstat_linux.go +++ b/collector/schedstat_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noshedstat -// +build !noshedstat package collector diff --git a/collector/selinux_linux.go b/collector/selinux_linux.go index f10b43fa54..b0e7fac6e6 100644 --- a/collector/selinux_linux.go +++ b/collector/selinux_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noselinux -// +build !noselinux package collector diff --git a/collector/slabinfo_linux.go b/collector/slabinfo_linux.go index aa871548f0..48bbf2abfe 100644 --- a/collector/slabinfo_linux.go +++ b/collector/slabinfo_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noslabinfo -// +build !noslabinfo package collector diff --git a/collector/sockstat_linux.go b/collector/sockstat_linux.go index 73a3bf6836..0ec782bcd1 100644 --- a/collector/sockstat_linux.go +++ b/collector/sockstat_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nosockstat -// +build !nosockstat package collector diff --git a/collector/softirqs_common.go b/collector/softirqs_common.go index 73a9f7be82..2022a4b5b7 100644 --- a/collector/softirqs_common.go +++ b/collector/softirqs_common.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build linux && !nosoftirqs -// +build linux,!nosoftirqs package collector diff --git a/collector/softirqs_linux.go b/collector/softirqs_linux.go index 702f34bb0c..0c64751049 100644 --- a/collector/softirqs_linux.go +++ b/collector/softirqs_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nosoftirqs -// +build !nosoftirqs package collector diff --git a/collector/softnet_linux.go b/collector/softnet_linux.go index 296e587587..2644bbf9a4 100644 --- a/collector/softnet_linux.go +++ b/collector/softnet_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nosoftnet -// +build !nosoftnet package collector diff --git a/collector/stat_linux.go b/collector/stat_linux.go index 0b99cc3236..199390620e 100644 --- a/collector/stat_linux.go +++ b/collector/stat_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nostat -// +build !nostat package collector diff --git a/collector/supervisord.go b/collector/supervisord.go index ae5e2297a0..b3c4c3f68f 100644 --- a/collector/supervisord.go +++ b/collector/supervisord.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nosupervisord -// +build !nosupervisord package collector diff --git a/collector/swap_linux_test.go b/collector/swap_linux_test.go index bd9e44ebc3..f4e49c5050 100644 --- a/collector/swap_linux_test.go +++ b/collector/swap_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noswap -// +build !noswap package collector diff --git a/collector/sysctl_bsd.go b/collector/sysctl_bsd.go index 2ab248ed2e..e3c8dc5cf4 100644 --- a/collector/sysctl_bsd.go +++ b/collector/sysctl_bsd.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build (freebsd || dragonfly || openbsd || netbsd || darwin) && cgo -// +build freebsd dragonfly openbsd netbsd darwin -// +build cgo package collector diff --git a/collector/sysctl_openbsd_amd64.go b/collector/sysctl_openbsd_amd64.go index 3d8051094c..2b2988934e 100644 --- a/collector/sysctl_openbsd_amd64.go +++ b/collector/sysctl_openbsd_amd64.go @@ -14,9 +14,10 @@ package collector import ( - "golang.org/x/sys/unix" "syscall" "unsafe" + + "golang.org/x/sys/unix" ) func int8ToString(a []int8) string { diff --git a/collector/systemd_linux.go b/collector/systemd_linux.go index b8378ee33b..51b82c0186 100644 --- a/collector/systemd_linux.go +++ b/collector/systemd_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nosystemd -// +build !nosystemd package collector diff --git a/collector/systemd_linux_test.go b/collector/systemd_linux_test.go index f12b6ef896..98668ed6be 100644 --- a/collector/systemd_linux_test.go +++ b/collector/systemd_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nosystemd -// +build !nosystemd package collector diff --git a/collector/tapestats_linux.go b/collector/tapestats_linux.go index c74c11d04c..e195ce1c51 100644 --- a/collector/tapestats_linux.go +++ b/collector/tapestats_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !notapestats -// +build !notapestats package collector diff --git a/collector/tcpstat_linux.go b/collector/tcpstat_linux.go index 476a9b47bf..555e46e91f 100644 --- a/collector/tcpstat_linux.go +++ b/collector/tcpstat_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !notcpstat -// +build !notcpstat package collector diff --git a/collector/tcpstat_linux_test.go b/collector/tcpstat_linux_test.go index 5f3c4aad82..8a56af9ccd 100644 --- a/collector/tcpstat_linux_test.go +++ b/collector/tcpstat_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !notcpstat -// +build !notcpstat package collector diff --git a/collector/textfile.go b/collector/textfile.go index c61a6a62ea..17e4a60de2 100644 --- a/collector/textfile.go +++ b/collector/textfile.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !notextfile -// +build !notextfile package collector diff --git a/collector/textfile_test.go b/collector/textfile_test.go index ece70b3a12..2fb31faca1 100644 --- a/collector/textfile_test.go +++ b/collector/textfile_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !notextfile -// +build !notextfile package collector diff --git a/collector/thermal_darwin.go b/collector/thermal_darwin.go index 9a74fdbdd8..b51f1822ca 100644 --- a/collector/thermal_darwin.go +++ b/collector/thermal_darwin.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !notherm -// +build !notherm package collector diff --git a/collector/thermal_zone_linux.go b/collector/thermal_zone_linux.go index 95db272340..a50278e998 100644 --- a/collector/thermal_zone_linux.go +++ b/collector/thermal_zone_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nothermalzone -// +build !nothermalzone package collector diff --git a/collector/time.go b/collector/time.go index a4a81687b4..1851ba1a7e 100644 --- a/collector/time.go +++ b/collector/time.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !notime -// +build !notime package collector diff --git a/collector/time_linux.go b/collector/time_linux.go index 212ba2280a..afd7208e3e 100644 --- a/collector/time_linux.go +++ b/collector/time_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !notime -// +build !notime package collector diff --git a/collector/time_other.go b/collector/time_other.go index 8227435bd9..5658fe4810 100644 --- a/collector/time_other.go +++ b/collector/time_other.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !linux && !notime -// +build !linux,!notime package collector diff --git a/collector/timex.go b/collector/timex.go index eb21f7c370..6494726ef7 100644 --- a/collector/timex.go +++ b/collector/timex.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build linux && !notimex -// +build linux,!notimex package collector diff --git a/collector/udp_queues_linux.go b/collector/udp_queues_linux.go index 2923936e38..0ebd930098 100644 --- a/collector/udp_queues_linux.go +++ b/collector/udp_queues_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noudp_queues -// +build !noudp_queues package collector diff --git a/collector/uname.go b/collector/uname.go index 32ca08c406..737a5a8712 100644 --- a/collector/uname.go +++ b/collector/uname.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build (darwin || freebsd || openbsd || netbsd || linux || aix) && !nouname -// +build darwin freebsd openbsd netbsd linux aix -// +build !nouname package collector diff --git a/collector/uname_bsd.go b/collector/uname_bsd.go index fa565a1ccf..07f7aca063 100644 --- a/collector/uname_bsd.go +++ b/collector/uname_bsd.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build (darwin || freebsd || openbsd || netbsd || aix) && !nouname -// +build darwin freebsd openbsd netbsd aix -// +build !nouname package collector diff --git a/collector/uname_linux.go b/collector/uname_linux.go index 4f8bac33e3..d3c4b5aefb 100644 --- a/collector/uname_linux.go +++ b/collector/uname_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nouname -// +build !nouname package collector diff --git a/collector/vmstat_linux.go b/collector/vmstat_linux.go index e31be0f7b8..987aebe9eb 100644 --- a/collector/vmstat_linux.go +++ b/collector/vmstat_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !novmstat -// +build !novmstat package collector diff --git a/collector/watchdog.go b/collector/watchdog.go index 77fb792ea7..d3e041d5b8 100644 --- a/collector/watchdog.go +++ b/collector/watchdog.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build linux && !nowatchdog -// +build linux,!nowatchdog package collector diff --git a/collector/watchdog_test.go b/collector/watchdog_test.go index baf08995ce..4fbcff7d53 100644 --- a/collector/watchdog_test.go +++ b/collector/watchdog_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build linux && !nowatchdog -// +build linux,!nowatchdog package collector diff --git a/collector/wifi_linux.go b/collector/wifi_linux.go index 17c11d29fe..0d2a6b088b 100644 --- a/collector/wifi_linux.go +++ b/collector/wifi_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nowifi -// +build !nowifi package collector diff --git a/collector/xfrm.go b/collector/xfrm.go index d96ee8aa74..f69d362c32 100644 --- a/collector/xfrm.go +++ b/collector/xfrm.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noxfrm -// +build !noxfrm package collector diff --git a/collector/xfrm_test.go b/collector/xfrm_test.go index e009fc40f5..9598e113bf 100644 --- a/collector/xfrm_test.go +++ b/collector/xfrm_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noxfrm -// +build !noxfrm package collector diff --git a/collector/xfs_linux.go b/collector/xfs_linux.go index 3eac1d0e84..b5157849bc 100644 --- a/collector/xfs_linux.go +++ b/collector/xfs_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !noxfs -// +build !noxfs package collector diff --git a/collector/zfs_common.go b/collector/zfs_common.go index 7934ec5ad9..f939ae9933 100644 --- a/collector/zfs_common.go +++ b/collector/zfs_common.go @@ -12,8 +12,6 @@ // limitations under the License. //go:build !nozfs && (freebsd || linux || solaris) -// +build !nozfs -// +build freebsd linux solaris package collector diff --git a/collector/zfs_freebsd.go b/collector/zfs_freebsd.go index d888c3a724..9354c96d15 100644 --- a/collector/zfs_freebsd.go +++ b/collector/zfs_freebsd.go @@ -12,13 +12,13 @@ // limitations under the License. //go:build !nozfs -// +build !nozfs package collector import ( - "github.com/prometheus/client_golang/prometheus" "log/slog" + + "github.com/prometheus/client_golang/prometheus" ) type zfsCollector struct { diff --git a/collector/zfs_linux.go b/collector/zfs_linux.go index b714a18b9b..9e968f73fe 100644 --- a/collector/zfs_linux.go +++ b/collector/zfs_linux.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nozfs -// +build !nozfs package collector diff --git a/collector/zfs_linux_test.go b/collector/zfs_linux_test.go index 0b77a522bf..182a324083 100644 --- a/collector/zfs_linux_test.go +++ b/collector/zfs_linux_test.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nozfs -// +build !nozfs package collector diff --git a/collector/zfs_solaris.go b/collector/zfs_solaris.go index 1f10ee0199..0f858ad9b0 100644 --- a/collector/zfs_solaris.go +++ b/collector/zfs_solaris.go @@ -12,7 +12,6 @@ // limitations under the License. //go:build !nozfs -// +build !nozfs package collector diff --git a/node_exporter.go b/node_exporter.go index 22939cbc56..2c0e12ccc1 100644 --- a/node_exporter.go +++ b/node_exporter.go @@ -35,6 +35,7 @@ import ( "github.com/prometheus/common/version" "github.com/prometheus/exporter-toolkit/web" "github.com/prometheus/exporter-toolkit/web/kingpinflag" + "github.com/prometheus/node_exporter/collector" )