From 85f5583684f6ada680e4dc1edf782cc0bf67e920 Mon Sep 17 00:00:00 2001 From: xing-yang Date: Wed, 2 Nov 2022 22:37:50 +0000 Subject: [PATCH] Address review comments --- pkg/controller/podgc/gc_controller.go | 2 +- pkg/controller/podgc/metrics.go | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/controller/podgc/gc_controller.go b/pkg/controller/podgc/gc_controller.go index 0b376313a4e..db1c62d2693 100644 --- a/pkg/controller/podgc/gc_controller.go +++ b/pkg/controller/podgc/gc_controller.go @@ -70,7 +70,7 @@ type PodGCController struct { func init() { // Register prometheus metrics - Register() + RegisterMetrics() } func NewPodGC(ctx context.Context, kubeClient clientset.Interface, podInformer coreinformers.PodInformer, diff --git a/pkg/controller/podgc/metrics.go b/pkg/controller/podgc/metrics.go index 5eaf033bfaa..e0c742a81cb 100644 --- a/pkg/controller/podgc/metrics.go +++ b/pkg/controller/podgc/metrics.go @@ -24,16 +24,14 @@ import ( ) const ( - podGCController = "pod_gc_collector" - deletingPods = "force_delete_pods_total" - deletingPodsError = "force_delete_pod_errors_total" + podGCController = "pod_gc_collector" ) var ( deletingPodsTotal = metrics.NewCounterVec( &metrics.CounterOpts{ Subsystem: podGCController, - Name: deletingPods, + Name: "force_delete_pods_total", Help: "Number of pods that are being forcefully deleted since the Pod GC Controller started.", StabilityLevel: metrics.ALPHA, }, @@ -42,7 +40,7 @@ var ( deletingPodsErrorTotal = metrics.NewCounterVec( &metrics.CounterOpts{ Subsystem: podGCController, - Name: deletingPodsError, + Name: "force_delete_pod_errors_total", Help: "Number of errors encountered when forcefully deleting the pods since the Pod GC Controller started.", StabilityLevel: metrics.ALPHA, }, @@ -53,7 +51,7 @@ var ( var registerMetrics sync.Once // Register the metrics that are to be monitored. -func Register() { +func RegisterMetrics() { registerMetrics.Do(func() { legacyregistry.MustRegister(deletingPodsTotal) legacyregistry.MustRegister(deletingPodsErrorTotal)