Skip to content

validation/limits: remove name ValidationSchemeValue in favor of prometheus/common/model.ValidationScheme #12505

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
juliusmh merged 1 commit into from
Aug 26, 2025
Merged

validation/limits: remove name ValidationSchemeValue in favor of prometheus/common/model.ValidationScheme #12505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pkg/distributor/otel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ func TestHandlerOTLPPush(t *testing.T) {

testLimits := &validation.Limits{
PromoteOTelResourceAttributes: tt.promoteResourceAttributes,
NameValidationScheme: validation.ValidationSchemeValue(model.LegacyValidation),
NameValidationScheme: model.LegacyValidation,
OTelMetricSuffixesEnabled: false,
}
limits := validation.NewOverrides(
Expand Down Expand Up @@ -1381,7 +1381,7 @@ func TestHandler_otlpDroppedMetricsPanic(t *testing.T) {

limits := validation.NewOverrides(
validation.Limits{
NameValidationScheme: validation.ValidationSchemeValue(model.LegacyValidation),
NameValidationScheme: model.LegacyValidation,
OTelTranslationStrategy: validation.OTelTranslationStrategyValue(otlptranslator.UnderscoreEscapingWithoutSuffixes),
},
validation.NewMockTenantLimits(map[string]*validation.Limits{}),
Expand Down
4 changes: 2 additions & 2 deletions pkg/distributor/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ func TestValidateLabels(t *testing.T) {
limits := *limits
perTenant[userID] = &limits
}
perTenant[defaultUserID].NameValidationScheme = validation.ValidationSchemeValue(model.LegacyValidation)
perTenant[utf8UserID].NameValidationScheme = validation.ValidationSchemeValue(model.UTF8Validation)
perTenant[defaultUserID].NameValidationScheme = model.LegacyValidation
perTenant[utf8UserID].NameValidationScheme = model.UTF8Validation

overrides := func(limits *validation.Limits) *validation.Overrides {
return testutils.NewMockCostAttributionOverrides(*limits, perTenant, 0,
Expand Down
10 changes: 5 additions & 5 deletions pkg/util/validation/limits.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ type Limits struct {
IngestionPartitionsTenantShardSize int `yaml:"ingestion_partitions_tenant_shard_size" json:"ingestion_partitions_tenant_shard_size" category:"experimental"`

// NameValidationScheme is the validation scheme for metric and label names.
NameValidationScheme ValidationSchemeValue `yaml:"name_validation_scheme" json:"name_validation_scheme" category:"experimental"`
NameValidationScheme model.ValidationScheme `yaml:"name_validation_scheme" json:"name_validation_scheme" category:"experimental"`

extensions map[string]interface{}
}
Expand Down Expand Up @@ -568,15 +568,15 @@ func (l *Limits) MarshalYAML() (interface{}, error) {

// Validate the Limits.
func (l *Limits) Validate() error {
switch model.ValidationScheme(l.NameValidationScheme) {
switch l.NameValidationScheme {
case model.UTF8Validation, model.LegacyValidation:
case model.UnsetValidation:
l.NameValidationScheme = ValidationSchemeValue(model.LegacyValidation)
l.NameValidationScheme = model.LegacyValidation
default:
return fmt.Errorf("unrecognized name validation scheme: %s", l.NameValidationScheme)
}

validationScheme := model.ValidationScheme(l.NameValidationScheme)
validationScheme := l.NameValidationScheme
switch otlptranslator.TranslationStrategyOption(l.OTelTranslationStrategy) {
case otlptranslator.UnderscoreEscapingWithoutSuffixes:
if validationScheme != model.LegacyValidation {
Expand Down Expand Up @@ -1518,7 +1518,7 @@ func (o *Overrides) LabelsQueryOptimizerEnabled(userID string) bool {

// NameValidationScheme returns the name validation scheme to use for a particular tenant.
func (o *Overrides) NameValidationScheme(userID string) model.ValidationScheme {
return model.ValidationScheme(o.getOverridesForUser(userID).NameValidationScheme)
return o.getOverridesForUser(userID).NameValidationScheme
}

// CardinalityAnalysisMaxResults returns the maximum number of results that
Expand Down
54 changes: 27 additions & 27 deletions pkg/util/validation/limits_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func TestLimitsLoadingFromYaml(t *testing.T) {
input: `{}`,
testFunc: func(t *testing.T, l Limits) {
assert.Equal(t, 1024, l.MaxLabelNameLength)
assert.Equal(t, ValidationSchemeValue(model.LegacyValidation), l.NameValidationScheme)
assert.Equal(t, model.LegacyValidation, l.NameValidationScheme)
},
},
{
Expand All @@ -87,14 +87,14 @@ func TestLimitsLoadingFromYaml(t *testing.T) {
name: "name_validation_scheme: legacy",
input: `name_validation_scheme: "legacy"`,
testFunc: func(t *testing.T, l Limits) {
assert.Equal(t, ValidationSchemeValue(model.LegacyValidation), l.NameValidationScheme)
assert.Equal(t, model.LegacyValidation, l.NameValidationScheme)
},
},
{
name: "name_validation_scheme: utf8",
input: `name_validation_scheme: "utf8"`,
testFunc: func(t *testing.T, l Limits) {
assert.Equal(t, ValidationSchemeValue(model.UTF8Validation), l.NameValidationScheme)
assert.Equal(t, model.UTF8Validation, l.NameValidationScheme)
},
},
}
Expand All @@ -120,7 +120,7 @@ func TestLimitsLoadingFromJson(t *testing.T) {
input: `{}`,
testFunc: func(t *testing.T, l Limits) {
assert.Equal(t, 1024, l.MaxLabelNameLength)
assert.Equal(t, ValidationSchemeValue(model.LegacyValidation), l.NameValidationScheme)
assert.Equal(t, model.LegacyValidation, l.NameValidationScheme)
},
},
{
Expand All @@ -134,7 +134,7 @@ func TestLimitsLoadingFromJson(t *testing.T) {
name: "name_validation_scheme: utf8",
input: `{"name_validation_scheme": "utf8"}`,
testFunc: func(t *testing.T, l Limits) {
assert.Equal(t, ValidationSchemeValue(model.UTF8Validation), l.NameValidationScheme)
assert.Equal(t, model.UTF8Validation, l.NameValidationScheme)
},
},
}
Expand Down Expand Up @@ -1589,7 +1589,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.LegacyValidation)
cfg.NameValidationScheme = model.LegacyValidation
cfg.OTelMetricSuffixesEnabled = false
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue(otlptranslator.UnderscoreEscapingWithoutSuffixes)
return cfg
Expand All @@ -1600,7 +1600,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.LegacyValidation)
cfg.NameValidationScheme = model.LegacyValidation
cfg.OTelMetricSuffixesEnabled = true
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue(otlptranslator.UnderscoreEscapingWithSuffixes)
return cfg
Expand All @@ -1611,7 +1611,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.UTF8Validation)
cfg.NameValidationScheme = model.UTF8Validation
cfg.OTelMetricSuffixesEnabled = true
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue(otlptranslator.NoUTF8EscapingWithSuffixes)
return cfg
Expand All @@ -1622,7 +1622,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.UTF8Validation)
cfg.NameValidationScheme = model.UTF8Validation
cfg.OTelMetricSuffixesEnabled = false
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue(otlptranslator.NoTranslation)
return cfg
Expand All @@ -1633,7 +1633,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.LegacyValidation)
cfg.NameValidationScheme = model.LegacyValidation
cfg.OTelMetricSuffixesEnabled = false
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue("")
return cfg
Expand All @@ -1648,7 +1648,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.LegacyValidation)
cfg.NameValidationScheme = model.LegacyValidation
cfg.OTelMetricSuffixesEnabled = true
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue("")
return cfg
Expand All @@ -1663,7 +1663,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.UTF8Validation)
cfg.NameValidationScheme = model.UTF8Validation
cfg.OTelMetricSuffixesEnabled = true
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue("")
return cfg
Expand All @@ -1678,7 +1678,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.UTF8Validation)
cfg.NameValidationScheme = model.UTF8Validation
cfg.OTelMetricSuffixesEnabled = false
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue("")
return cfg
Expand All @@ -1693,7 +1693,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.UTF8Validation)
cfg.NameValidationScheme = model.UTF8Validation
cfg.OTelMetricSuffixesEnabled = false
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue(otlptranslator.UnderscoreEscapingWithoutSuffixes)
return cfg
Expand All @@ -1704,7 +1704,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.LegacyValidation)
cfg.NameValidationScheme = model.LegacyValidation
cfg.OTelMetricSuffixesEnabled = true
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue(otlptranslator.UnderscoreEscapingWithoutSuffixes)
return cfg
Expand All @@ -1715,7 +1715,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.UTF8Validation)
cfg.NameValidationScheme = model.UTF8Validation
cfg.OTelMetricSuffixesEnabled = true
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue(otlptranslator.UnderscoreEscapingWithSuffixes)
return cfg
Expand All @@ -1726,7 +1726,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.LegacyValidation)
cfg.NameValidationScheme = model.LegacyValidation
cfg.OTelMetricSuffixesEnabled = false
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue(otlptranslator.UnderscoreEscapingWithSuffixes)
return cfg
Expand All @@ -1737,7 +1737,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.LegacyValidation)
cfg.NameValidationScheme = model.LegacyValidation
cfg.OTelMetricSuffixesEnabled = true
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue(otlptranslator.NoUTF8EscapingWithSuffixes)
return cfg
Expand All @@ -1748,7 +1748,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.UTF8Validation)
cfg.NameValidationScheme = model.UTF8Validation
cfg.OTelMetricSuffixesEnabled = false
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue(otlptranslator.NoUTF8EscapingWithSuffixes)
return cfg
Expand All @@ -1759,7 +1759,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.LegacyValidation)
cfg.NameValidationScheme = model.LegacyValidation
cfg.OTelMetricSuffixesEnabled = false
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue(otlptranslator.NoTranslation)
return cfg
Expand All @@ -1770,7 +1770,7 @@ func TestLimits_Validate(t *testing.T) {
cfg: func() Limits {
cfg := Limits{}
flagext.DefaultValues(&cfg)
cfg.NameValidationScheme = ValidationSchemeValue(model.UTF8Validation)
cfg.NameValidationScheme = model.UTF8Validation
cfg.OTelMetricSuffixesEnabled = true
cfg.OTelTranslationStrategy = OTelTranslationStrategyValue(otlptranslator.NoTranslation)
return cfg
Expand Down Expand Up @@ -2180,7 +2180,7 @@ func TestOverrides_OTelTranslationStrategy(t *testing.T) {
limits: map[string]*Limits{
"tenant1": {
OTelTranslationStrategy: OTelTranslationStrategyValue(otlptranslator.UnderscoreEscapingWithSuffixes),
NameValidationScheme: ValidationSchemeValue(model.UTF8Validation),
NameValidationScheme: model.UTF8Validation,
OTelMetricSuffixesEnabled: false,
},
},
Expand All @@ -2192,7 +2192,7 @@ func TestOverrides_OTelTranslationStrategy(t *testing.T) {
limits: map[string]*Limits{
"tenant1": {
OTelTranslationStrategy: OTelTranslationStrategyValue(""),
NameValidationScheme: ValidationSchemeValue(model.LegacyValidation),
NameValidationScheme: model.LegacyValidation,
OTelMetricSuffixesEnabled: true,
},
},
Expand All @@ -2204,7 +2204,7 @@ func TestOverrides_OTelTranslationStrategy(t *testing.T) {
limits: map[string]*Limits{
"tenant1": {
OTelTranslationStrategy: OTelTranslationStrategyValue(""),
NameValidationScheme: ValidationSchemeValue(model.LegacyValidation),
NameValidationScheme: model.LegacyValidation,
OTelMetricSuffixesEnabled: false,
},
},
Expand All @@ -2216,7 +2216,7 @@ func TestOverrides_OTelTranslationStrategy(t *testing.T) {
limits: map[string]*Limits{
"tenant1": {
OTelTranslationStrategy: OTelTranslationStrategyValue(""),
NameValidationScheme: ValidationSchemeValue(model.UTF8Validation),
NameValidationScheme: model.UTF8Validation,
OTelMetricSuffixesEnabled: true,
},
},
Expand All @@ -2228,7 +2228,7 @@ func TestOverrides_OTelTranslationStrategy(t *testing.T) {
limits: map[string]*Limits{
"tenant1": {
OTelTranslationStrategy: OTelTranslationStrategyValue(""),
NameValidationScheme: ValidationSchemeValue(model.UTF8Validation),
NameValidationScheme: model.UTF8Validation,
OTelMetricSuffixesEnabled: false,
},
},
Expand Down Expand Up @@ -2257,7 +2257,7 @@ func TestOverrides_OTelTranslationStrategy(t *testing.T) {
limits := map[string]*Limits{
"tenant1": {
OTelTranslationStrategy: OTelTranslationStrategyValue(""),
NameValidationScheme: ValidationSchemeValue(999), // Invalid scheme
NameValidationScheme: model.ValidationScheme(999), // Invalid scheme
OTelMetricSuffixesEnabled: true,
},
}
Expand Down
79 changes: 0 additions & 79 deletions pkg/util/validation/validation_scheme_value.go
View file
Open in desktop

This file was deleted.

Loading
Loading