prometheus · prombot · Nov 5, 2025 · Nov 8, 2025
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {