Rename metric ready_backend_connections_total to ready_backends

Author: maqiuyujoyce

pkg/server/metrics/metrics.go

@@ -112,16 +112,16 @@ func newServerMetrics() *ServerMetrics {
 			Namespace: Namespace,
 			Subsystem: Subsystem,
 			Name:      "ready_backend_connections",
-			Help:      "Number of konnectivity agent connected to the proxy server. DEPRECATED, please use ready_backend_connections_total",
+			Help:      "Number of konnectivity agent connected to the proxy server. DEPRECATED, please use ready_backends",
 		},
 		[]string{},
 	)
 	totalBackendCount := prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Namespace: Namespace,
 			Subsystem: Subsystem,
-			Name:      "ready_backend_connections_total",
-			Help:      "Total number of konnectivity agent connected to the proxy server",
+			Name:      "ready_backends",
+			Help:      "Number of konnectivity agent connected to the proxy server",
 		},
 		[]string{
 			"proxy_strategy",

pkg/server/server_test.go

@@ -960,7 +960,7 @@ func assertReadyBackendsMetric(t testing.TB, expect int) {
 func assertTotalReadyBackendsMetric(t testing.TB, expect map[string]int) {
 	t.Helper()
 	if err := metricstest.DefaultTester.ExpectServerTotalReadyBackends(expect); err != nil {
-		t.Errorf("Expected %s metric for each proxy strategy %+v, but got error: %v", "ready_backend_connections_total", expect, err)
+		t.Errorf("Expected %s metric for each proxy strategy %+v, but got error: %v", "ready_backends", expect, err)
 	}
 }
 

pkg/testing/metrics/metrics.go

@@ -38,14 +38,14 @@ const (
 	serverPendingDialsSample = `konnectivity_network_proxy_server_pending_backend_dials{} %d`
 
 	serverReadyBackendsHeader = `
-# HELP konnectivity_network_proxy_server_ready_backend_connections Number of konnectivity agent connected to the proxy server. DEPRECATED, please use ready_backend_connections_total
+# HELP konnectivity_network_proxy_server_ready_backend_connections Number of konnectivity agent connected to the proxy server. DEPRECATED, please use ready_backends
 # TYPE konnectivity_network_proxy_server_ready_backend_connections gauge`
 	serverReadyBackendsSample = `konnectivity_network_proxy_server_ready_backend_connections{} %d`
 
 	serverTotalReadyBackendsHeader = `
-# HELP konnectivity_network_proxy_server_ready_backend_connections_total Total number of konnectivity agent connected to the proxy server
-# TYPE konnectivity_network_proxy_server_ready_backend_connections_total gauge`
-	serverTotalReadyBackendsSample = `konnectivity_network_proxy_server_ready_backend_connections_total{proxy_strategy="%s"} %d`
+# HELP konnectivity_network_proxy_server_ready_backends Number of konnectivity agent connected to the proxy server
+# TYPE konnectivity_network_proxy_server_ready_backends gauge`
+	serverTotalReadyBackendsSample = `konnectivity_network_proxy_server_ready_backends{proxy_strategy="%s"} %d`
 
 	serverEstablishedConnsHeader = `
 # HELP konnectivity_network_proxy_server_established_connections Current number of established end-to-end connections (post-dial).
@@ -116,7 +116,7 @@ func (t *Tester) ExpectServerTotalReadyBackends(expected map[string]int) error {
 	for proxyStrategy, numOfBackends := range expected {
 		expect += fmt.Sprintf(serverTotalReadyBackendsSample+"\n", proxyStrategy, numOfBackends)
 	}
-	return t.ExpectMetric(server.Namespace, server.Subsystem, "ready_backend_connections_total", expect)
+	return t.ExpectMetric(server.Namespace, server.Subsystem, "ready_backends", expect)
 }
 
 func (t *Tester) ExpectServerEstablishedConns(v int) error {