Skip to content

Commit 1968b80

Browse files
anna-tranyeya24
authored andcommitted
Fix metric name validation to use correct validation scheme method (cortexproject#7087)
Signed-off-by: Anna Tran <[email protected]>
1 parent 6a165b9 commit 1968b80

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
* [BUGFIX] Distributor: Fix `/distributor/all_user_stats` api to work during rolling updates on ingesters. #7026
110110
* [BUGFIX] Runtime-config: Fix panic when the runtime config is `null`. #7062
111111
* [BUGFIX] Scheduler: Avoid all queriers reserved for prioritized requests. #7057
112+
* [BUGFIX] Fix bug where validating metric names uses the wrong validation logic. #7086
112113

113114
## 1.19.1 2025-09-20
114115

pkg/util/validation/validate.go

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

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

pkg/util/validation/validate_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func TestValidateLabels(t *testing.T) {
134134
}, "foo "),
135135
},
136136
{
137-
map[model.LabelName]model.LabelValue{model.MetricNameLabel: "valid"},
137+
map[model.LabelName]model.LabelValue{model.MetricNameLabel: "valid:name"},
138138
false,
139139
nil,
140140
},
@@ -201,7 +201,7 @@ func TestValidateLabels(t *testing.T) {
201201
# HELP cortex_label_size_bytes The combined size in bytes of all labels and label values for a time series.
202202
# TYPE cortex_label_size_bytes histogram
203203
cortex_label_size_bytes_bucket{user="testUser",le="+Inf"} 3
204-
cortex_label_size_bytes_sum{user="testUser"} 148
204+
cortex_label_size_bytes_sum{user="testUser"} 153
205205
cortex_label_size_bytes_count{user="testUser"} 3
206206
`), "cortex_label_size_bytes"))
207207

0 commit comments

Comments
 (0)