From e66f3b8527b40b9c77ae0e4409f94de6985658c3 Mon Sep 17 00:00:00 2001
From: Neil Jerram <neil@tigera.io>
Date: Fri, 14 Sep 2018 18:16:23 +0100
Subject: [PATCH 1/2] make update-libcalico

---
 glide.lock | 21 +++++++++++----------
 glide.yaml |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/glide.lock b/glide.lock
index 0932b8bf..19f45d0c 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 91a8ddb45da019149af35b6dbe76f5c34d077747fe2d7d1daf5f6a5cde01633f
-updated: 2018-08-09T04:09:18.507064778Z
+hash: 0c924decb67eca8ceb373ad1000e3f27516030e4dd6caeec891d2118811029bf
+updated: 2018-09-14T17:15:17.944152284Z
 imports:
 - name: cloud.google.com/go
   version: 3b1ae45394a234c385be014e9a488f2bb6eef821
@@ -47,7 +47,7 @@ imports:
 - name: github.com/ghodss/yaml
   version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee
 - name: github.com/go-ini/ini
-  version: d58d458bec3cb5adec4b7ddb41131855eac0b33f
+  version: fa25069db393aecc09b71267d0489b357781c860
 - name: github.com/gogo/protobuf
   version: c0656edd0d9eab7c66d1eb0c568f9039345796f7
   subpackages:
@@ -118,7 +118,7 @@ imports:
 - name: github.com/modern-go/reflect2
   version: 05fbef0ca5da472bbf96c9322b84a53edc03c9fd
 - name: github.com/onsi/ginkgo
-  version: 3774a09d95489ccaa16032e0770d08ea77ba6184
+  version: 46bbc26e8a9119360426a94c9d4e2ffe4e152f21
   subpackages:
   - config
   - extensions/table
@@ -139,7 +139,7 @@ imports:
   - reporters/stenographer/support/go-isatty
   - types
 - name: github.com/onsi/gomega
-  version: 4bbecc8c2307673cacf6e7c9275015b6c87ebe48
+  version: 7615b9433f86a8bdf29709bf288bc4fd0636a369
   subpackages:
   - format
   - internal/assertion
@@ -165,7 +165,7 @@ imports:
 - name: github.com/projectcalico/go-yaml-wrapper
   version: 598e54215bee41a19677faa4f0c32acd2a87eb56
 - name: github.com/projectcalico/libcalico-go
-  version: cac4ce6d0f2f1fdcaac2dcbe613374465cfd4953
+  version: 9137112a7d5a4b735a24dd1165d8fbc7dc3dfed1
   subpackages:
   - lib/apiconfig
   - lib/apis/v1
@@ -211,9 +211,10 @@ imports:
   - lib/validator/v3
   - lib/watch
 - name: github.com/prometheus/client_golang
-  version: 5b23715facdef1452016bae512489c3cdf82458c
+  version: b7b390014bf2ea0679a8e477638afa1b706cbd70
   subpackages:
   - prometheus
+  - prometheus/internal
   - prometheus/promhttp
 - name: github.com/prometheus/client_model
   version: 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f
@@ -240,12 +241,12 @@ imports:
   subpackages:
   - codec
 - name: github.com/Workiva/go-datastructures
-  version: f338bf48899950e415caffa02222a7273fbdeaf6
+  version: f07cbe3f82ca2fd6e5ab94afce65fe43319f675f
   subpackages:
   - list
   - trie/ctrie
 - name: golang.org/x/crypto
-  version: de0752318171da717af4ce24d0a2e8626afaeb11
+  version: 0e37d006457bf46f9e6692014ba72ef82c33022c
   subpackages:
   - ssh/terminal
 - name: golang.org/x/net
@@ -301,7 +302,7 @@ imports:
   subpackages:
   - rate
 - name: google.golang.org/appengine
-  version: 4216e58b9158e5f1c906f1aca75162a46a2ec88a
+  version: 03cac3b07182cfb08c0d0c0b6ee72a1ceb151c92
   subpackages:
   - internal
   - internal/app_identity
diff --git a/glide.yaml b/glide.yaml
index fcce4702..1f4d751c 100644
--- 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

From bf5f83c988b8a3cefdba706faa0edda7ec647bed Mon Sep 17 00:00:00 2001
From: Neil Jerram <neil@tigera.io>
Date: Fri, 14 Sep 2018 18:19:52 +0100
Subject: [PATCH 2/2] Adapt for updated Prometheus API

---
 pkg/daemon/daemon.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
index 4cca80bc..277de9df 100644
--- 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())