Skip to content

Cherry pick PR 7082 and 7086 to 1.20 release #7089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 4, 2025
Merged

Cherry pick PR 7082 and 7086 to 1.20 release #7089

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1968b80
Fix metric name validation to use correct validation scheme method (#…
anna-tran Nov 3, 2025
6338c4f
bump to 1.20.0-rc.1
yeya24 Nov 4, 2025
8ec6762
Fix visit marker race condition (#7082)
danielblando Oct 31, 2025
cfea42a
update changelog
yeya24 Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
* [BUGFIX] Distributor: Fix `/distributor/all_user_stats` api to work during rolling updates on ingesters. #7026
* [BUGFIX] Runtime-config: Fix panic when the runtime config is `null`. #7062
* [BUGFIX] Scheduler: Avoid all queriers reserved for prioritized requests. #7057
* [BUGFIX] Fix bug where validating metric names uses the wrong validation logic. #7086

## 1.19.1 2025-09-20

Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.20.0-rc.0
1.20.0-rc.1
2 changes: 1 addition & 1 deletion pkg/util/validation/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ func ValidateLabels(validateMetrics *ValidateMetrics, limits *Limits, userID str
return newNoMetricNameError()
}

if !nameValidationScheme.IsValidLabelName(unsafeMetricName) {
if !nameValidationScheme.IsValidMetricName(unsafeMetricName) {
validateMetrics.DiscardedSamples.WithLabelValues(invalidMetricName, userID).Inc()
return newInvalidMetricNameError(unsafeMetricName)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/validation/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func TestValidateLabels(t *testing.T) {
}, "foo "),
},
{
map[model.LabelName]model.LabelValue{model.MetricNameLabel: "valid"},
map[model.LabelName]model.LabelValue{model.MetricNameLabel: "valid:name"},
false,
nil,
},
Expand Down Expand Up @@ -201,7 +201,7 @@ func TestValidateLabels(t *testing.T) {
# HELP cortex_label_size_bytes The combined size in bytes of all labels and label values for a time series.
# TYPE cortex_label_size_bytes histogram
cortex_label_size_bytes_bucket{user="testUser",le="+Inf"} 3
cortex_label_size_bytes_sum{user="testUser"} 148
cortex_label_size_bytes_sum{user="testUser"} 153
cortex_label_size_bytes_count{user="testUser"} 3
`), "cortex_label_size_bytes"))

Expand Down
Loading