prometheus: slightly different approach for dataplane compatibility (#65993)

2023-04-11 12:58:55 +02:00
parent c178cbc4dc
commit 05f7ae6c69
2 changed files with 15 additions and 15 deletions
@@ -400,11 +400,6 @@ func readMatrixOrVectorWide(iter *jsoniter.Iterator, resultType string, opt Opti
 			switch l1Field {
 			case "metric":
 				iter.ReadVal(&valueField.Labels)
-				if opt.Dataplane {
-					if n, ok := valueField.Labels["__name__"]; ok {
-						valueField.Name = n
-					}
-				}

 			case "value":
 				timeMap, rowIdx = addValuePairToFrame(frame, timeMap, rowIdx, iter)
@@ -503,11 +498,6 @@ func readMatrixOrVectorMulti(iter *jsoniter.Iterator, resultType string, opt Opt
 			switch l1Field {
 			case "metric":
 				iter.ReadVal(&valueField.Labels)
-				if opt.Dataplane {
-					if n, ok := valueField.Labels["__name__"]; ok {
-						valueField.Name = n
-					}
-				}

 			case "value":
 				t, v, err := readTimeValuePair(iter)