BZ171309: backport prometheus client_go race fix to 4.1

This is fixed in 4.2. ref: prometheus/client_golang#513 ref: https://bugzilla.redhat.com/show_bug.cgi?id=1713098
rphillips · Jun 5, 2019 · 92028ef · 92028ef
1 parent 2f6cda3
commit 92028ef
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 4 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -97,6 +97,9 @@ import:
 - package: github.com/containers/image
   repo:    https://github.com/openshift/containers-image.git
   version: openshift-3.8
+- package: github.com/prometheus/client_golang
+  repo:    https://github.com/openshift/prometheus-client_golang
+  version: origin-4.1-e7e903064f5e9eb5da98208bae10b475d4db0f8c
 # pod - sjenning
 # origin-3.11-runc-871ba2e
 - package: github.com/opencontainers/runc

diff --git a/vendor/github.com/prometheus/client_golang/OWNERS b/vendor/github.com/prometheus/client_golang/OWNERS
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/registry.go b/vendor/github.com/prometheus/client_golang/prometheus/registry.go
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/registry_test.go b/vendor/github.com/prometheus/client_golang/prometheus/registry_test.go