Skip to content

Commit de02495

Browse files
committed
minor comments
1 parent 3d718d5 commit de02495

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

parser.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -918,8 +918,6 @@ func expandWithExpr(was []*withArgExpr, e Expr) (Expr, error) {
918918
var lfNew LabelFilter
919919
lfNew.Label = "__name__"
920920
lfNew.Value = metricName
921-
lfNew.IsNegative = false
922-
lfNew.IsRegexp = false
923921
lfsNew = append(lfsNew, lfNew)
924922
lfsNew = append(lfsNew, me.LabelFilterss[lfsLastIndex]...)
925923
me.LabelFilterss[lfsLastIndex] = lfsNew
@@ -1393,16 +1391,15 @@ func isQuotedString(s string) bool {
13931391

13941392
func (p *parser) parseLabelFilterExpr() (*labelFilterExpr, error) {
13951393
var isPossibleMetricName bool
1396-
1397-
// Strip quotes if they exist
13981394
if isQuotedString(p.lex.Token) {
1395+
// strip quotes
13991396
p.lex.Token = p.lex.Token[1 : len(p.lex.Token)-1]
1397+
// quoted string could be a metric name: {"metric_name"}
14001398
isPossibleMetricName = true
1401-
} else {
1402-
if !isIdentPrefix(p.lex.Token) {
1403-
return nil, fmt.Errorf(`labelFilterExpr: unexpected token %q; want "ident"`, p.lex.Token)
1404-
}
1399+
} else if !isIdentPrefix(p.lex.Token) {
1400+
return nil, fmt.Errorf(`labelFilterExpr: unexpected token %q; want "ident"`, p.lex.Token)
14051401
}
1402+
14061403
var lfe labelFilterExpr
14071404
lfe.Label = unescapeIdent(p.lex.Token)
14081405
if err := p.lex.Next(); err != nil {
@@ -1430,6 +1427,7 @@ func (p *parser) parseLabelFilterExpr() (*labelFilterExpr, error) {
14301427
// If we have a label name that is quoted with a nil value it is possible it's the metric
14311428
// name as per Prometheus 3.0 UTF8 quoted label names specifications, this is used later
14321429
// in our expanding of the with statements
1430+
// https://github.com/prometheus/proposals/blob/main/proposals/2023-08-21-utf8.md
14331431
lfe.IsPossibleMetricName = isPossibleMetricName
14341432

14351433
return &lfe, nil

0 commit comments

Comments
 (0)