dedup __name__ label

Signed-off-by: Thibault Mange <[email protected]>
stolostron · Jan 15, 2025 · 84a2d0d · 84a2d0d
1 parent b2f7fdd
commit 84a2d0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/collectors/metrics/pkg/metricsclient/metricsclient.go b/collectors/metrics/pkg/metricsclient/metricsclient.go
@@ -389,6 +389,7 @@ func convertToTimeseries(p *PartitionedMetrics, now time.Time) ([]prompb.TimeSer
 			}}
 
 			dedup := make(map[string]struct{})
+			dedup[nameLabelName] = struct{}{}
 			for _, l := range m.Label {
 				// Skip empty labels.
 				if *l.Name == "" || *l.Value == "" {

diff --git a/collectors/metrics/pkg/metricsclient/metricsclient_test.go b/collectors/metrics/pkg/metricsclient/metricsclient_test.go
@@ -46,6 +46,7 @@ func Test_convertToTimeseries(t *testing.T) {
 	fooLabelName := "foo"
 	fooLabelValue1 := "bar"
 	fooLabelValue2 := "baz"
+	nameLabel := nameLabelName
 
 	emptyLabelName := ""
 
@@ -206,8 +207,12 @@ func Test_convertToTimeseries(t *testing.T) {
 					Counter:     &clientmodel.Counter{Value: &value42},
 					TimestampMs: &timestamp,
 				}, {
-					// With duplicate labels.
-					Label:       []*clientmodel.LabelPair{{Name: &fooLabelName, Value: &fooLabelValue2}, {Name: &fooLabelName, Value: &fooLabelValue2}},
+					// With duplicate labels, including the __name__ label.
+					Label: []*clientmodel.LabelPair{
+						{Name: &fooLabelName, Value: &fooLabelValue2},
+						{Name: &fooLabelName, Value: &fooLabelValue2},
+						{Name: &nameLabel, Value: &barMetricName},
+					},
 					Counter:     &clientmodel.Counter{Value: &value42},
 					TimestampMs: &timestamp,
 				}, {