Merge pull request #2071 from prometheus/superq/bump_procfs_0.7

Update Go modules
prometheus · Jul 6, 2021 · 35a2de2 · 35a2de2
2 parents 13be860 + 97583ff
commit 35a2de2
Show file tree

Hide file tree

Showing 8 changed files with 318 additions and 249 deletions.
diff --git a/collector/boot_time_solaris.go b/collector/boot_time_solaris.go
@@ -18,8 +18,8 @@ package collector
 
 import (
 	"github.com/go-kit/log"
+	"github.com/illumos/go-kstat"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/siebenmann/go-kstat"
 )
 
 type bootTimeCollector struct {

diff --git a/collector/cpu_solaris.go b/collector/cpu_solaris.go
@@ -20,8 +20,8 @@ import (
 	"strconv"
 
 	"github.com/go-kit/log"
+	"github.com/illumos/go-kstat"
 	"github.com/prometheus/client_golang/prometheus"
-	kstat "github.com/siebenmann/go-kstat"
 )
 
 // #include <unistd.h>

diff --git a/collector/cpufreq_solaris.go b/collector/cpufreq_solaris.go
@@ -21,8 +21,8 @@ import (
 	"strconv"
 
 	"github.com/go-kit/log"
+	"github.com/illumos/go-kstat"
 	"github.com/prometheus/client_golang/prometheus"
-	kstat "github.com/siebenmann/go-kstat"
 )
 
 // #include <unistd.h>

diff --git a/collector/loadavg_solaris.go b/collector/loadavg_solaris.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/siebenmann/go-kstat"
+	"github.com/illumos/go-kstat"
 )
 
 // #include <sys/param.h>

diff --git a/collector/zfs_solaris.go b/collector/zfs_solaris.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 
 	"github.com/go-kit/log"
+	"github.com/illumos/go-kstat"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/siebenmann/go-kstat"
 )
 
 type zfsCollector struct {

diff --git a/go.mod b/go.mod
@@ -7,20 +7,20 @@ require (
 	github.com/go-kit/log v0.1.0
 	github.com/godbus/dbus v0.0.0-20190402143921-271e53dc4968
 	github.com/hodgesds/perf-utils v0.2.5
-	github.com/jsimonetti/rtnetlink v0.0.0-20210122163228-8d122574c736
+	github.com/illumos/go-kstat v0.0.0-20210513183136-173c9b0a9973
+	github.com/jsimonetti/rtnetlink v0.0.0-20210614053835-9c52e516c709
 	github.com/lufia/iostat v1.1.0
 	github.com/mattn/go-xmlrpc v0.0.3
-	github.com/mdlayher/genetlink v1.0.0 // indirect
 	github.com/mdlayher/wifi v0.0.0-20200527114002-84f0b9457fdd
-	github.com/prometheus/client_golang v1.9.0
+	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.26.0
-	github.com/prometheus/exporter-toolkit v0.5.1
-	github.com/prometheus/procfs v0.6.0
-	github.com/safchain/ethtool v0.0.0-20200804214954-8f958a28363a
-	github.com/siebenmann/go-kstat v0.0.0-20200303194639-4e8294f9e9d5
+	github.com/prometheus/common v0.29.0
+	github.com/prometheus/exporter-toolkit v0.6.0
+	github.com/prometheus/procfs v0.7.0
+	github.com/safchain/ethtool v0.0.0-20201023143004-874930cb3ce0
+	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-20210124154548-22da62e12c0c
+	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 )
 

diff --git a/go.sum b/go.sum
diff --git a/node_exporter.go b/node_exporter.go
@@ -28,6 +28,7 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
+	promcollectors "github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/prometheus/common/version"
 	"github.com/prometheus/exporter-toolkit/web"
@@ -57,8 +58,8 @@ func newHandler(includeExporterMetrics bool, maxRequests int, logger log.Logger)
 	}
 	if h.includeExporterMetrics {
 		h.exporterMetricsRegistry.MustRegister(
-			prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}),
-			prometheus.NewGoCollector(),
+			promcollectors.NewProcessCollector(promcollectors.ProcessCollectorOpts{}),
+			promcollectors.NewGoCollector(),
 		)
 	}
 	if innerHandler, err := h.innerHandler(); err != nil {