prometheus · SuperQ · Nov 18, 2025 · Sep 17, 2025 · Nov 18, 2025
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -25,15 +25,20 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
       - name: Install Go
-        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
-          go-version: 1.24.x
+          go-version: 1.25.x
       - name: Install snmp_exporter/generator dependencies
         run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
         if: github.repository == 'prometheus/snmp_exporter'
+      - name: Get golangci-lint version
+        id: golangci-lint-version
+        run: echo "version=$(make print-golangci-lint-version)" >> $GITHUB_OUTPUT
       - name: Lint
-        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
           args: --verbose
-          version: v2.1.5
+          version: ${{ steps.golangci-lint-version.outputs.version }}
diff --git a/.golangci.yml b/.golangci.yml
@@ -19,6 +19,10 @@ linters:
       capital: true
     misspell:
       locale: US
+    revive:
+      rules:
+        - name: var-naming
+          disabled: true
   exclusions:
     presets:
       - comments

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.1.5
+GOLANGCI_LINT_VERSION ?= v2.4.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.
@@ -266,6 +266,10 @@ $(GOLANGCI_LINT):
 		| sh -s -- -b $(FIRST_GOPATH)/bin $(GOLANGCI_LINT_VERSION)
 endif
 
+.PHONY: common-print-golangci-lint-version
+common-print-golangci-lint-version:
+	@echo $(GOLANGCI_LINT_VERSION)
+
 .PHONY: precheck
 precheck::
 

diff --git a/cmdline_test.go b/cmdline_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package procfs
 

diff --git a/cpuinfo.go b/cpuinfo.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package procfs
 

diff --git a/cpuinfo_armx.go b/cpuinfo_armx.go
@@ -12,8 +12,6 @@
 // limitations under the License.
 
 //go:build linux && (arm || arm64)
-// +build linux
-// +build arm arm64
 
 package procfs
 

diff --git a/cpuinfo_loong64.go b/cpuinfo_loong64.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package procfs
 

diff --git a/cpuinfo_mipsx.go b/cpuinfo_mipsx.go
@@ -12,8 +12,6 @@
 // limitations under the License.
 
 //go:build linux && (mips || mipsle || mips64 || mips64le)
-// +build linux
-// +build mips mipsle mips64 mips64le
 
 package procfs
 

diff --git a/cpuinfo_others.go b/cpuinfo_others.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux && !386 && !amd64 && !arm && !arm64 && !loong64 && !mips && !mips64 && !mips64le && !mipsle && !ppc64 && !ppc64le && !riscv64 && !s390x
-// +build linux,!386,!amd64,!arm,!arm64,!loong64,!mips,!mips64,!mips64le,!mipsle,!ppc64,!ppc64le,!riscv64,!s390x
 
 package procfs
 

diff --git a/cpuinfo_ppcx.go b/cpuinfo_ppcx.go
@@ -12,8 +12,6 @@
 // limitations under the License.
 
 //go:build linux && (ppc64 || ppc64le)
-// +build linux
-// +build ppc64 ppc64le
 
 package procfs
 

diff --git a/cpuinfo_riscvx.go b/cpuinfo_riscvx.go
@@ -12,8 +12,6 @@
 // limitations under the License.
 
 //go:build linux && (riscv || riscv64)
-// +build linux
-// +build riscv riscv64
 
 package procfs
 

diff --git a/cpuinfo_s390x.go b/cpuinfo_s390x.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package procfs
 

diff --git a/cpuinfo_test.go b/cpuinfo_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package procfs
 

diff --git a/cpuinfo_x86.go b/cpuinfo_x86.go
@@ -12,8 +12,6 @@
 // limitations under the License.
 
 //go:build linux && (386 || amd64)
-// +build linux
-// +build 386 amd64
 
 package procfs
 

diff --git a/fs_statfs_notype.go b/fs_statfs_notype.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !freebsd && !linux
-// +build !freebsd,!linux
 
 package procfs
 

diff --git a/fs_statfs_type.go b/fs_statfs_type.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build freebsd || linux
-// +build freebsd linux
 
 package procfs
 

diff --git a/internal/util/sysreadfile.go b/internal/util/sysreadfile.go
@@ -12,8 +12,6 @@
 // limitations under the License.
 
 //go:build (linux || darwin) && !appengine
-// +build linux darwin
-// +build !appengine
 
 package util
 

diff --git a/internal/util/sysreadfile_compat.go b/internal/util/sysreadfile_compat.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build (linux && appengine) || (!linux && !darwin)
-// +build linux,appengine !linux,!darwin
 
 package util
 

diff --git a/kernel_hung.go b/kernel_hung.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 package procfs
 

diff --git a/kernel_hung_test.go b/kernel_hung_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 package procfs
 

diff --git a/kernel_random.go b/kernel_random.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 package procfs
 

diff --git a/kernel_random_test.go b/kernel_random_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 package procfs
 

diff --git a/proc_maps.go b/proc_maps.go
@@ -12,8 +12,6 @@
 // limitations under the License.
 
 //go:build (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris) && !js
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
-// +build !js
 
 package procfs
 

diff --git a/proc_maps32_test.go b/proc_maps32_test.go
@@ -12,8 +12,6 @@
 // limitations under the License.
 
 //go:build (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris) && (386 || arm || mips || mipsle)
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
-// +build 386 arm mips mipsle
 
 package procfs
 

diff --git a/proc_maps64_test.go b/proc_maps64_test.go
@@ -12,11 +12,6 @@
 // limitations under the License.
 
 //go:build (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris) && !386 && !arm && !mips && !mipsle
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
-// +build !386
-// +build !arm
-// +build !mips
-// +build !mipsle
 
 package procfs
 

diff --git a/proc_smaps.go b/proc_smaps.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 package procfs
 

diff --git a/proc_smaps_test.go b/proc_smaps_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !windows
-// +build !windows
 
 package procfs
 

diff --git a/scripts/check_build_tags.sh b/scripts/check_build_tags.sh
@@ -2,7 +2,7 @@
 
 fail=0
 while read -r f ; do 
-  if ! grep -q '+build linux' "$f" ; then
+  if ! grep -q '//go:build linux' "$f" ; then
     echo "missing linux build tag: $f"
     fail=1
   fi

diff --git a/selinuxfs/avc_cache_stats.go b/selinuxfs/avc_cache_stats.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux && !noselinux
-// +build linux,!noselinux
 
 package selinuxfs
 

diff --git a/selinuxfs/avc_cache_stats_test.go b/selinuxfs/avc_cache_stats_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux && !noselinux
-// +build linux,!noselinux
 
 package selinuxfs
 

diff --git a/selinuxfs/avc_hash_stats.go b/selinuxfs/avc_hash_stats.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux && !noselinux
-// +build linux,!noselinux
 
 package selinuxfs
 

diff --git a/selinuxfs/avc_hash_stats_test.go b/selinuxfs/avc_hash_stats_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux && !noselinux
-// +build linux,!noselinux
 
 package selinuxfs
 

diff --git a/selinuxfs/fs.go b/selinuxfs/fs.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux && !noselinux
-// +build linux,!noselinux
 
 package selinuxfs
 

diff --git a/selinuxfs/fs_test.go b/selinuxfs/fs_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux && !noselinux
-// +build linux,!noselinux
 
 package selinuxfs
 

diff --git a/sysfs/class_cooling_device.go b/sysfs/class_cooling_device.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package sysfs
 

diff --git a/sysfs/class_cooling_device_test.go b/sysfs/class_cooling_device_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package sysfs
 

diff --git a/sysfs/class_dmi.go b/sysfs/class_dmi.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package sysfs
 

diff --git a/sysfs/class_dmi_test.go b/sysfs/class_dmi_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package sysfs
 

diff --git a/sysfs/class_drm.go b/sysfs/class_drm.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package sysfs
 

diff --git a/sysfs/class_drm_amdgpu.go b/sysfs/class_drm_amdgpu.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package sysfs
 

diff --git a/sysfs/class_drm_amdgpu_test.go b/sysfs/class_drm_amdgpu_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package sysfs
 

diff --git a/sysfs/class_drm_card.go b/sysfs/class_drm_card.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package sysfs
 

diff --git a/sysfs/class_drm_card_test.go b/sysfs/class_drm_card_test.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package sysfs
 

diff --git a/sysfs/class_fibrechannel.go b/sysfs/class_fibrechannel.go
@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package sysfs