metrics renaming

Author: oliviassss

cmd/aws-k8s-agent/main.go

@@ -137,21 +137,21 @@ func _main() int {
 		log.Errorf("Failed to create event recorder: %s", err)
 		log.Warn("Skipping event recorder initialization")
 	}
-	// Measure AWS initialization duration
-	awsStartTime := time.Now()
+	// Measure node initialization duration
+	IPAMDNodeInitStartTime := time.Now()
 	ipamContext, err := ipamd.New(k8sClient, withApiServer)
-	awsDuration := time.Since(awsStartTime).Seconds()
+	IPAMDNodeInitDuration := time.Since(IPAMDNodeInitStartTime).Seconds()
 
 	if err != nil {
 		log.Errorf("Initialization failure: %v", err)
-		// Record failed AWS initialization and failed startup
-		metrics.IpamdStartupAwsDuration.WithLabelValues("false").Observe(awsDuration)
-		metrics.IpamdStartupDuration.WithLabelValues("false", strconv.FormatBool(withApiServer), "aws_initialization").Observe(time.Since(startupStartTime).Seconds())
+		// Record failed IPAMD initialization and failed startup
+		metrics.IpamdNodeInitDuration.WithLabelValues("false").Observe(IPAMDNodeInitDuration)
+		metrics.IpamdStartupDuration.WithLabelValues("false", strconv.FormatBool(withApiServer), "node_initialization").Observe(time.Since(startupStartTime).Seconds())
 		return 1
 	}
 
 	// Record successful AWS initialization
-	metrics.IpamdStartupAwsDuration.WithLabelValues("true").Observe(awsDuration)
+	metrics.IpamdNodeInitDuration.WithLabelValues("true").Observe(IPAMDNodeInitDuration)
 
 	// If not connected to API server yet, start background checks
 	if !withApiServer {

utils/prometheusmetrics/prometheusmetrics.go

@@ -179,10 +179,10 @@ var (
 		},
 		[]string{"success", "with_api_server", "failure_reason"},
 	)
-	IpamdStartupAwsDuration = prometheus.NewHistogramVec(
+	IpamdNodeInitDuration = prometheus.NewHistogramVec(
 		prometheus.HistogramOpts{
-			Name: "awscni_ipamd_startup_aws_duration_seconds",
-			Help: "The duration of AWS initialization during IPAMD startup",
+			Name: "awscni_ipamd_node_initialization_duration_seconds",
+			Help: "The duration of node initialization during IPAMD startup",
 		},
 		[]string{"success"},
 	)
@@ -240,7 +240,7 @@ func PrometheusRegister() {
 	prometheus.MustRegister(NoAvailableIPAddrs)
 	prometheus.MustRegister(EniIPsInUse)
 	prometheus.MustRegister(IpamdStartupDuration)
-	prometheus.MustRegister(IpamdStartupAwsDuration)
+	prometheus.MustRegister(IpamdNodeInitDuration)
 }
 
 // This can be enhanced to get it programatically.