Signed-off-by: fengzixu <[email protected]>

feature: modify the function name about prometheus registry

1. change function name `GetCustomPrometheusRegistry` to `GetPrometheusRegistry`

Related to: AliyunContainerService#2429

apis/metrics/metrics.go

@@ -45,8 +45,8 @@ var registerMetrics sync.Once
 
 // Register all metrics.
 func Register() {
-	// Get a custom prometheus registry.
-	registry := util_metrics.GetCustomPrometheusRegistry()
+	// Get a prometheus registry.
+	registry := util_metrics.GetPrometheusRegistry()
 	registerMetrics.Do(func() {
 		// Register the custom metrics.
 		registry.MustRegister(ImagePullSummary)

cri/metrics/metrics.go

@@ -74,8 +74,8 @@ var registerMetrics sync.Once
 
 // Register all metrics.
 func Register() {
-	// Get a custom prometheus registry.
-	registry := util_metrics.GetCustomPrometheusRegistry()
+	// Get a prometheus registry.
+	registry := util_metrics.GetPrometheusRegistry()
 	registerMetrics.Do(func() {
 		// Register the custom metrics.
 		registry.MustRegister(PodActionsCounter)

pkg/utils/metrics/metrics.go

@@ -15,17 +15,16 @@ const (
 	namespace = "engine"
 )
 
-// CustomPrometheusRegistry creates a custom prometheus registry.
 var (
-	customPrometheusRegistry *prometheus.Registry
-	prometheusHandler        http.Handler
-	registerMetrics          sync.Once
+	prometheusRegistry *prometheus.Registry
+	prometheusHandler  http.Handler
+	registerMetrics    sync.Once
 )
 
 func init() {
-	customPrometheusRegistry = prometheus.NewRegistry()
-	prometheusHandler = promhttp.HandlerFor(customPrometheusRegistry, promhttp.HandlerOpts{})
-	registerDefaultMetrics(customPrometheusRegistry)
+	prometheusRegistry = prometheus.NewRegistry()
+	prometheusHandler = promhttp.HandlerFor(prometheusRegistry, promhttp.HandlerOpts{})
+	registerDefaultMetrics(prometheusRegistry)
 }
 
 // SinceInMicroseconds gets the time since the specified start in microseconds.
@@ -81,9 +80,9 @@ func NewLabelTimer(subsystem, name, help string, labels ...string) *prometheus.H
 		}, labels)
 }
 
-// GetCustomPrometheusRegistry create a custom resigtry of Prometheus.
-func GetCustomPrometheusRegistry() *prometheus.Registry {
-	return customPrometheusRegistry
+// GetPrometheusRegistry create a custom resigtry of Prometheus.
+func GetPrometheusRegistry() *prometheus.Registry {
+	return prometheusRegistry
 }
 
 // GetPrometheusHandler return the prometheus handler.