mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix

Browse source
This commit is contained in:
Owen Williams 2025-02-26 12:32:09 -05:00
parent aaf629336e
commit 6504ed5ec1
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scrape/scrape.go
View file

@ -619,10 +619,16 @@ func (sp *scrapePool) refreshTargetLimitErr() error {
func (sp *scrapePool) schemesFromConfig() (validationScheme model.ValidationScheme, escapingScheme model.EscapingScheme, err error) {
validationScheme = model.UTF8Validation
if sp.config.MetricNameValidationScheme == config.LegacyValidationConfig {
switch sp.config.MetricNameValidationScheme {
case "", config.UTF8ValidationConfig:
case config.LegacyValidationConfig:
validationScheme = model.LegacyValidation
default:
return model.UTF8Validation, model.UnderscoreEscaping, fmt.Errorf("invalid metric name validation scheme, %s", sp.config.MetricNameValidationScheme)
}
// Escaping scheme is default-implied by the validation scheme, but can be
// overridden.
switch validationScheme {
case model.LegacyValidation:
escapingScheme = model.UnderscoreEscaping
@ -634,12 +640,13 @@ func (sp *scrapePool) schemesFromConfig() (validationScheme model.ValidationSche
var err error
escapingScheme, err = model.ToEscapingScheme(sp.config.MetricNameEscapingScheme)
if err != nil {
return model.LegacyValidation, model.UnderscoreEscaping, fmt.Errorf("invalid metric name escaping scheme, %w", err)
return model.UTF8Validation, model.UnderscoreEscaping, fmt.Errorf("invalid metric name escaping scheme, %w", err)
}
}
// Check for an invalid combination of settings.
if escapingScheme == model.NoEscaping && validationScheme == model.LegacyValidation {
return model.LegacyValidation, model.UnderscoreEscaping, errors.New("cannot request UTF-8 names when validation is set to Legacy")
return model.UTF8Validation, model.UnderscoreEscaping, errors.New("cannot request UTF-8 names when validation is set to Legacy")
}
return validationScheme, escapingScheme, nil
}