Fix use of renamed feature flags

Signed-off-by: George Robinson <george.robinson@grafana.com>
prometheus · Nov 21, 2023 · bfb4b78 · bfb4b78
1 parent 04c6d4c
commit bfb4b78
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cmd/alertmanager/main.go b/cmd/alertmanager/main.go
@@ -180,9 +180,9 @@ func run() int {
 		level.Error(logger).Log("msg", "error parsing the feature flag list", "err", err)
 		return 1
 	}
-	compat.InitFromFlags(logger, featureConfig)
-	silence.InitFromFlags(logger, featureConfig)
 	types.InitFromFlags(logger, featureConfig)
+	silence.InitFromFlags(logger, featureConfig)
+	compat.InitFromFlags(logger, featureConfig)
 
 	err = os.MkdirAll(*dataDir, 0o777)
 	if err != nil {

diff --git a/silence/silence.go b/silence/silence.go
@@ -476,7 +476,7 @@ var ValidateMatcher = func(m *pb.Matcher) error {
 
 // InitFromFlags initializes the validation function from the flagger.
 func InitFromFlags(l log.Logger, f featurecontrol.Flagger) {
-	if !f.ClassicMatchersParsing() {
+	if !f.ClassicMode() {
 		ValidateMatcher = func(m *pb.Matcher) error {
 			return validateUTF8Matcher(m)
 		}

diff --git a/types/types.go b/types/types.go
@@ -330,7 +330,7 @@ func validateUTF8Ls(ls model.LabelSet) error {
 
 // InitFromFlags initializes the validation function from the flagger.
 func InitFromFlags(_ log.Logger, f featurecontrol.Flagger) {
-	if !f.ClassicMatchersParsing() {
+	if !f.ClassicMode() {
 		validateLs = func(ls model.LabelSet) error {
 			return validateUTF8Ls(ls)
 		}