Merge pull request #1705 from prometheus/bjk/update_mod

Update Go modules

collector/filesystem_freebsd.go

@@ -16,9 +16,6 @@
 package collector
 
 import (
-	"bytes"
-	"unsafe"
-
 	"github.com/go-kit/kit/log/level"
 	"golang.org/x/sys/unix"
 )
@@ -30,15 +27,6 @@ const (
 	noWait                = 0x2 // MNT_NOWAIT
 )
 
-func gostring(b []int8) string {
-	bb := *(*[]byte)(unsafe.Pointer(&b))
-	idx := bytes.IndexByte(bb, 0)
-	if idx < 0 {
-		return ""
-	}
-	return string(bb[:idx])
-}
-
 // Expose filesystem fullness.
 func (c *filesystemCollector) GetStats() ([]filesystemStats, error) {
 	n, err := unix.Getfsstat(nil, noWait)
@@ -52,14 +40,14 @@ func (c *filesystemCollector) GetStats() ([]filesystemStats, error) {
 	}
 	stats := []filesystemStats{}
 	for _, fs := range buf {
-		mountpoint := gostring(fs.Mntonname[:])
+		mountpoint := string(fs.Mntonname[:])
 		if c.ignoredMountPointsPattern.MatchString(mountpoint) {
 			level.Debug(c.logger).Log("msg", "Ignoring mount point", "mountpoint", mountpoint)
 			continue
 		}
 
-		device := gostring(fs.Mntfromname[:])
-		fstype := gostring(fs.Fstypename[:])
+		device := string(fs.Mntfromname[:])
+		fstype := string(fs.Fstypename[:])
 		if c.ignoredFSTypesPattern.MatchString(fstype) {
 			level.Debug(c.logger).Log("msg", "Ignoring fs type", "type", fstype)
 			continue

go.mod

@@ -2,33 +2,37 @@ module github.com/prometheus/node_exporter
 
 require (
 	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
-	github.com/beevik/ntp v0.2.0
+	github.com/beevik/ntp v0.3.0
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 	github.com/ema/qdisc v0.0.0-20190904071900-b82c76788043
 	github.com/go-kit/kit v0.10.0
 	github.com/godbus/dbus v0.0.0-20190402143921-271e53dc4968
-	github.com/golang/protobuf v1.3.3 // indirect
+	github.com/golang/protobuf v1.4.1 // indirect
 	github.com/hodgesds/perf-utils v0.0.8
+	github.com/jpillora/backoff v1.0.0 // indirect
 	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/netlink v1.1.0 // indirect
 	github.com/mdlayher/wifi v0.0.0-20190303161829-b1436901ddee
+	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.4.1
+	github.com/prometheus/client_golang v1.6.0
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.9.1
+	github.com/prometheus/common v0.10.0
 	github.com/prometheus/procfs v0.0.11
-	github.com/siebenmann/go-kstat v0.0.0-20160321171754-d34789b79745
+	github.com/siebenmann/go-kstat v0.0.0-20200303194639-4e8294f9e9d5
 	github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a
-	go.uber.org/atomic v1.5.1 // indirect
-	go.uber.org/multierr v1.4.0 // indirect
-	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
-	golang.org/x/lint v0.0.0-20200130185559-910be7a94367 // indirect
-	golang.org/x/sys v0.0.0-20200217220822-9197077df867
-	golang.org/x/tools v0.0.0-20200216192241-b320d3a0f5a2 // indirect
+	go.uber.org/multierr v1.5.0 // indirect
+	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
+	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
+	golang.org/x/net v0.0.0-20200513185701-a91f0712d120 // indirect
+	golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a // indirect
+	golang.org/x/sys v0.0.0-20200513112337-417ce2331b5c
+	golang.org/x/tools v0.0.0-20200513201620-d5fe73897c97 // indirect
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
-	gopkg.in/yaml.v2 v2.2.8
+	gopkg.in/yaml.v2 v2.3.0
+	honnef.co/go/tools v0.0.1-2020.1.3 // indirect
 )
 
-go 1.13
+go 1.14