fix: adjust tests for missing default in relabel config; set default relabel validation scheme when unmarshaling limits

Author: juliusmh

pkg/distributor/distributor_test.go

@@ -5342,11 +5342,12 @@ func TestRelabelMiddleware(t *testing.T) {
 			ctx:  ctxWithUser,
 			relabelConfigs: []*relabel.Config{
 				{
-					SourceLabels: []model.LabelName{"label1"},
-					Action:       relabel.DefaultRelabelConfig.Action,
-					Regex:        relabel.DefaultRelabelConfig.Regex,
-					TargetLabel:  "target",
-					Replacement:  "prefix_$1",
+					SourceLabels:               []model.LabelName{"label1"},
+					Action:                     relabel.DefaultRelabelConfig.Action,
+					Regex:                      relabel.DefaultRelabelConfig.Regex,
+					TargetLabel:                "target",
+					Replacement:                "prefix_$1",
+					MetricNameValidationScheme: model.UTF8Validation,
 				},
 			},
 			relabelingEnabled: true,
@@ -5376,11 +5377,12 @@ func TestRelabelMiddleware(t *testing.T) {
 			ctx:  ctxWithUser,
 			relabelConfigs: []*relabel.Config{
 				{
-					SourceLabels: []model.LabelName{metaLabelTenantID},
-					Action:       relabel.DefaultRelabelConfig.Action,
-					Regex:        relabel.DefaultRelabelConfig.Regex,
-					TargetLabel:  "tenant_id",
-					Replacement:  "$1",
+					SourceLabels:               []model.LabelName{metaLabelTenantID},
+					Action:                     relabel.DefaultRelabelConfig.Action,
+					Regex:                      relabel.DefaultRelabelConfig.Regex,
+					TargetLabel:                "tenant_id",
+					Replacement:                "$1",
+					MetricNameValidationScheme: model.UTF8Validation,
 				},
 			},
 			relabelingEnabled: true,
@@ -7468,11 +7470,12 @@ func TestDistributor_Push_Relabel(t *testing.T) {
 			expectedSeries: labelAdapters("__name__", "foo", "cluster", "two"),
 			metricRelabelConfigs: []*relabel.Config{
 				{
-					SourceLabels: []model.LabelName{"cluster"},
-					Action:       relabel.DefaultRelabelConfig.Action,
-					Regex:        relabel.DefaultRelabelConfig.Regex,
-					TargetLabel:  "cluster",
-					Replacement:  "two",
+					SourceLabels:               []model.LabelName{"cluster"},
+					Action:                     relabel.DefaultRelabelConfig.Action,
+					Regex:                      relabel.DefaultRelabelConfig.Regex,
+					TargetLabel:                "cluster",
+					Replacement:                "two",
+					MetricNameValidationScheme: model.UTF8Validation,
 				},
 			},
 		},

pkg/util/validation/limits.go

@@ -525,6 +525,16 @@ func (l *Limits) unmarshal(decode func(any) error) error {
 	}
 	l.extensions = getExtensions()
 
+	// Set relabel config name validation scheme to match the requested validation scheme for this tenant.
+	for _, relabelCfg := range l.MetricRelabelConfigs {
+		if relabelCfg == nil {
+			continue
+		}
+		// TODO: for now this is hard coded, but will change when Limits correctly stores
+		// a setting for controlling validation scheme.
+		relabelCfg.MetricNameValidationScheme = model.LegacyValidation
+	}
+
 	return l.validate()
 }
 

pkg/util/validation/limits_test.go

@@ -159,6 +159,7 @@ metric_relabel_configs:
 `
 	exp := relabel.DefaultRelabelConfig
 	exp.Action = relabel.Drop
+	exp.MetricNameValidationScheme = model.LegacyValidation
 	regex, err := relabel.NewRegexp(".+")
 	require.NoError(t, err)
 	exp.Regex = regex