Merge pull request #192 from neiljerram/fix-ci

Fix release-v3.2 branch CI
projectcalico · Sep 14, 2018 · 65aba56 · 65aba56
2 parents 181228f + bf5f83c
commit 65aba56
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -12,7 +12,7 @@ import:
 - package: github.com/kardianos/osext
 - package: github.com/mipearson/rfw
 - package: github.com/projectcalico/libcalico-go
-  version: cac4ce6d0f2f1fdcaac2dcbe613374465cfd4953
+  version: 9137112a7d5a4b735a24dd1165d8fbc7dc3dfed1
   subpackages:
   - lib/apiconfig
   - lib/backend/api

diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
@@ -520,7 +520,7 @@ func servePrometheusMetrics(configParams *config.Config) {
 			}
 			if !configParams.PrometheusProcessMetricsEnabled {
 				log.Info("Discarding process metrics")
-				prometheus.Unregister(prometheus.NewProcessCollector(os.Getpid(), ""))
+				prometheus.Unregister(prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{}))
 			}
 		}
 		http.Handle("/metrics", promhttp.Handler())