Skip to content

Commit 6a1ece6

Browse files
committed
use ValidationScheme.IsValidLabelName
Signed-off-by: SungJin1212 <tjdwls1201@gmail.com>
1 parent 988a8b1 commit 6a1ece6

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

pkg/util/validation/limits.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,8 @@ func (l *Limits) Validate(shardByAllLabels bool, activeSeriesMetricsEnabled bool
375375
if l.MaxLocalNativeHistogramSeriesPerUser > 0 && !activeSeriesMetricsEnabled {
376376
return errMaxLocalNativeHistogramSeriesPerUserValidation
377377
}
378-
379378
if err := l.RulerExternalLabels.Validate(func(l labels.Label) error {
380-
if !model.LabelName(l.Name).IsValid() {
379+
if !model.UTF8Validation.IsValidLabelName(l.Name) {
381380
return fmt.Errorf("%w: %q", errInvalidLabelName, l.Name)
382381
}
383382
if !model.LabelValue(l.Value).IsValid() {

pkg/util/validation/validate.go

Lines changed: 2 additions & 2 deletions
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 !model.IsValidMetricName(model.LabelValue(unsafeMetricName)) {
288+
if !model.UTF8Validation.IsValidMetricName(unsafeMetricName) {
289289
validateMetrics.DiscardedSamples.WithLabelValues(invalidMetricName, userID).Inc()
290290
return newInvalidMetricNameError(unsafeMetricName)
291291
}
@@ -304,7 +304,7 @@ func ValidateLabels(validateMetrics *ValidateMetrics, limits *Limits, userID str
304304
labelsSizeBytes := 0
305305

306306
for _, l := range ls {
307-
if !skipLabelNameValidation && !model.LabelName(l.Name).IsValid() {
307+
if !skipLabelNameValidation && !model.UTF8Validation.IsValidLabelName(l.Name) {
308308
validateMetrics.DiscardedSamples.WithLabelValues(invalidLabel, userID).Inc()
309309
return newInvalidLabelError(ls, l.Name)
310310
} else if len(l.Name) > maxLabelNameLength {

0 commit comments

Comments
 (0)