fix(filter): fix support custom retention for tagged metrics

filter/cache_storage.go

@@ -80,11 +80,12 @@ func (storage *Storage) buildRetentions(retentionScanner *bufio.Scanner) error {
 
 	for retentionScanner.Scan() {
 		line1 := retentionScanner.Text()
-		if strings.HasPrefix(line1, "#") || strings.Count(line1, "=") != 1 {
+		if strings.HasPrefix(line1, "#") || strings.Count(line1, "=") < 1 {
 			continue
 		}
 
-		patternString := strings.TrimSpace(strings.Split(line1, "=")[1])
+		_, after, _ := strings.Cut(line1, "=")
+		patternString := strings.TrimSpace(after)
 		pattern, err := regexp.Compile(patternString)
 		if err != nil {
 			return err

filter/cache_storage_test.go

@@ -35,6 +35,10 @@ var testRetentions = `
 	pattern = yearly$
 	retentions = 1y:100y
 
+	[tagged metrics]
+	pattern = ;tag1=val1(;.*)?$
+	retentions = 10s:2d,1m:30d,15m:1y
+
 	[default]
 	pattern = .*
 	retentions = 120:7d
@@ -229,4 +233,35 @@ func TestRetentions(t *testing.T) {
 		So(metr.Retention, ShouldEqual, 120)
 		So(metr.RetentionTimestamp, ShouldEqual, 120)
 	})
+
+	Convey("Tagged metrics", t, func() {
+		Convey("should be 10sec", func() {
+			matchedMetric := moira.MatchedMetric{
+				Metric:             "my_super_metric;tag1=val1;tag2=val2",
+				Value:              12,
+				Timestamp:          151,
+				RetentionTimestamp: 0,
+				Retention:          10,
+			}
+			buffer := make(map[string]*moira.MatchedMetric)
+			storage.EnrichMatchedMetric(buffer, &matchedMetric)
+			So(len(buffer), ShouldEqual, 1)
+			So(matchedMetric.Retention, ShouldEqual, 10)
+			So(matchedMetric.RetentionTimestamp, ShouldEqual, 150)
+		})
+		Convey("should be default 120sec", func() {
+			matchedMetric := moira.MatchedMetric{
+				Metric:             "my_super_metric;tag2=val2",
+				Value:              12,
+				Timestamp:          151,
+				RetentionTimestamp: 0,
+				Retention:          60,
+			}
+			buffer := make(map[string]*moira.MatchedMetric)
+			storage.EnrichMatchedMetric(buffer, &matchedMetric)
+			So(len(buffer), ShouldEqual, 1)
+			So(matchedMetric.Retention, ShouldEqual, 120)
+			So(matchedMetric.RetentionTimestamp, ShouldEqual, 120)
+		})
+	})
 }