Merge pull request #568 from prometheus/superq/gosnmp

Update build

.circleci/config.yml

@@ -2,7 +2,7 @@
 version: 2.1
 
 orbs:
-  prometheus: prometheus/prometheus@0.1.0
+  prometheus: prometheus/prometheus@0.8.0
 
 executors:
   # Whenever the Go version is updated here, .promu.yml
@@ -49,7 +49,8 @@ jobs:
     executor: golang
 
     steps:
-    - prometheus/setup_build_environment
+    - prometheus/setup_build_environment:
+        docker_version: 19.03.8
     - run: make -C generator docker
     - run: make -C generator docker DOCKER_REPO=quay.io/prometheus
     - run: docker images
@@ -62,7 +63,8 @@ jobs:
     executor: golang
 
     steps:
-    - prometheus/setup_build_environment
+    - prometheus/setup_build_environment:
+        docker_version: 19.03.8
     - run: make -C generator docker DOCKER_IMAGE_TAG=$CIRCLE_TAG
     - run: make -C generator docker DOCKER_IMAGE_TAG=$CIRCLE_TAG DOCKER_REPO=quay.io/prometheus
     - run: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD

.promu.yml

@@ -17,28 +17,3 @@ tarball:
         - snmp.yml
         - LICENSE
         - NOTICE
-crossbuild:
-    platforms:
-        - linux/amd64
-        - linux/386
-        - darwin/amd64
-        - windows/amd64
-        - windows/386
-        - freebsd/amd64
-        - freebsd/386
-        - openbsd/amd64
-        - openbsd/386
-        - netbsd/amd64
-        - netbsd/386
-        - dragonfly/amd64
-        - linux/arm
-        - linux/arm64
-        # Temporarily deactivated as golang.org/x/sys does not have syscalls
-        # implemented for that os/platform combination.
-        #- freebsd/arm
-        #- openbsd/arm
-        #- linux/mips64
-        #- linux/mips64le
-        - netbsd/arm
-        - linux/ppc64
-        - linux/ppc64le

collector.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
+	"github.com/gosnmp/gosnmp"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/soniah/gosnmp"
 	"gopkg.in/alecthomas/kingpin.v2"
 
 	"github.com/prometheus/snmp_exporter/config"

collector_test.go

@@ -20,8 +20,8 @@ import (
 	"testing"
 
 	"github.com/go-kit/kit/log"
+	"github.com/gosnmp/gosnmp"
 	"github.com/prometheus/client_model/go"
-	"github.com/soniah/gosnmp"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 
 	"github.com/prometheus/snmp_exporter/config"

config/config.go

@@ -19,7 +19,7 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/soniah/gosnmp"
+	"github.com/gosnmp/gosnmp"
 	"gopkg.in/yaml.v2"
 )
 

go.mod

@@ -1,18 +1,13 @@
 module github.com/prometheus/snmp_exporter
 
 require (
-	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
-	github.com/go-kit/kit v0.9.0
-	github.com/go-logfmt/logfmt v0.5.0 // indirect
-	github.com/golang/protobuf v1.3.3 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.4.1
+	github.com/go-kit/kit v0.10.0
+	github.com/gosnmp/gosnmp v1.28.0
+	github.com/prometheus/client_golang v1.7.1
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.9.1
-	github.com/soniah/gosnmp v1.23.1-0.20200214014533-6d3944030084
-	golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4 // indirect
+	github.com/prometheus/common v0.14.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
-	gopkg.in/yaml.v2 v2.2.8
+	gopkg.in/yaml.v2 v2.3.0
 )
 
 go 1.13