Synchronize common files from prometheus/prometheus (#3469)

* Update common Prometheus files

Signed-off-by: prombot <[email protected]>

* Fixup linting issues.

Signed-off-by: Ben Kochie <[email protected]>

---------

Signed-off-by: prombot <[email protected]>
Signed-off-by: Ben Kochie <[email protected]>
Co-authored-by: Ben Kochie <[email protected]>

Author: prombot

.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

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.

collector/arp_linux.go

@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !noarp
-// +build !noarp
 
 package collector
 

collector/bcache_linux.go

@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !nobcache
-// +build !nobcache
 
 package collector
 

collector/bonding_linux.go

@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !nobonding
-// +build !nobonding
 
 package collector
 

collector/bonding_linux_test.go

@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !nobonding
-// +build !nobonding
 
 package collector
 

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
 

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 {

collector/btrfs_linux.go

@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !nobtrfs
-// +build !nobtrfs
 
 package collector
 

collector/btrfs_linux_test.go

@@ -12,7 +12,6 @@
 // limitations under the License.
 
 //go:build !nobtrfs
-// +build !nobtrfs
 
 package collector