From 3c42eb9611a35058c0d51d014d31542fc6989d87 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Mon, 14 Oct 2019 09:43:57 +0800 Subject: [PATCH] Stop register to prom registry from legacyregistry --- .../metrics/legacyregistry/registry.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go b/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go index 54146bebff2..c95faadc4e5 100644 --- a/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go +++ b/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go @@ -49,18 +49,12 @@ func Handler() http.Handler { // Register registers a collectable metric but uses the global registry func Register(c metrics.Registerable) error { err := defaultRegistry.Register(c) - // sideload global prom registry as fallback - prometheus.Register(c) return err } // MustRegister registers registerable metrics but uses the global registry. func MustRegister(cs ...metrics.Registerable) { defaultRegistry.MustRegister(cs...) - // sideload global prom registry as fallback - for _, c := range cs { - prometheus.Register(c) - } } // RawMustRegister registers prometheus collectors but uses the global registry, this @@ -69,10 +63,6 @@ func MustRegister(cs ...metrics.Registerable) { // Deprecated func RawMustRegister(cs ...prometheus.Collector) { defaultRegistry.RawMustRegister(cs...) - // sideload global prom registry as fallback - for _, c := range cs { - prometheus.Register(c) - } } // RawRegister registers a prometheus collector but uses the global registry, this @@ -81,7 +71,5 @@ func RawMustRegister(cs ...prometheus.Collector) { // Deprecated func RawRegister(c prometheus.Collector) error { err := defaultRegistry.RawRegister(c) - // sideload global prom registry as fallback - prometheus.Register(c) return err }