From 63440fef788f5a3b50e6dbdca76647094126e78c Mon Sep 17 00:00:00 2001 From: Han Kang Date: Tue, 11 Jun 2019 17:31:36 -0700 Subject: [PATCH] use reflect.deepEqual for noop object comparison --- .../k8s.io/component-base/metrics/legacyregistry/registry.go | 5 +++-- 1 file changed, 3 insertions(+), 2 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 57a43375f21..b9d365b2272 100644 --- a/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go +++ b/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go @@ -19,6 +19,7 @@ package legacyregistry import ( "fmt" "net/http" + "reflect" "sync" "github.com/prometheus/client_golang/prometheus" @@ -98,7 +99,7 @@ func Register(c metrics.KubeCollector) error { globalRegistryFactory.registrationLock.Lock() defer globalRegistryFactory.registrationLock.Unlock() - if globalRegistryFactory.globalRegistry == (noopRegistry{}) { + if reflect.DeepEqual(globalRegistryFactory.globalRegistry, noopRegistry{}) { globalRegistryFactory.registerQueue = append(globalRegistryFactory.registerQueue, c) return nil } @@ -113,7 +114,7 @@ func MustRegister(cs ...metrics.KubeCollector) { globalRegistryFactory.registrationLock.Lock() defer globalRegistryFactory.registrationLock.Unlock() - if globalRegistryFactory.globalRegistry == (noopRegistry{}) { + if reflect.DeepEqual(globalRegistryFactory.globalRegistry, noopRegistry{}) { for _, c := range cs { globalRegistryFactory.mustRegisterQueue = append(globalRegistryFactory.mustRegisterQueue, c) }