From 94b43c5d4c861b8ec380c5e6002c2dcf4c15fa5d Mon Sep 17 00:00:00 2001
From: Owen Williams <owen.williams@grafana.com>
Date: Wed, 26 Feb 2025 10:55:26 -0500
Subject: [PATCH] utf8: Remove support for legacy global validation setting
Global and Data Source configurations can specify legacy mode, but Prometheus now requires that the overall validation mode be set to UTF-8
Signed-off-by: Owen Williams <owen.williams@grafana.com>
---
cmd/prometheus/main.go | 3 +-
cmd/prometheus/main_test.go | 2 +-
cmd/promtool/main.go | 2 +-
cmd/promtool/main_test.go | 2 +-
config/config.go | 9 ++---
config/config_test.go | 47 +---------------------
config/testdata/labelmap.bad.yml | 2 +-
config/testdata/labelname.bad.yml | 2 +-
config/testdata/labelname2.bad.yml | 3 --
config/testdata/lowercase2.bad.yml | 6 ---
config/testdata/static_config.bad.json | 7 ----
config/testdata/static_config.bad.yml | 2 +-
config/testdata/uppercase2.bad.yml | 6 ---
model/labels/labels_common.go | 4 +-
model/labels/labels_test.go | 50 ++++++------------------
model/relabel/relabel.go | 5 ---
model/textparse/openmetricsparse_test.go | 6 ---
model/textparse/promparse_test.go | 6 ---
promql/parser/parse_test.go | 1 -
promql/parser/printer_test.go | 3 --
promql/promqltest/test.go | 4 --
scrape/manager_test.go | 5 ---
scrape/scrape_test.go | 9 +----
storage/remote/codec_test.go | 25 +++---------
storage/remote/write_handler.go | 4 +-
web/api/v1/api_test.go | 12 ++----
26 files changed, 39 insertions(+), 188 deletions(-)
delete mode 100644 config/testdata/labelname2.bad.yml
delete mode 100644 config/testdata/lowercase2.bad.yml
delete mode 100644 config/testdata/static_config.bad.json
delete mode 100644 config/testdata/uppercase2.bad.yml
diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go
index e45b2307d2..e73fb2570c 100644
--- a/cmd/prometheus/main.go
+++ b/cmd/prometheus/main.go
@@ -140,8 +140,9 @@ var (
)
func init() {
- // This can be removed when the default validation scheme in common is updated.
+ // This can be removed when the legacy global mode is fully deprecated.
model.NameValidationScheme = model.UTF8Validation
+
prometheus.MustRegister(versioncollector.NewCollector(strings.ReplaceAll(appName, "-", "_")))
var err error
diff --git a/cmd/prometheus/main_test.go b/cmd/prometheus/main_test.go
index 6f9b8a2e41..ccd49b349e 100644
--- a/cmd/prometheus/main_test.go
+++ b/cmd/prometheus/main_test.go
@@ -44,7 +44,7 @@ import (
)
func init() {
- // This can be removed when the default validation scheme in common is updated.
+ // This can be removed when the legacy global mode is fully deprecated.
model.NameValidationScheme = model.UTF8Validation
}
diff --git a/cmd/promtool/main.go b/cmd/promtool/main.go
index 81fdd8f4ff..6aafacb455 100644
--- a/cmd/promtool/main.go
+++ b/cmd/promtool/main.go
@@ -63,7 +63,7 @@ import (
)
func init() {
- // This can be removed when the default validation scheme in common is updated.
+ // This can be removed when the legacy global mode is fully deprecated.
model.NameValidationScheme = model.UTF8Validation
}
diff --git a/cmd/promtool/main_test.go b/cmd/promtool/main_test.go
index 5d36a66fcd..ec32b0ac6c 100644
--- a/cmd/promtool/main_test.go
+++ b/cmd/promtool/main_test.go
@@ -40,7 +40,7 @@ import (
)
func init() {
- // This can be removed when the default validation scheme in common is updated.
+ // This can be removed when the legacy global mode is fully deprecated.
model.NameValidationScheme = model.UTF8Validation
}
diff --git a/config/config.go b/config/config.go
index a395c3f53e..1970346e1c 100644
--- a/config/config.go
+++ b/config/config.go
@@ -837,12 +837,11 @@ func (c *ScrapeConfig) Validate(globalConfig GlobalConfig) error {
}
}
+ if model.NameValidationScheme != model.UTF8Validation {
+ return errors.New("model.NameValidationScheme must be set to UTF8")
+ }
switch globalConfig.MetricNameValidationScheme {
- case LegacyValidationConfig:
- case "", UTF8ValidationConfig:
- if model.NameValidationScheme != model.UTF8Validation {
- panic("utf8 name validation requested but model.NameValidationScheme is not set to UTF8")
- }
+ case "", LegacyValidationConfig, UTF8ValidationConfig:
default:
return fmt.Errorf("unknown name validation method specified, must be either 'legacy' or 'utf8', got %s", globalConfig.MetricNameValidationScheme)
}
diff --git a/config/config_test.go b/config/config_test.go
index faca7dda12..295e835f1e 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -15,7 +15,6 @@ package config
import (
"crypto/tls"
- "encoding/json"
"fmt"
"net/url"
"os"
@@ -62,11 +61,6 @@ import (
"github.com/prometheus/prometheus/util/testutil"
)
-func init() {
- // This can be removed when the default validation scheme in common is updated.
- model.NameValidationScheme = model.UTF8Validation
-}
-
func mustParseURL(u string) *config.URL {
parsed, err := url.Parse(u)
if err != nil {
@@ -1716,11 +1710,7 @@ var expectedErrors = []struct {
},
{
filename: "labelname.bad.yml",
- errMsg: `"not$allowed" is not a valid label name`,
- },
- {
- filename: "labelname2.bad.yml",
- errMsg: `"not:allowed" is not a valid label name`,
+ errMsg: `"\xff" is not a valid label name`,
},
{
filename: "labelvalue.bad.yml",
@@ -1792,16 +1782,12 @@ var expectedErrors = []struct {
},
{
filename: "labelmap.bad.yml",
- errMsg: "\"l-$1\" is invalid 'replacement' for labelmap action",
+ errMsg: "!!binary value contains invalid base64 data",
},
{
filename: "lowercase.bad.yml",
errMsg: "relabel configuration for lowercase action requires 'target_label' value",
},
- {
- filename: "lowercase2.bad.yml",
- errMsg: "\"42lab\" is invalid 'target_label' for lowercase action",
- },
{
filename: "lowercase3.bad.yml",
errMsg: "'replacement' can not be set for lowercase action",
@@ -1810,10 +1796,6 @@ var expectedErrors = []struct {
filename: "uppercase.bad.yml",
errMsg: "relabel configuration for uppercase action requires 'target_label' value",
},
- {
- filename: "uppercase2.bad.yml",
- errMsg: "\"42lab\" is invalid 'target_label' for uppercase action",
- },
{
filename: "uppercase3.bad.yml",
errMsg: "'replacement' can not be set for uppercase action",
@@ -2181,10 +2163,6 @@ var expectedErrors = []struct {
}
func TestBadConfigs(t *testing.T) {
- model.NameValidationScheme = model.LegacyValidation
- defer func() {
- model.NameValidationScheme = model.UTF8Validation
- }()
for _, ee := range expectedErrors {
_, err := LoadFile("testdata/"+ee.filename, false, promslog.NewNopLogger())
require.ErrorContains(t, err, ee.errMsg,
@@ -2192,23 +2170,7 @@ func TestBadConfigs(t *testing.T) {
}
}
-func TestBadStaticConfigsJSON(t *testing.T) {
- model.NameValidationScheme = model.LegacyValidation
- defer func() {
- model.NameValidationScheme = model.UTF8Validation
- }()
- content, err := os.ReadFile("testdata/static_config.bad.json")
- require.NoError(t, err)
- var tg targetgroup.Group
- err = json.Unmarshal(content, &tg)
- require.Error(t, err)
-}
-
func TestBadStaticConfigsYML(t *testing.T) {
- model.NameValidationScheme = model.LegacyValidation
- defer func() {
- model.NameValidationScheme = model.UTF8Validation
- }()
content, err := os.ReadFile("testdata/static_config.bad.yml")
require.NoError(t, err)
var tg targetgroup.Group
@@ -2453,11 +2415,6 @@ func TestScrapeConfigDisableCompression(t *testing.T) {
}
func TestScrapeConfigNameValidationSettings(t *testing.T) {
- model.NameValidationScheme = model.UTF8Validation
- defer func() {
- model.NameValidationScheme = model.LegacyValidation
- }()
-
tests := []struct {
name string
inputFile string
diff --git a/config/testdata/labelmap.bad.yml b/config/testdata/labelmap.bad.yml
index 29d2653990..b8aa117acf 100644
--- a/config/testdata/labelmap.bad.yml
+++ b/config/testdata/labelmap.bad.yml
@@ -2,4 +2,4 @@ scrape_configs:
- job_name: prometheus
relabel_configs:
- action: labelmap
- replacement: l-$1
+ replacement: !!binary "/w==$1"
diff --git a/config/testdata/labelname.bad.yml b/config/testdata/labelname.bad.yml
index c06853a26b..0c9c5ef3b2 100644
--- a/config/testdata/labelname.bad.yml
+++ b/config/testdata/labelname.bad.yml
@@ -1,3 +1,3 @@
global:
external_labels:
- not$allowed: value
+ !!binary "/w==": value
diff --git a/config/testdata/labelname2.bad.yml b/config/testdata/labelname2.bad.yml
deleted file mode 100644
index 7afcd6bcfc..0000000000
--- a/config/testdata/labelname2.bad.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-global:
- external_labels:
- 'not:allowed': value
diff --git a/config/testdata/lowercase2.bad.yml b/config/testdata/lowercase2.bad.yml
deleted file mode 100644
index bde8862c66..0000000000
--- a/config/testdata/lowercase2.bad.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-scrape_configs:
- - job_name: prometheus
- relabel_configs:
- - action: lowercase
- source_labels: [__name__]
- target_label: 42lab
diff --git a/config/testdata/static_config.bad.json b/config/testdata/static_config.bad.json
deleted file mode 100644
index 6050ed9c50..0000000000
--- a/config/testdata/static_config.bad.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "targets": ["1.2.3.4:9100"],
- "labels": {
- "some_valid_label": "foo",
- "oops:this-label-is-invalid": "bar"
- }
-}
diff --git a/config/testdata/static_config.bad.yml b/config/testdata/static_config.bad.yml
index 1d229ec5e7..7e9003dcbf 100644
--- a/config/testdata/static_config.bad.yml
+++ b/config/testdata/static_config.bad.yml
@@ -1,4 +1,4 @@
targets: ['1.2.3.4:9001', '1.2.3.5:9090']
labels:
valid_label: foo
- not:valid_label: bar
+ !!binary "/w==": bar
diff --git a/config/testdata/uppercase2.bad.yml b/config/testdata/uppercase2.bad.yml
deleted file mode 100644
index 330b9aceb6..0000000000
--- a/config/testdata/uppercase2.bad.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-scrape_configs:
- - job_name: prometheus
- relabel_configs:
- - action: uppercase
- source_labels: [__name__]
- target_label: 42lab
diff --git a/model/labels/labels_common.go b/model/labels/labels_common.go
index a232eeea5d..005eaa509e 100644
--- a/model/labels/labels_common.go
+++ b/model/labels/labels_common.go
@@ -104,14 +104,14 @@ func (ls Labels) IsValid(validationScheme model.ValidationScheme) bool {
if l.Name == model.MetricNameLabel {
// If the default validation scheme has been overridden with legacy mode,
// we need to call the special legacy validation checker.
- if validationScheme == model.LegacyValidation && model.NameValidationScheme == model.UTF8Validation && !model.IsValidLegacyMetricName(string(model.LabelValue(l.Value))) {
+ if validationScheme == model.LegacyValidation && !model.IsValidLegacyMetricName(string(model.LabelValue(l.Value))) {
return strconv.ErrSyntax
}
if !model.IsValidMetricName(model.LabelValue(l.Value)) {
return strconv.ErrSyntax
}
}
- if validationScheme == model.LegacyValidation && model.NameValidationScheme == model.UTF8Validation {
+ if validationScheme == model.LegacyValidation {
if !model.LabelName(l.Name).IsValidLegacy() || !model.LabelValue(l.Value).IsValid() {
return strconv.ErrSyntax
}
diff --git a/model/labels/labels_test.go b/model/labels/labels_test.go
index 06802d6f3e..a2a7734326 100644
--- a/model/labels/labels_test.go
+++ b/model/labels/labels_test.go
@@ -284,10 +284,9 @@ func TestLabels_IsValid(t *testing.T) {
func TestLabels_ValidationModes(t *testing.T) {
for _, test := range []struct {
- input Labels
- globalMode model.ValidationScheme
- callMode model.ValidationScheme
- expected bool
+ input Labels
+ callMode model.ValidationScheme
+ expected bool
}{
{
input: FromStrings(
@@ -295,9 +294,8 @@ func TestLabels_ValidationModes(t *testing.T) {
"hostname", "localhost",
"job", "check",
),
- globalMode: model.UTF8Validation,
- callMode: model.UTF8Validation,
- expected: true,
+ callMode: model.UTF8Validation,
+ expected: true,
},
{
input: FromStrings(
@@ -305,31 +303,8 @@ func TestLabels_ValidationModes(t *testing.T) {
"\xc5 bad utf8", "localhost",
"job", "check",
),
- globalMode: model.UTF8Validation,
- callMode: model.UTF8Validation,
- expected: false,
- },
- {
- // Setting the common model to legacy validation and then trying to check for UTF-8 on a
- // per-call basis is not supported.
- input: FromStrings(
- "__name__", "test.utf8.metric",
- "hostname", "localhost",
- "job", "check",
- ),
- globalMode: model.LegacyValidation,
- callMode: model.UTF8Validation,
- expected: false,
- },
- {
- input: FromStrings(
- "__name__", "test",
- "hostname", "localhost",
- "job", "check",
- ),
- globalMode: model.LegacyValidation,
- callMode: model.LegacyValidation,
- expected: true,
+ callMode: model.UTF8Validation,
+ expected: false,
},
{
input: FromStrings(
@@ -337,9 +312,8 @@ func TestLabels_ValidationModes(t *testing.T) {
"hostname", "localhost",
"job", "check",
),
- globalMode: model.UTF8Validation,
- callMode: model.LegacyValidation,
- expected: false,
+ callMode: model.LegacyValidation,
+ expected: false,
},
{
input: FromStrings(
@@ -347,12 +321,10 @@ func TestLabels_ValidationModes(t *testing.T) {
"host.name", "localhost",
"job", "check",
),
- globalMode: model.UTF8Validation,
- callMode: model.LegacyValidation,
- expected: false,
+ callMode: model.LegacyValidation,
+ expected: false,
},
} {
- model.NameValidationScheme = test.globalMode
require.Equal(t, test.expected, test.input.IsValid(test.callMode))
}
}
diff --git a/model/relabel/relabel.go b/model/relabel/relabel.go
index 1373484426..70daef426f 100644
--- a/model/relabel/relabel.go
+++ b/model/relabel/relabel.go
@@ -135,11 +135,6 @@ func (c *Config) Validate() error {
// Design escaping mechanism to allow that, once valid use case appears.
return model.LabelName(value).IsValid()
}
- if model.NameValidationScheme == model.LegacyValidation {
- isValidLabelNameWithRegexVarFn = func(value string) bool {
- return relabelTargetLegacy.MatchString(value)
- }
- }
if c.Action == Replace && varInRegexTemplate(c.TargetLabel) && !isValidLabelNameWithRegexVarFn(c.TargetLabel) {
return fmt.Errorf("%q is invalid 'target_label' for %s action", c.TargetLabel, c.Action)
}
diff --git a/model/textparse/openmetricsparse_test.go b/model/textparse/openmetricsparse_test.go
index 7d3591d33d..e7261a24c6 100644
--- a/model/textparse/openmetricsparse_test.go
+++ b/model/textparse/openmetricsparse_test.go
@@ -469,12 +469,6 @@ foobar{quantile="0.99"} 150.1`
}
func TestUTF8OpenMetricsParse(t *testing.T) {
- oldValidationScheme := model.NameValidationScheme
- model.NameValidationScheme = model.UTF8Validation
- defer func() {
- model.NameValidationScheme = oldValidationScheme
- }()
-
input := `# HELP "go.gc_duration_seconds" A summary of the GC invocation durations.
# TYPE "go.gc_duration_seconds" summary
# UNIT "go.gc_duration_seconds" seconds
diff --git a/model/textparse/promparse_test.go b/model/textparse/promparse_test.go
index e8cf66f539..203ff25ba5 100644
--- a/model/textparse/promparse_test.go
+++ b/model/textparse/promparse_test.go
@@ -205,12 +205,6 @@ testmetric{le="10"} 1`
}
func TestUTF8PromParse(t *testing.T) {
- oldValidationScheme := model.NameValidationScheme
- model.NameValidationScheme = model.UTF8Validation
- defer func() {
- model.NameValidationScheme = oldValidationScheme
- }()
-
input := `# HELP "go.gc_duration_seconds" A summary of the GC invocation durations.
# TYPE "go.gc_duration_seconds" summary
{"go.gc_duration_seconds",quantile="0"} 4.9351e-05
diff --git a/promql/parser/parse_test.go b/promql/parser/parse_test.go
index 3445fce067..7a4f95d3ab 100644
--- a/promql/parser/parse_test.go
+++ b/promql/parser/parse_test.go
@@ -3970,7 +3970,6 @@ func TestParseExpressions(t *testing.T) {
EnableExperimentalFunctions = false
})
- model.NameValidationScheme = model.UTF8Validation
for _, test := range testExpr {
t.Run(readable(test.input), func(t *testing.T) {
expr, err := ParseExpr(test.input)
diff --git a/promql/parser/printer_test.go b/promql/parser/printer_test.go
index ce06d6ec4b..44a9c62b7d 100644
--- a/promql/parser/printer_test.go
+++ b/promql/parser/printer_test.go
@@ -16,7 +16,6 @@ package parser
import (
"testing"
- "github.com/prometheus/common/model"
"github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/model/labels"
@@ -170,8 +169,6 @@ func TestExprString(t *testing.T) {
},
}
- model.NameValidationScheme = model.UTF8Validation
-
for _, test := range inputs {
expr, err := ParseExpr(test.in)
require.NoError(t, err)
diff --git a/promql/promqltest/test.go b/promql/promqltest/test.go
index e84eeebe6a..4321bf6b39 100644
--- a/promql/promqltest/test.go
+++ b/promql/promqltest/test.go
@@ -57,10 +57,6 @@ const (
DefaultMaxSamplesPerQuery = 10000
)
-func init() {
- model.NameValidationScheme = model.UTF8Validation
-}
-
type TBRun interface {
testing.TB
Run(string, func(*testing.T)) bool
diff --git a/scrape/manager_test.go b/scrape/manager_test.go
index ebd9d8520b..d15b3edcec 100644
--- a/scrape/manager_test.go
+++ b/scrape/manager_test.go
@@ -56,11 +56,6 @@ import (
"github.com/prometheus/prometheus/util/testutil"
)
-func init() {
- // This can be removed when the default validation scheme in common is updated.
- model.NameValidationScheme = model.UTF8Validation
-}
-
func TestPopulateLabels(t *testing.T) {
cases := []struct {
in model.LabelSet
diff --git a/scrape/scrape_test.go b/scrape/scrape_test.go
index 9725d688a5..81cbd1db6f 100644
--- a/scrape/scrape_test.go
+++ b/scrape/scrape_test.go
@@ -1325,14 +1325,13 @@ func TestScrapeLoopSeriesAdded(t *testing.T) {
}
func TestScrapeLoopFailWithInvalidLabelsAfterRelabel(t *testing.T) {
- model.NameValidationScheme = model.LegacyValidation
s := teststorage.New(t)
defer s.Close()
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
target := &Target{
- labels: labels.FromStrings("pod_label_invalid_012", "test"),
+ labels: labels.FromStrings("pod_label_invalid_012\xff", "test"),
}
relabelConfig := []*relabel.Config{{
Action: relabel.LabelMap,
@@ -1357,10 +1356,6 @@ func TestScrapeLoopFailWithInvalidLabelsAfterRelabel(t *testing.T) {
func TestScrapeLoopFailLegacyUnderUTF8(t *testing.T) {
// Test that scrapes fail when default validation is utf8 but scrape config is
// legacy.
- model.NameValidationScheme = model.UTF8Validation
- defer func() {
- model.NameValidationScheme = model.LegacyValidation
- }()
s := teststorage.New(t)
defer s.Close()
ctx, cancel := context.WithCancel(context.Background())
@@ -3711,8 +3706,6 @@ func TestScrapeReportLimit(t *testing.T) {
func TestScrapeUTF8(t *testing.T) {
s := teststorage.New(t)
defer s.Close()
- model.NameValidationScheme = model.UTF8Validation
- t.Cleanup(func() { model.NameValidationScheme = model.LegacyValidation })
cfg := &config.ScrapeConfig{
JobName: "test",
diff --git a/storage/remote/codec_test.go b/storage/remote/codec_test.go
index 3557a87eb5..51cdd1e39a 100644
--- a/storage/remote/codec_test.go
+++ b/storage/remote/codec_test.go
@@ -165,11 +165,6 @@ func TestWriteV2RequestFixture(t *testing.T) {
}
func TestValidateLabelsAndMetricName(t *testing.T) {
- oldScheme := model.NameValidationScheme
- model.NameValidationScheme = model.LegacyValidation
- defer func() {
- model.NameValidationScheme = oldScheme
- }()
tests := []struct {
input []prompb.Label
expectedErr string
@@ -194,18 +189,10 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
{
input: []prompb.Label{
{Name: "__name__", Value: "name"},
- {Name: "@labelName", Value: "labelValue"},
+ {Name: "@labelName\xff", Value: "labelValue"},
},
- expectedErr: "invalid label name: @labelName",
- description: "label name with @",
- },
- {
- input: []prompb.Label{
- {Name: "__name__", Value: "name"},
- {Name: "123labelName", Value: "labelValue"},
- },
- expectedErr: "invalid label name: 123labelName",
- description: "label name starts with numbers",
+ expectedErr: "invalid label name: @labelName\xff",
+ description: "label name with \xff",
},
{
input: []prompb.Label{
@@ -225,10 +212,10 @@ func TestValidateLabelsAndMetricName(t *testing.T) {
},
{
input: []prompb.Label{
- {Name: "__name__", Value: "@invalid_name"},
+ {Name: "__name__", Value: "invalid_name\xff"},
},
- expectedErr: "invalid metric name: @invalid_name",
- description: "metric name starts with @",
+ expectedErr: "invalid metric name: invalid_name\xff",
+ description: "metric name has invalid utf8",
},
{
input: []prompb.Label{
diff --git a/storage/remote/write_handler.go b/storage/remote/write_handler.go
index 355bf19070..bc86024432 100644
--- a/storage/remote/write_handler.go
+++ b/storage/remote/write_handler.go
@@ -251,7 +251,7 @@ func (h *writeHandler) write(ctx context.Context, req *prompb.WriteRequest) (err
// TODO(bwplotka): Even as per 1.0 spec, this should be a 400 error, while other samples are
// potentially written. Perhaps unify with fixed writeV2 implementation a bit.
- if !ls.Has(labels.MetricName) || !ls.IsValid(model.NameValidationScheme) {
+ if !ls.Has(labels.MetricName) || !ls.IsValid(model.UTF8Validation) {
h.logger.Warn("Invalid metric names or labels", "got", ls.String())
samplesWithInvalidLabels++
continue
@@ -392,7 +392,7 @@ func (h *writeHandler) appendV2(app storage.Appender, req *writev2.Request, rs *
// Validate series labels early.
// NOTE(bwplotka): While spec allows UTF-8, Prometheus Receiver may impose
// specific limits and follow https://prometheus.io/docs/specs/remote_write_spec_2_0/#invalid-samples case.
- if !ls.Has(labels.MetricName) || !ls.IsValid(model.NameValidationScheme) {
+ if !ls.Has(labels.MetricName) || !ls.IsValid(model.UTF8Validation) {
badRequestErrs = append(badRequestErrs, fmt.Errorf("invalid metric name or labels, got %v", ls.String()))
samplesWithInvalidLabels += len(ts.Samples) + len(ts.Histograms)
continue
diff --git a/web/api/v1/api_test.go b/web/api/v1/api_test.go
index 98c0e741a7..61106e70be 100644
--- a/web/api/v1/api_test.go
+++ b/web/api/v1/api_test.go
@@ -1117,7 +1117,6 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
metadata []targetMetadata
exemplars []exemplar.QueryResult
zeroFunc func(interface{})
- nameValidationScheme model.ValidationScheme
}
rulesZeroFunc := func(i interface{}) {
@@ -3247,14 +3246,13 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
"boo",
},
},
- // Bad name parameter for legacy validation.
+ // Bad name parameter
{
endpoint: api.labelValues,
params: map[string]string{
- "name": "host.name",
+ "name": "host.name\xff",
},
- nameValidationScheme: model.LegacyValidation,
- errType: errorBadData,
+ errType: errorBadData,
},
// Valid utf8 name parameter for utf8 validation.
{
@@ -3262,7 +3260,6 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
params: map[string]string{
"name": "host.name",
},
- nameValidationScheme: model.UTF8Validation,
response: []string{
"localhost",
},
@@ -3273,7 +3270,6 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
params: map[string]string{
"name": "U__junk_0a__7b__7d__2c__3d_:_20__20_chars",
},
- nameValidationScheme: model.UTF8Validation,
response: []string{
"bar",
},
@@ -3706,8 +3702,6 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
ctx = route.WithParam(ctx, p, v)
}
- model.NameValidationScheme = test.nameValidationScheme
-
req, err := request(method, test.query)
require.NoError(t, err)