diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b7c74b0..d3fc1657 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ executors: # should also be updated. golang: docker: - - image: circleci/golang:1.16 + - image: circleci/golang:1.17 jobs: test: diff --git a/.promu-cgo.yml b/.promu-cgo.yml index 14a5f6d6..7179a566 100644 --- a/.promu-cgo.yml +++ b/.promu-cgo.yml @@ -1,7 +1,7 @@ go: # Whenever the Go version is updated here, .circle/config.yml and # .promu.yml should also be updated. - version: 1.16 + version: 1.17 cgo: true repository: path: github.com/prometheus/node_exporter diff --git a/.promu.yml b/.promu.yml index b643c156..373000dd 100644 --- a/.promu.yml +++ b/.promu.yml @@ -1,7 +1,7 @@ go: # Whenever the Go version is updated here, .circle/config.yml and # .promu-cgo.yml should also be updated. - version: 1.16 + version: 1.17 repository: path: github.com/prometheus/node_exporter build: diff --git a/collector/arp_linux.go b/collector/arp_linux.go index e2fccc18..99b8acfa 100644 --- a/collector/arp_linux.go +++ b/collector/arp_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noarp // +build !noarp package collector diff --git a/collector/bcache_linux.go b/collector/bcache_linux.go index 3f574475..63a22d03 100644 --- a/collector/bcache_linux.go +++ b/collector/bcache_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nobcache // +build !nobcache package collector diff --git a/collector/bonding_linux.go b/collector/bonding_linux.go index 782cf59d..4c62207c 100644 --- a/collector/bonding_linux.go +++ b/collector/bonding_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // 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 2b9caade..f6eea02d 100644 --- a/collector/boot_time_bsd.go +++ b/collector/boot_time_bsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build (freebsd || dragonfly || (openbsd && !amd64) || netbsd || darwin) && !noboottime // +build freebsd dragonfly openbsd,!amd64 netbsd darwin // +build !noboottime diff --git a/collector/boot_time_openbsd_amd64.go b/collector/boot_time_openbsd_amd64.go index 32e070e0..c8e9d65c 100644 --- a/collector/boot_time_openbsd_amd64.go +++ b/collector/boot_time_openbsd_amd64.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noboottime // +build !noboottime package collector diff --git a/collector/boot_time_solaris.go b/collector/boot_time_solaris.go index cc6f40c3..3d55e783 100644 --- a/collector/boot_time_solaris.go +++ b/collector/boot_time_solaris.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build solaris -// +build !noboottime +//go:build solaris && !noboottime +// +build solaris,!noboottime package collector diff --git a/collector/btrfs_linux.go b/collector/btrfs_linux.go index d546c548..01971c7c 100644 --- a/collector/btrfs_linux.go +++ b/collector/btrfs_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // 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 9db74196..7ce19aaf 100644 --- a/collector/btrfs_linux_test.go +++ b/collector/btrfs_linux_test.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nobtrfs // +build !nobtrfs package collector diff --git a/collector/buddyinfo.go b/collector/buddyinfo.go index 3536a98f..c3cc5e04 100644 --- a/collector/buddyinfo.go +++ b/collector/buddyinfo.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build !nobuddyinfo -// +build !netbsd +//go:build !nobuddyinfo && !netbsd +// +build !nobuddyinfo,!netbsd package collector diff --git a/collector/conntrack_linux.go b/collector/conntrack_linux.go index 32f46c0e..e4ea9549 100644 --- a/collector/conntrack_linux.go +++ b/collector/conntrack_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noconntrack // +build !noconntrack package collector diff --git a/collector/cpu_common.go b/collector/cpu_common.go index 1138c232..6f644516 100644 --- a/collector/cpu_common.go +++ b/collector/cpu_common.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nocpu // +build !nocpu package collector diff --git a/collector/cpu_darwin.go b/collector/cpu_darwin.go index d54c5b35..2a2b0062 100644 --- a/collector/cpu_darwin.go +++ b/collector/cpu_darwin.go @@ -14,6 +14,7 @@ // Based on gopsutil/cpu/cpu_darwin_cgo.go @ ae251eb which is licensed under // 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 929fe893..61cba1ee 100644 --- a/collector/cpu_dragonfly.go +++ b/collector/cpu_dragonfly.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // 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 4be0d5bb..31f55c2e 100644 --- a/collector/cpu_dragonfly_test.go +++ b/collector/cpu_dragonfly_test.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nocpu // +build !nocpu package collector diff --git a/collector/cpu_freebsd.go b/collector/cpu_freebsd.go index ea3630f0..96b0f033 100644 --- a/collector/cpu_freebsd.go +++ b/collector/cpu_freebsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nocpu // +build !nocpu package collector diff --git a/collector/cpu_linux.go b/collector/cpu_linux.go index 6918f116..2ddb9c4b 100644 --- a/collector/cpu_linux.go +++ b/collector/cpu_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // 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 f7b48313..93b493b2 100644 --- a/collector/cpu_linux_test.go +++ b/collector/cpu_linux_test.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nocpu // +build !nocpu package collector diff --git a/collector/cpu_openbsd.go b/collector/cpu_openbsd.go index 9f8858f0..f025c08f 100644 --- a/collector/cpu_openbsd.go +++ b/collector/cpu_openbsd.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build openbsd,!amd64 -// +build !nocpu +//go:build openbsd && !amd64 && !nocpu +// +build openbsd,!amd64,!nocpu package collector diff --git a/collector/cpu_openbsd_amd64.go b/collector/cpu_openbsd_amd64.go index 68f3366a..b07d2ca7 100644 --- a/collector/cpu_openbsd_amd64.go +++ b/collector/cpu_openbsd_amd64.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nocpu // +build !nocpu package collector diff --git a/collector/cpu_solaris.go b/collector/cpu_solaris.go index 842736fb..c28b4d6d 100644 --- a/collector/cpu_solaris.go +++ b/collector/cpu_solaris.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build solaris -// +build !nocpu +//go:build solaris && !nocpu +// +build solaris,!nocpu package collector diff --git a/collector/cpufreq_linux.go b/collector/cpufreq_linux.go index e387d95b..ce431cc0 100644 --- a/collector/cpufreq_linux.go +++ b/collector/cpufreq_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nocpu // +build !nocpu package collector diff --git a/collector/cpufreq_solaris.go b/collector/cpufreq_solaris.go index 38672d51..10883ce4 100644 --- a/collector/cpufreq_solaris.go +++ b/collector/cpufreq_solaris.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build solaris -// +build !nocpu +//go:build solaris && !nocpu +// +build solaris,!nocpu package collector diff --git a/collector/devstat_dragonfly.go b/collector/devstat_dragonfly.go index 9e0b305f..11678054 100644 --- a/collector/devstat_dragonfly.go +++ b/collector/devstat_dragonfly.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nodevstat // +build !nodevstat package collector diff --git a/collector/devstat_freebsd.go b/collector/devstat_freebsd.go index 454f84c0..20cdc276 100644 --- a/collector/devstat_freebsd.go +++ b/collector/devstat_freebsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nodevstat // +build !nodevstat package collector diff --git a/collector/diskstats_common.go b/collector/diskstats_common.go index 7efb399a..0f6bbe46 100644 --- a/collector/diskstats_common.go +++ b/collector/diskstats_common.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nodiskstats && (openbsd || linux || darwin) // +build !nodiskstats // +build openbsd linux darwin diff --git a/collector/diskstats_darwin.go b/collector/diskstats_darwin.go index 43466e12..350c44f1 100644 --- a/collector/diskstats_darwin.go +++ b/collector/diskstats_darwin.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nodiskstats // +build !nodiskstats package collector diff --git a/collector/diskstats_linux.go b/collector/diskstats_linux.go index 13d3b68c..b79d6bd3 100644 --- a/collector/diskstats_linux.go +++ b/collector/diskstats_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nodiskstats // +build !nodiskstats package collector diff --git a/collector/diskstats_openbsd.go b/collector/diskstats_openbsd.go index a168c1b5..dd4f0b03 100644 --- a/collector/diskstats_openbsd.go +++ b/collector/diskstats_openbsd.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build openbsd,!amd64 -// +build !nodiskstats +//go:build openbsd && !amd64 && !nodiskstats +// +build openbsd,!amd64,!nodiskstats package collector diff --git a/collector/diskstats_openbsd_amd64.go b/collector/diskstats_openbsd_amd64.go index c8c5849c..41265e23 100644 --- a/collector/diskstats_openbsd_amd64.go +++ b/collector/diskstats_openbsd_amd64.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nodiskstats // +build !nodiskstats package collector diff --git a/collector/drbd_linux.go b/collector/drbd_linux.go index dcb47c66..f192a24c 100644 --- a/collector/drbd_linux.go +++ b/collector/drbd_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nodrbd // +build !nodrbd package collector diff --git a/collector/edac_linux.go b/collector/edac_linux.go index b742266c..c7719b7a 100644 --- a/collector/edac_linux.go +++ b/collector/edac_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noedac // +build !noedac package collector diff --git a/collector/entropy_linux.go b/collector/entropy_linux.go index d9123463..909d2ff4 100644 --- a/collector/entropy_linux.go +++ b/collector/entropy_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noentropy // +build !noentropy package collector diff --git a/collector/ethtool_linux.go b/collector/ethtool_linux.go index bb8877df..1115c9af 100644 --- a/collector/ethtool_linux.go +++ b/collector/ethtool_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // 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 diff --git a/collector/exec_bsd.go b/collector/exec_bsd.go index 7d2237ce..87cb3cee 100644 --- a/collector/exec_bsd.go +++ b/collector/exec_bsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build (freebsd || dragonfly) && !noexec // +build freebsd dragonfly // +build !noexec diff --git a/collector/fibrechannel_linux.go b/collector/fibrechannel_linux.go index bc0577c2..940062e7 100644 --- a/collector/fibrechannel_linux.go +++ b/collector/fibrechannel_linux.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build linux -// +build !nofibrechannel +//go:build linux && !nofibrechannel +// +build linux,!nofibrechannel package collector diff --git a/collector/filefd_linux.go b/collector/filefd_linux.go index a9faaef8..2e7cd1bb 100644 --- a/collector/filefd_linux.go +++ b/collector/filefd_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nofilefd // +build !nofilefd package collector diff --git a/collector/filesystem_bsd.go b/collector/filesystem_bsd.go index b3d1de86..dc35c4f8 100644 --- a/collector/filesystem_bsd.go +++ b/collector/filesystem_bsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build ((openbsd && !amd64) || darwin || dragonfly) && !nofilesystem // +build openbsd,!amd64 darwin dragonfly // +build !nofilesystem diff --git a/collector/filesystem_common.go b/collector/filesystem_common.go index 1cf4a8f0..930ba246 100644 --- a/collector/filesystem_common.go +++ b/collector/filesystem_common.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nofilesystem && (linux || freebsd || openbsd || darwin || dragonfly) // +build !nofilesystem // +build linux freebsd openbsd darwin dragonfly diff --git a/collector/filesystem_freebsd.go b/collector/filesystem_freebsd.go index 01e86eb7..768eb797 100644 --- a/collector/filesystem_freebsd.go +++ b/collector/filesystem_freebsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nofilesystem // +build !nofilesystem package collector diff --git a/collector/filesystem_linux.go b/collector/filesystem_linux.go index 2d4e2c2b..af60d2e6 100644 --- a/collector/filesystem_linux.go +++ b/collector/filesystem_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nofilesystem // +build !nofilesystem package collector diff --git a/collector/filesystem_openbsd_amd64.go b/collector/filesystem_openbsd_amd64.go index 1f4f0882..448b3ef3 100644 --- a/collector/filesystem_openbsd_amd64.go +++ b/collector/filesystem_openbsd_amd64.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build openbsd -// +build !nofilesystem +//go:build openbsd && !nofilesystem +// +build openbsd,!nofilesystem package collector diff --git a/collector/hwmon_linux.go b/collector/hwmon_linux.go index 7bc039d2..3178b1cc 100644 --- a/collector/hwmon_linux.go +++ b/collector/hwmon_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nohwmon // +build !nohwmon package collector diff --git a/collector/infiniband_linux.go b/collector/infiniband_linux.go index a051962e..3afb7c45 100644 --- a/collector/infiniband_linux.go +++ b/collector/infiniband_linux.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build linux -// +build !noinfiniband +//go:build linux && !noinfiniband +// +build linux,!noinfiniband package collector diff --git a/collector/interrupts_common.go b/collector/interrupts_common.go index c465c221..eea703f9 100644 --- a/collector/interrupts_common.go +++ b/collector/interrupts_common.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build (linux || openbsd) && !nointerrupts // +build linux openbsd // +build !nointerrupts diff --git a/collector/interrupts_linux.go b/collector/interrupts_linux.go index 5fcbebc9..4d74c536 100644 --- a/collector/interrupts_linux.go +++ b/collector/interrupts_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nointerrupts // +build !nointerrupts package collector diff --git a/collector/interrupts_openbsd.go b/collector/interrupts_openbsd.go index 1f8d2cc1..ba734069 100644 --- a/collector/interrupts_openbsd.go +++ b/collector/interrupts_openbsd.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build openbsd,!amd64 -// +build !nointerrupts +//go:build openbsd && !amd64 && !nointerrupts +// +build openbsd,!amd64,!nointerrupts package collector diff --git a/collector/interrupts_openbsd_amd64.go b/collector/interrupts_openbsd_amd64.go index fa3155c6..ba1091c4 100644 --- a/collector/interrupts_openbsd_amd64.go +++ b/collector/interrupts_openbsd_amd64.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nointerrupts // +build !nointerrupts package collector diff --git a/collector/ipvs_linux.go b/collector/ipvs_linux.go index 44fac590..4a9c14b6 100644 --- a/collector/ipvs_linux.go +++ b/collector/ipvs_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noipvs // +build !noipvs package collector diff --git a/collector/ksmd_linux.go b/collector/ksmd_linux.go index 7bb2b9df..6d4142ae 100644 --- a/collector/ksmd_linux.go +++ b/collector/ksmd_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noksmd // +build !noksmd package collector diff --git a/collector/kvm_bsd.go b/collector/kvm_bsd.go index 87987363..c4a4479a 100644 --- a/collector/kvm_bsd.go +++ b/collector/kvm_bsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nokvm && (freebsd || dragonfly) // +build !nokvm // +build freebsd dragonfly diff --git a/collector/lnstat_linux.go b/collector/lnstat_linux.go index 81a06e65..e5e13bf0 100644 --- a/collector/lnstat_linux.go +++ b/collector/lnstat_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nolnstat // +build !nolnstat package collector diff --git a/collector/loadavg.go b/collector/loadavg.go index 4795abad..cb7b2cb1 100644 --- a/collector/loadavg.go +++ b/collector/loadavg.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build (darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris) && !noloadavg // +build darwin dragonfly freebsd linux netbsd openbsd solaris // +build !noloadavg diff --git a/collector/loadavg_bsd.go b/collector/loadavg_bsd.go index 38215aab..a1f5ae66 100644 --- a/collector/loadavg_bsd.go +++ b/collector/loadavg_bsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build (darwin || dragonfly || freebsd || netbsd || openbsd) && !noloadavg // +build darwin dragonfly freebsd netbsd openbsd // +build !noloadavg diff --git a/collector/loadavg_linux.go b/collector/loadavg_linux.go index 7b89668e..d118eaba 100644 --- a/collector/loadavg_linux.go +++ b/collector/loadavg_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noloadavg // +build !noloadavg package collector diff --git a/collector/loadavg_solaris.go b/collector/loadavg_solaris.go index 7c1b9d82..316233fa 100644 --- a/collector/loadavg_solaris.go +++ b/collector/loadavg_solaris.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noloadavg // +build !noloadavg package collector diff --git a/collector/logind_linux.go b/collector/logind_linux.go index b684eee2..06703e96 100644 --- a/collector/logind_linux.go +++ b/collector/logind_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nologind // +build !nologind package collector diff --git a/collector/mdadm_linux.go b/collector/mdadm_linux.go index 066d6cf2..89c56b75 100644 --- a/collector/mdadm_linux.go +++ b/collector/mdadm_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nomdadm // +build !nomdadm package collector diff --git a/collector/meminfo.go b/collector/meminfo.go index 96c3b689..8437f0f1 100644 --- a/collector/meminfo.go +++ b/collector/meminfo.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build (darwin || linux || openbsd) && !nomeminfo // +build darwin linux openbsd // +build !nomeminfo diff --git a/collector/meminfo_darwin.go b/collector/meminfo_darwin.go index da443cdd..0c7f64ee 100644 --- a/collector/meminfo_darwin.go +++ b/collector/meminfo_darwin.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nomeminfo // +build !nomeminfo package collector diff --git a/collector/meminfo_linux.go b/collector/meminfo_linux.go index 88505da6..cee29502 100644 --- a/collector/meminfo_linux.go +++ b/collector/meminfo_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nomeminfo // +build !nomeminfo package collector diff --git a/collector/meminfo_numa_linux.go b/collector/meminfo_numa_linux.go index bfefb7bb..5ce08e99 100644 --- a/collector/meminfo_numa_linux.go +++ b/collector/meminfo_numa_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // 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 df76dae8..2c81c50c 100644 --- a/collector/meminfo_openbsd.go +++ b/collector/meminfo_openbsd.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build openbsd,!amd64 -// +build !nomeminfo +//go:build openbsd && !amd64 && !nomeminfo +// +build openbsd,!amd64,!nomeminfo package collector diff --git a/collector/meminfo_openbsd_amd64.go b/collector/meminfo_openbsd_amd64.go index 368e640e..41adebc3 100644 --- a/collector/meminfo_openbsd_amd64.go +++ b/collector/meminfo_openbsd_amd64.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nomeminfo // +build !nomeminfo package collector diff --git a/collector/memory_bsd.go b/collector/memory_bsd.go index 4ebf8d3c..5b312691 100644 --- a/collector/memory_bsd.go +++ b/collector/memory_bsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build (freebsd || dragonfly) && !nomeminfo // +build freebsd dragonfly // +build !nomeminfo diff --git a/collector/mountstats_linux.go b/collector/mountstats_linux.go index d40ed477..9dea6fad 100644 --- a/collector/mountstats_linux.go +++ b/collector/mountstats_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nomountstats // +build !nomountstats package collector diff --git a/collector/netclass_linux.go b/collector/netclass_linux.go index 7d48b456..a1a3fa72 100644 --- a/collector/netclass_linux.go +++ b/collector/netclass_linux.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build !nonetclass -// +build linux +//go:build !nonetclass && linux +// +build !nonetclass,linux package collector diff --git a/collector/netdev_bsd.go b/collector/netdev_bsd.go index d4fb1d8c..d472b2df 100644 --- a/collector/netdev_bsd.go +++ b/collector/netdev_bsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nonetdev && (freebsd || dragonfly) // +build !nonetdev // +build freebsd dragonfly diff --git a/collector/netdev_darwin.go b/collector/netdev_darwin.go index dd7e3fc4..0f83a606 100644 --- a/collector/netdev_darwin.go +++ b/collector/netdev_darwin.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nonetdev // +build !nonetdev package collector diff --git a/collector/netdev_linux.go b/collector/netdev_linux.go index a9b4e33f..e825db08 100644 --- a/collector/netdev_linux.go +++ b/collector/netdev_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nonetdev // +build !nonetdev package collector diff --git a/collector/netdev_openbsd.go b/collector/netdev_openbsd.go index 327aec55..2be10a3d 100644 --- a/collector/netdev_openbsd.go +++ b/collector/netdev_openbsd.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build openbsd,!amd64 -// +build !nonetdev +//go:build openbsd && !amd64 && !nonetdev +// +build openbsd,!amd64,!nonetdev package collector diff --git a/collector/netdev_openbsd_amd64.go b/collector/netdev_openbsd_amd64.go index 8bba9942..8b2bfa0e 100644 --- a/collector/netdev_openbsd_amd64.go +++ b/collector/netdev_openbsd_amd64.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nonetdev // +build !nonetdev package collector diff --git a/collector/netstat_linux.go b/collector/netstat_linux.go index efd1f6cc..28a97fba 100644 --- a/collector/netstat_linux.go +++ b/collector/netstat_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // 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 98c0815d..c77e1751 100644 --- a/collector/network_route_linux.go +++ b/collector/network_route_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nonetworkroute // +build !nonetworkroute package collector diff --git a/collector/nfs_linux.go b/collector/nfs_linux.go index 3802dc19..e08acdba 100644 --- a/collector/nfs_linux.go +++ b/collector/nfs_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nonfs // +build !nonfs package collector diff --git a/collector/nfsd_linux.go b/collector/nfsd_linux.go index 1f785664..faa6c960 100644 --- a/collector/nfsd_linux.go +++ b/collector/nfsd_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nonfsd // +build !nonfsd package collector diff --git a/collector/ntp.go b/collector/ntp.go index 7c9a4d3b..25cb9452 100644 --- a/collector/ntp.go +++ b/collector/ntp.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nontp // +build !nontp package collector diff --git a/collector/nvme_linux.go b/collector/nvme_linux.go index bcb63931..15af5d75 100644 --- a/collector/nvme_linux.go +++ b/collector/nvme_linux.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build linux -// +build !nonvme +//go:build linux && !nonvme +// +build linux,!nonvme package collector diff --git a/collector/perf_linux.go b/collector/perf_linux.go index aebdcceb..07dae52b 100644 --- a/collector/perf_linux.go +++ b/collector/perf_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noperf // +build !noperf package collector @@ -284,21 +285,30 @@ func NewPerfCollector(logger log.Logger) (Collector, error) { for _, cpu := range cpus { // Use -1 to profile all processes on the CPU, see: // man perf_event_open - hwProf := perf.NewHardwareProfiler(-1, cpu) + hwProf, err := perf.NewHardwareProfiler(-1, cpu) + if err != nil { + return nil, err + } if err := hwProf.Start(); err != nil { return nil, err } collector.perfHwProfilers[cpu] = &hwProf collector.hwProfilerCPUMap[&hwProf] = cpu - swProf := perf.NewSoftwareProfiler(-1, cpu) + swProf, err := perf.NewSoftwareProfiler(-1, cpu) + if err != nil { + return nil, err + } if err := swProf.Start(); err != nil { return nil, err } collector.perfSwProfilers[cpu] = &swProf collector.swProfilerCPUMap[&swProf] = cpu - cacheProf := perf.NewCacheProfiler(-1, cpu) + cacheProf, err := perf.NewCacheProfiler(-1, cpu) + if err != nil { + return nil, err + } if err := cacheProf.Start(); err != nil { return nil, err } diff --git a/collector/perf_linux_test.go b/collector/perf_linux_test.go index d206d01f..54ef199a 100644 --- a/collector/perf_linux_test.go +++ b/collector/perf_linux_test.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noprocesses // +build !noprocesses package collector diff --git a/collector/powersupplyclass.go b/collector/powersupplyclass.go index 3239a32b..87ac9812 100644 --- a/collector/powersupplyclass.go +++ b/collector/powersupplyclass.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build !nopowersupplyclass -// +build linux +//go:build !nopowersupplyclass && linux +// +build !nopowersupplyclass,linux package collector diff --git a/collector/pressure_linux.go b/collector/pressure_linux.go index ae6c4328..ceaced7e 100644 --- a/collector/pressure_linux.go +++ b/collector/pressure_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nopressure // +build !nopressure package collector diff --git a/collector/processes_linux.go b/collector/processes_linux.go index 01ec5a03..04a19547 100644 --- a/collector/processes_linux.go +++ b/collector/processes_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // 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 a1681db2..253f963b 100644 --- a/collector/processes_linux_test.go +++ b/collector/processes_linux_test.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noprocesses // +build !noprocesses package collector diff --git a/collector/qdisc_linux.go b/collector/qdisc_linux.go index 3e7f373f..3050318a 100644 --- a/collector/qdisc_linux.go +++ b/collector/qdisc_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noqdisc // +build !noqdisc package collector diff --git a/collector/runit.go b/collector/runit.go index b0355414..2449691d 100644 --- a/collector/runit.go +++ b/collector/runit.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !norunit // +build !norunit package collector diff --git a/collector/schedstat_linux.go b/collector/schedstat_linux.go index e7e7c352..e5016561 100644 --- a/collector/schedstat_linux.go +++ b/collector/schedstat_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noshedstat // +build !noshedstat package collector diff --git a/collector/sockstat_linux.go b/collector/sockstat_linux.go index 28fd32fd..480c83b1 100644 --- a/collector/sockstat_linux.go +++ b/collector/sockstat_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nosockstat // +build !nosockstat package collector diff --git a/collector/softnet_linux.go b/collector/softnet_linux.go index 8bda26ee..a46b6808 100644 --- a/collector/softnet_linux.go +++ b/collector/softnet_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nosoftnet // +build !nosoftnet package collector diff --git a/collector/stat_linux.go b/collector/stat_linux.go index 12795a23..941c5f23 100644 --- a/collector/stat_linux.go +++ b/collector/stat_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nostat // +build !nostat package collector diff --git a/collector/supervisord.go b/collector/supervisord.go index 8d78c72c..b3b0f137 100644 --- a/collector/supervisord.go +++ b/collector/supervisord.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nosupervisord // +build !nosupervisord package collector diff --git a/collector/sysctl_bsd.go b/collector/sysctl_bsd.go index a671bc2c..03a878f7 100644 --- a/collector/sysctl_bsd.go +++ b/collector/sysctl_bsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build (freebsd || dragonfly || openbsd || netbsd || darwin) && cgo // +build freebsd dragonfly openbsd netbsd darwin // +build cgo diff --git a/collector/systemd_linux.go b/collector/systemd_linux.go index 0daf438d..495aa560 100644 --- a/collector/systemd_linux.go +++ b/collector/systemd_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nosystemd // +build !nosystemd package collector diff --git a/collector/tapestats_linux.go b/collector/tapestats_linux.go index fe76acf5..441ac610 100644 --- a/collector/tapestats_linux.go +++ b/collector/tapestats_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !notapestats // +build !notapestats package collector diff --git a/collector/tcpstat_linux.go b/collector/tcpstat_linux.go index d3b4f3ad..47c3f3e0 100644 --- a/collector/tcpstat_linux.go +++ b/collector/tcpstat_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !notcpstat // +build !notcpstat package collector diff --git a/collector/textfile.go b/collector/textfile.go index 46d66ab4..d7bd14c1 100644 --- a/collector/textfile.go +++ b/collector/textfile.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !notextfile // +build !notextfile package collector diff --git a/collector/thermal_zone_linux.go b/collector/thermal_zone_linux.go index 8c6f6b87..6aedf347 100644 --- a/collector/thermal_zone_linux.go +++ b/collector/thermal_zone_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nothermalzone // +build !nothermalzone package collector diff --git a/collector/time.go b/collector/time.go index 9fa09b55..34c5aad2 100644 --- a/collector/time.go +++ b/collector/time.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !notime // +build !notime package collector diff --git a/collector/timex.go b/collector/timex.go index d0edd632..c444d3ea 100644 --- a/collector/timex.go +++ b/collector/timex.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build linux -// +build !notimex +//go:build linux && !notimex +// +build linux,!notimex package collector diff --git a/collector/udp_queues_linux.go b/collector/udp_queues_linux.go index bc88c057..3fac8691 100644 --- a/collector/udp_queues_linux.go +++ b/collector/udp_queues_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noudp_queues // +build !noudp_queues package collector diff --git a/collector/uname.go b/collector/uname.go index 12ec751f..14cfefb3 100644 --- a/collector/uname.go +++ b/collector/uname.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build (darwin || freebsd || openbsd || linux) && !nouname // +build darwin freebsd openbsd linux // +build !nouname diff --git a/collector/uname_bsd.go b/collector/uname_bsd.go index fd8db9b4..77d47877 100644 --- a/collector/uname_bsd.go +++ b/collector/uname_bsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build (darwin || freebsd || openbsd) && !nouname // +build darwin freebsd openbsd // +build !nouname diff --git a/collector/uname_linux.go b/collector/uname_linux.go index 65de6297..549c221a 100644 --- a/collector/uname_linux.go +++ b/collector/uname_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nouname // +build !nouname package collector diff --git a/collector/vmstat_linux.go b/collector/vmstat_linux.go index 191cc7fb..a5991657 100644 --- a/collector/vmstat_linux.go +++ b/collector/vmstat_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !novmstat // +build !novmstat package collector diff --git a/collector/wifi_linux.go b/collector/wifi_linux.go index d64554bc..4b293ea3 100644 --- a/collector/wifi_linux.go +++ b/collector/wifi_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nowifi // +build !nowifi package collector diff --git a/collector/xfs_linux.go b/collector/xfs_linux.go index de3d2c8f..bb25acab 100644 --- a/collector/xfs_linux.go +++ b/collector/xfs_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !noxfs // +build !noxfs package collector diff --git a/collector/zfs.go b/collector/zfs.go index e9c020f3..8ddbe3c2 100644 --- a/collector/zfs.go +++ b/collector/zfs.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build linux -// +build !nozfs +//go:build linux && !nozfs +// +build linux,!nozfs package collector diff --git a/collector/zfs_freebsd.go b/collector/zfs_freebsd.go index b45ba267..2418b229 100644 --- a/collector/zfs_freebsd.go +++ b/collector/zfs_freebsd.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nozfs // +build !nozfs package collector diff --git a/collector/zfs_linux.go b/collector/zfs_linux.go index 77ca1ee9..735e2154 100644 --- a/collector/zfs_linux.go +++ b/collector/zfs_linux.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !nozfs // +build !nozfs package collector diff --git a/collector/zfs_solaris.go b/collector/zfs_solaris.go index 51449f16..040f31db 100644 --- a/collector/zfs_solaris.go +++ b/collector/zfs_solaris.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build solaris -// +build !nozfs +//go:build solaris && !nozfs +// +build solaris,!nozfs package collector diff --git a/docs/node-mixin/tools.go b/docs/node-mixin/tools.go index a454b292..94882940 100644 --- a/docs/node-mixin/tools.go +++ b/docs/node-mixin/tools.go @@ -12,7 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//+build tools +//go:build tools +// +build tools // Package tools tracks dependencies for tools that used in the build process. // See https://github.com/golang/go/issues/25922 diff --git a/go.mod b/go.mod index 1d2deec1..2f3b621c 100644 --- a/go.mod +++ b/go.mod @@ -4,24 +4,24 @@ require ( github.com/beevik/ntp v0.3.0 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf github.com/ema/qdisc v0.0.0-20200603082823-62d0308e3e00 - github.com/go-kit/log v0.1.0 + github.com/go-kit/log v0.2.0 github.com/godbus/dbus v0.0.0-20190402143921-271e53dc4968 github.com/hashicorp/go-envparse v0.0.0-20200406174449-d9cfd743a15e - github.com/hodgesds/perf-utils v0.2.5 + github.com/hodgesds/perf-utils v0.3.1 github.com/illumos/go-kstat v0.0.0-20210513183136-173c9b0a9973 - github.com/jsimonetti/rtnetlink v0.0.0-20210713125558-2bfdf1dbdbd6 + github.com/jsimonetti/rtnetlink v0.0.0-20210922080037-435639c8e6a8 github.com/lufia/iostat v1.1.1 github.com/mattn/go-xmlrpc v0.0.3 github.com/mdlayher/wifi v0.0.0-20200527114002-84f0b9457fdd github.com/prometheus/client_golang v1.11.0 github.com/prometheus/client_model v0.2.0 - github.com/prometheus/common v0.29.0 - github.com/prometheus/exporter-toolkit v0.6.0 + github.com/prometheus/common v0.31.1 + github.com/prometheus/exporter-toolkit v0.6.1 github.com/prometheus/procfs v0.7.3 github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973 // indirect github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a - golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c + golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 gopkg.in/alecthomas/kingpin.v2 v2.2.6 ) diff --git a/go.sum b/go.sum index 10a58fde..6c554115 100644 --- a/go.sum +++ b/go.sum @@ -75,13 +75,14 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0 h1:DGJh0Sm43HbOeYDNnVZFl8BvcYVvjD5bqYJvp0REbwQ= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus v0.0.0-20190402143921-271e53dc4968 h1:s+PDl6lozQ+dEUtUtQnO7+A2iPG3sK1pI4liU+jxn90= github.com/godbus/dbus v0.0.0-20190402143921-271e53dc4968/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= @@ -143,8 +144,8 @@ github.com/hashicorp/go-envparse v0.0.0-20200406174449-d9cfd743a15e h1:v1d9+AJMP github.com/hashicorp/go-envparse v0.0.0-20200406174449-d9cfd743a15e/go.mod h1:/NlxCzN2D4C4L2uDE6ux/h6jM+n98VFQM14nnCIfHJU= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hodgesds/perf-utils v0.2.5 h1:X992/V3OaNJRM8Ivcram8Hhxz4JhWiKI0T8iGCJwk2k= -github.com/hodgesds/perf-utils v0.2.5/go.mod h1:X3dAE1IoPfsSKR2MDhorGY1mORNDOJTZ+0XTrtmoHFI= +github.com/hodgesds/perf-utils v0.3.1 h1:iizGJVzJnPW32Gvk1cFZINiGA5lVxjkZS5G0NJ6YQU0= +github.com/hodgesds/perf-utils v0.3.1/go.mod h1:oH2rI7A/UyTAlIxaP4CwSE11vDH8kGQeTBA6Oz3ltfQ= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/illumos/go-kstat v0.0.0-20210513183136-173c9b0a9973 h1:hk4LPqXIY/c9XzRbe7dA6qQxaT6Axcbny0L/G5a4owQ= github.com/illumos/go-kstat v0.0.0-20210513183136-173c9b0a9973/go.mod h1:PoK3ejP3LJkGTzKqRlpvCIFas3ncU02v8zzWDW+g0FY= @@ -161,8 +162,8 @@ github.com/jsimonetti/rtnetlink v0.0.0-20201220180245-69540ac93943/go.mod h1:z4c github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736/go.mod h1:ZXpIyOK59ZnN7J0BV99cZUPmsqDRZ3eq5X+st7u/oSA= github.com/jsimonetti/rtnetlink v0.0.0-20210212075122-66c871082f2b/go.mod h1:8w9Rh8m+aHZIG69YPGGem1i5VzoyRC8nw2kA8B+ik5U= github.com/jsimonetti/rtnetlink v0.0.0-20210525051524-4cc836578190/go.mod h1:NmKSdU4VGSiv1bMsdqNALI4RSvvjtz65tTMCnD05qLo= -github.com/jsimonetti/rtnetlink v0.0.0-20210713125558-2bfdf1dbdbd6 h1:sGihmgAucF8bG1bCYiOp2OOO9WRnZ9YL4kvPSUKXCeI= -github.com/jsimonetti/rtnetlink v0.0.0-20210713125558-2bfdf1dbdbd6/go.mod h1:qdKhcKUxYn3/QvneOvPWXXMPqktEBHnCW98wUTA3rmA= +github.com/jsimonetti/rtnetlink v0.0.0-20210922080037-435639c8e6a8 h1:URWZhDC6GjaHuI7uYYBaDeT52G0rR3HFqxnzvS0e4OU= +github.com/jsimonetti/rtnetlink v0.0.0-20210922080037-435639c8e6a8/go.mod h1:qdKhcKUxYn3/QvneOvPWXXMPqktEBHnCW98wUTA3rmA= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -232,10 +233,11 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.29.0 h1:3jqPBvKT4OHAbje2Ql7KeaaSicDBCxMYwEJU1zRJceE= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/exporter-toolkit v0.6.0 h1:rGoS9gIqj3sXaw+frvo0ozCs1CxBRqpOCGsbixC52UI= -github.com/prometheus/exporter-toolkit v0.6.0/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g= +github.com/prometheus/common v0.31.1 h1:d18hG4PkHnNAKNMOmFuXFaiY8Us0nird/2m60uS1AMs= +github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/exporter-toolkit v0.6.1 h1:Aqk75wQD92N9CqmTlZwjKwq6272nOGrWIbc8Z7+xQO0= +github.com/prometheus/exporter-toolkit v0.6.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -413,8 +415,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=