Support UTF-8 label matchers: Update compliance tests (#3569)

* Update compliance tests This commit updates compliance tests to include openmetrics escape sequences that are not valid in the UTF-8 matchers parser. Signed-off-by: George Robinson <[email protected]> * Add tests for openmetrics escape sequences Signed-off-by: George Robinson <[email protected]> --------- Signed-off-by: George Robinson <[email protected]>
prometheus · Oct 25, 2023 · 8512285 · 8512285
1 parent d250132
commit 8512285
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 2 deletions.
diff --git a/matchers/compliance/compliance_test.go b/matchers/compliance/compliance_test.go
@@ -52,14 +52,74 @@ func TestCompliance(t *testing.T) {
 			skip: true,
 		},
 		{
-			input: "{foo=\\\"}",
+			input: `{foo=\n}`,
+			want: func() labels.Matchers {
+				ms := labels.Matchers{}
+				m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "\n")
+				return append(ms, m)
+			}(),
+			skip: true,
+		},
+		{
+			input: `{foo=bar\n}`,
+			want: func() labels.Matchers {
+				ms := labels.Matchers{}
+				m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "bar\n")
+				return append(ms, m)
+			}(),
+			skip: true,
+		},
+		{
+			input: `{foo=\t}`,
+			want: func() labels.Matchers {
+				ms := labels.Matchers{}
+				m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "\\t")
+				return append(ms, m)
+			}(),
+		},
+		{
+			input: `{foo=bar\t}`,
+			want: func() labels.Matchers {
+				ms := labels.Matchers{}
+				m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "bar\\t")
+				return append(ms, m)
+			}(),
+		},
+		{
+			input: `{foo=bar\}`,
+			want: func() labels.Matchers {
+				ms := labels.Matchers{}
+				m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "bar\\")
+				return append(ms, m)
+			}(),
+		},
+		{
+			input: `{foo=bar\\}`,
+			want: func() labels.Matchers {
+				ms := labels.Matchers{}
+				m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "bar\\")
+				return append(ms, m)
+			}(),
+			skip: true,
+		},
+		{
+			input: `{foo=\"}`,
 			want: func() labels.Matchers {
 				ms := labels.Matchers{}
 				m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "\"")
 				return append(ms, m)
 			}(),
 			skip: true,
 		},
+		{
+			input: `{foo=bar\"}`,
+			want: func() labels.Matchers {
+				ms := labels.Matchers{}
+				m, _ := labels.NewMatcher(labels.MatchEqual, "foo", "bar\"")
+				return append(ms, m)
+			}(),
+			skip: true,
+		},
 		{
 			input: `{foo=bar}`,
 			want: func() labels.Matchers {
@@ -386,7 +446,7 @@ func TestCompliance(t *testing.T) {
 				t.Fatalf("expected error but got none: %v", tc.err)
 			}
 			if !reflect.DeepEqual(got, tc.want) {
-				t.Fatalf("labels not equal:\ngot %#v\nwant %#v", got, tc.want)
+				t.Fatalf("matchers not equal:\ngot %s\nwant %s", got, tc.want)
 			}
 		})
 	}

diff --git a/pkg/labels/parse_test.go b/pkg/labels/parse_test.go
@@ -298,6 +298,30 @@ func TestMatchers(t *testing.T) {
 				return append(ms, m)
 			}(),
 		},
+		{
+			input: `{foo=bar\}`,
+			want: func() []*Matcher {
+				ms := []*Matcher{}
+				m, _ := NewMatcher(MatchEqual, "foo", "bar\\")
+				return append(ms, m)
+			}(),
+		},
+		{
+			input: `{foo=bar\\}`,
+			want: func() []*Matcher {
+				ms := []*Matcher{}
+				m, _ := NewMatcher(MatchEqual, "foo", "bar\\")
+				return append(ms, m)
+			}(),
+		},
+		{
+			input: `{foo=bar\"}`,
+			want: func() []*Matcher {
+				ms := []*Matcher{}
+				m, _ := NewMatcher(MatchEqual, "foo", "bar\"")
+				return append(ms, m)
+			}(),
+		},
 		{
 			input: `job=`,
 			want: func() []*Matcher {