diff --git a/cmd/alertmanager/main.go b/cmd/alertmanager/main.go index d24120a56f..d01d1284b8 100644 --- 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 index c23e9016de..cbd2506894 100644 --- 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 index 5118ed0cf8..9e705acb47 100644 --- 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) }