metricreader: fix TiProxy fails to query from Prometheus in operator deployment (#835) (#836)

Co-authored-by: djshow832 <[email protected]>

Author: ti-chi-bot

pkg/balance/metricsreader/query_result.go

@@ -117,7 +117,7 @@ func (qr QueryResult) GetSample4Backend(backend policy.BackendCtx) *model.Sample
 
 func getLabel4Backend(backend policy.BackendCtx) string {
 	addr := backend.Addr()
-	if strings.Contains(addr, ".svc:") {
+	if isOperatorDeployed(addr) {
 		// In operator deployment, the label value of `instance` is the pod name.
 		return addr[:strings.Index(addr, ".")]
 	}
@@ -128,10 +128,24 @@ func getLabel4Backend(backend policy.BackendCtx) string {
 
 // addr is the address of the backend status port.
 func getLabel4Addr(addr string) string {
-	if strings.Contains(addr, ".svc:") {
+	if isOperatorDeployed(addr) {
 		// In operator deployment, the label value of `instance` is the pod name.
 		return addr[:strings.Index(addr, ".")]
 	}
 	// In tiup deployment, the label value of `instance` is hostname:statusPort.
 	return addr
 }
+
+func isOperatorDeployed(addr string) bool {
+	// (.+-tidb-[0-9]+).*peer.*.svc.*")
+	idx := strings.Index(addr, "-tidb-")
+	if idx < 0 {
+		return false
+	}
+	idx = strings.Index(addr[idx:], "peer")
+	if idx < 0 {
+		return false
+	}
+	idx = strings.Index(addr[idx:], ".svc")
+	return idx >= 0
+}

pkg/balance/metricsreader/query_result_test.go

@@ -84,6 +84,13 @@ func TestMatrixMatchLabel(t *testing.T) {
 			port:          10080,
 			expectedPairs: []model.SamplePair{{Timestamp: 1712700000000, Value: 100}},
 		},
+		{
+			jsonRes:       `[{"metric":{"__name__":"process_cpu_seconds_total","instance":"tc-tidb-0","job":"tidb"},"values":[[1712700000,"100"]]}, {"metric":{"__name__":"process_cpu_seconds_total","instance":"tc-tidb-1","job":"tidb"},"values":[[1712700000,"200"]]}]`,
+			addr:          "tc-tidb-0.tc-tidb-peer.ns.svc.cluster.local:4000",
+			ip:            "tc-tidb-0.tc-tidb-peer.ns.svc.cluster.local",
+			port:          10080,
+			expectedPairs: []model.SamplePair{{Timestamp: 1712700000000, Value: 100}},
+		},
 		{
 			jsonRes:       `[]`,
 			addr:          "tc-tidb-0.tc-tidb-peer.ns.svc:4000",
@@ -148,6 +155,13 @@ func TestVectorMatchLabel(t *testing.T) {
 			port:           10080,
 			expectedSample: &model.Sample{Timestamp: 1712700000000, Value: 100},
 		},
+		{
+			jsonRes:        `[{"metric":{"__name__":"process_cpu_seconds_total","instance":"tc-tidb-0","job":"tidb"},"value":[1712700000,"100"]}, {"metric":{"__name__":"process_cpu_seconds_total","instance":"tc-tidb-1","job":"tidb"},"value":[1712700000,"200"]}]`,
+			addr:           "tc-tidb-0.tc-tidb-peer.ns.svc.cluster.local:4000",
+			ip:             "tc-tidb-0.tc-tidb-peer.ns.svc.cluster.local",
+			port:           10080,
+			expectedSample: &model.Sample{Timestamp: 1712700000000, Value: 100},
+		},
 		{
 			jsonRes:        `[]`,
 			addr:           "tc-tidb-0.tc-tidb-peer.ns.svc:4000",
@@ -188,6 +202,10 @@ func TestAddrMatchLabel(t *testing.T) {
 			addr:  "tc-tidb-0.tc-tidb-peer.ns.svc:3080",
 			label: "tc-tidb-0",
 		},
+		{
+			addr:  "tc-tidb-0.tc-tidb-peer.ns.svc.cluster.local:3080",
+			label: "tc-tidb-0",
+		},
 	}
 
 	for i, test := range tests {