mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #234 from grafana/56quarters/mimir-issue-1866

Browse source 
When removing start/end text op in regexp, don't break the contract.
This commit is contained in:
Oleg Zaytsev 2022-05-18 08:17:08 -07:00 committed by GitHub
parent 64e6c171c2 c8bce5d8c5
commit ceaa77f14d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
model/labels/matcher_test.go
View file

@ -81,6 +81,21 @@ func TestMatcher(t *testing.T) {
value: "foo-bar", value: "foo-bar",
match: false, match: false,
}, },
{
matcher: mustNewMatcher(t, MatchRegexp, "$*bar"),
value: "foo-bar",
match: false,
},
{
matcher: mustNewMatcher(t, MatchRegexp, "bar^+"),
value: "foo-bar",
match: false,
},
{
matcher: mustNewMatcher(t, MatchRegexp, "$+bar"),
value: "foo-bar",
match: false,
},
} }
for _, test := range tests { for _, test := range tests {

3
model/labels/regexp.go
View file

@ -163,6 +163,9 @@ func clearBeginEndText(re *syntax.Regexp) {
} }
if len(re.Sub) == 1 { if len(re.Sub) == 1 {
if re.Sub[0].Op == syntax.OpBeginText || re.Sub[0].Op == syntax.OpEndText { if re.Sub[0].Op == syntax.OpBeginText || re.Sub[0].Op == syntax.OpEndText {
// We need to remove this element. Since it's the only one, we convert into a matcher of an empty string.
// OpEmptyMatch is regexp's nop operator.
re.Op = syntax.OpEmptyMatch
re.Sub = nil re.Sub = nil
return return
} }