Skip to content

Commit d6dc7c3

Browse files
committed
Fix metric name validation to use correct validation scheme method
Signed-off-by: Anna Tran <[email protected]>
1 parent 30ee547 commit d6dc7c3

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* [ENHANCEMENT] Distributor: Add a label references validation for remote write v2 request. #7074
77
* [ENHANCEMENT] Distributor: Add count, spans, and buckets validations for native histogram. #7072
88
* [BUGFIX] Compactor: Avoid race condition which allow a grouper to not compact all partitions. #7082
9+
* [BUGFIX] Fix bug where validating metric names uses the wrong validation logic. #7086
910

1011
## 1.20.0 in progress
1112

pkg/util/validation/validate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func ValidateLabels(validateMetrics *ValidateMetrics, limits *Limits, userID str
286286
return newNoMetricNameError()
287287
}
288288

289-
if !nameValidationScheme.IsValidLabelName(unsafeMetricName) {
289+
if !nameValidationScheme.IsValidMetricName(unsafeMetricName) {
290290
validateMetrics.DiscardedSamples.WithLabelValues(invalidMetricName, userID).Inc()
291291
return newInvalidMetricNameError(unsafeMetricName)
292292
}

pkg/util/validation/validate_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func TestValidateLabels(t *testing.T) {
136136
}, "foo "),
137137
},
138138
{
139-
map[model.LabelName]model.LabelValue{model.MetricNameLabel: "valid"},
139+
map[model.LabelName]model.LabelValue{model.MetricNameLabel: "valid:name"},
140140
false,
141141
nil,
142142
},

0 commit comments

Comments
 (0)