Merge pull request #755 from prometheus/superq/vendor

Update build

.circleci/config.yml

@@ -8,7 +8,7 @@ executors:
   # Whenever the Go version is updated here, .promu.yml should also be updated.
   golang:
     docker:
-    - image: circleci/golang:1.15
+    - image: circleci/golang:1.16
 
 jobs:
   test:
@@ -29,7 +29,7 @@ jobs:
     # Whenever the Go version is updated here, .travis.yml and .promu.yml
     # should also be updated.
     environment:
-      DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.15-base
+      DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.16-base
 
     steps:
     - checkout

.gitignore

@@ -27,3 +27,4 @@ dependencies-stamp
 /.tarballs
 .deps
 *.tar.gz
+/vendor

.golangci.yml

@@ -1,6 +1,3 @@
-run:
-  modules-download-mode: vendor
-
 # Run only staticcheck for now. Additional linters will be enabled one-by-one.
 linters:
   enable:

.promu.yml

@@ -1,11 +1,11 @@
 go:
     # Whenever the Go version is updated here, .travis.yml and
     # .circle/config.yml should also be updated.
-    version: 1.15
+    version: 1.16
 repository:
     path: github.com/prometheus/blackbox_exporter
 build:
-    flags: -mod=vendor -a -tags netgo
+    flags: -a -tags netgo
     ldflags: |
         -X github.com/prometheus/common/version.Version={{.Version}}
         -X github.com/prometheus/common/version.Revision={{.Revision}}

go.mod

@@ -2,15 +2,15 @@ module github.com/prometheus/blackbox_exporter
 
 require (
 	github.com/go-kit/kit v0.10.0
-	github.com/miekg/dns v1.1.29
+	github.com/miekg/dns v1.1.40
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.7.1
+	github.com/prometheus/client_golang v1.9.0
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.15.0
-	github.com/prometheus/exporter-toolkit v0.5.0
-	golang.org/x/net v0.0.0-20200625001655-4c5254603344
+	github.com/prometheus/common v0.18.0
+	github.com/prometheus/exporter-toolkit v0.5.1
+	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
-	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
 
 go 1.13