fix: attempt non-string label filtering when errors are present (#12378)

grafana · Mar 27, 2024 · 2b8db8b · 2b8db8b
1 parent f99e6ac
commit 2b8db8b
Showing 1 changed file with 24 additions and 21 deletions.
diff --git a/pkg/logql/log/label_filter.go b/pkg/logql/log/label_filter.go
@@ -173,19 +173,18 @@ func NewBytesLabelFilter(t LabelFilterType, name string, b uint64) *BytesLabelFi
 }
 
 func (d *BytesLabelFilter) Process(_ int64, line []byte, lbs *LabelsBuilder) ([]byte, bool) {
-	if lbs.HasErr() {
-		// if there's an error only the string matchers can filter it out.
-		return line, true
-	}
 	v, ok := lbs.Get(d.Name)
 	if !ok {
 		// we have not found this label.
 		return line, false
 	}
 	value, err := humanize.ParseBytes(v)
 	if err != nil {
-		lbs.SetErr(errLabelFilter)
-		lbs.SetErrorDetails(err.Error())
+		// Don't overwrite what might be a more useful error
+		if !lbs.HasErr() {
+			lbs.SetErr(errLabelFilter)
+			lbs.SetErrorDetails(err.Error())
+		}
 		return line, true
 	}
 	switch d.Type {
@@ -202,7 +201,9 @@ func (d *BytesLabelFilter) Process(_ int64, line []byte, lbs *LabelsBuilder) ([]
 	case LabelFilterLesserThanOrEqual:
 		return line, value <= d.Value
 	default:
-		lbs.SetErr(errLabelFilter)
+		if !lbs.HasErr() {
+			lbs.SetErr(errLabelFilter)
+		}
 		return line, true
 	}
 }
@@ -240,19 +241,18 @@ func NewDurationLabelFilter(t LabelFilterType, name string, d time.Duration) *Du
 }
 
 func (d *DurationLabelFilter) Process(_ int64, line []byte, lbs *LabelsBuilder) ([]byte, bool) {
-	if lbs.HasErr() {
-		// if there's an error only the string matchers can filter out.
-		return line, true
-	}
 	v, ok := lbs.Get(d.Name)
 	if !ok {
 		// we have not found this label.
 		return line, false
 	}
 	value, err := time.ParseDuration(v)
 	if err != nil {
-		lbs.SetErr(errLabelFilter)
-		lbs.SetErrorDetails(err.Error())
+		// Don't overwrite what might be a more useful error
+		if !lbs.HasErr() {
+			lbs.SetErr(errLabelFilter)
+			lbs.SetErrorDetails(err.Error())
+		}
 		return line, true
 	}
 	switch d.Type {
@@ -269,7 +269,9 @@ func (d *DurationLabelFilter) Process(_ int64, line []byte, lbs *LabelsBuilder)
 	case LabelFilterLesserThanOrEqual:
 		return line, value <= d.Value
 	default:
-		lbs.SetErr(errLabelFilter)
+		if !lbs.HasErr() {
+			lbs.SetErr(errLabelFilter)
+		}
 		return line, true
 	}
 }
@@ -302,19 +304,18 @@ func NewNumericLabelFilter(t LabelFilterType, name string, v float64) *NumericLa
 }
 
 func (n *NumericLabelFilter) Process(_ int64, line []byte, lbs *LabelsBuilder) ([]byte, bool) {
-	if lbs.HasErr() {
-		// if there's an error only the string matchers can filter out.
-		return line, true
-	}
 	v, ok := lbs.Get(n.Name)
 	if !ok {
 		// we have not found this label.
 		return line, false
 	}
 	value, err := strconv.ParseFloat(v, 64)
 	if err != nil {
-		lbs.SetErr(errLabelFilter)
-		lbs.SetErrorDetails(err.Error())
+		// Don't overwrite what might be a more useful error
+		if !lbs.HasErr() {
+			lbs.SetErr(errLabelFilter)
+			lbs.SetErrorDetails(err.Error())
+		}
 		return line, true
 	}
 	switch n.Type {
@@ -331,7 +332,9 @@ func (n *NumericLabelFilter) Process(_ int64, line []byte, lbs *LabelsBuilder) (
 	case LabelFilterLesserThanOrEqual:
 		return line, value <= n.Value
 	default:
-		lbs.SetErr(errLabelFilter)
+		if !lbs.HasErr() {
+			lbs.SetErr(errLabelFilter)
+		}
 		return line, true
 	}