FeatureFlags: manage feature flags outside of settings.Cfg (#43692)

pkg/setting/setting_feature_toggles.go

@@ -3,42 +3,23 @@ package setting
 import (
 	"strconv"
 
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-
 	"github.com/grafana/grafana/pkg/util"
 	"gopkg.in/ini.v1"
 )
 
-var (
-	featureToggleInfo = promauto.NewGaugeVec(prometheus.GaugeOpts{
-		Name:      "feature_toggles_info",
-		Help:      "info metric that exposes what feature toggles are enabled or not",
-		Namespace: "grafana",
-	}, []string{"name"})
-
-	defaultFeatureToggles = map[string]bool{
-		"recordedQueries":               false,
-		"accesscontrol":                 false,
-		"service-accounts":              false,
-		"httpclientprovider_azure_auth": false,
-	}
-)
-
+// @deprecated -- should use `featuremgmt.FeatureToggles`
 func (cfg *Cfg) readFeatureToggles(iniFile *ini.File) error {
-	toggles, err := overrideDefaultWithConfiguration(iniFile, defaultFeatureToggles)
+	section := iniFile.Section("feature_toggles")
+	toggles, err := ReadFeatureTogglesFromInitFile(section)
 	if err != nil {
 		return err
 	}
-
-	cfg.FeatureToggles = toggles
-
+	cfg.IsFeatureToggleEnabled = func(key string) bool { return toggles[key] }
 	return nil
 }
 
-func overrideDefaultWithConfiguration(iniFile *ini.File, featureToggles map[string]bool) (map[string]bool, error) {
-	// Read and populate feature toggles list
-	featureTogglesSection := iniFile.Section("feature_toggles")
+func ReadFeatureTogglesFromInitFile(featureTogglesSection *ini.Section) (map[string]bool, error) {
+	featureToggles := make(map[string]bool, 10)
 
 	// parse the comma separated list in `enable`.
 	featuresTogglesStr := valueAsString(featureTogglesSection, "enable", "")
@@ -60,15 +41,5 @@ func overrideDefaultWithConfiguration(iniFile *ini.File, featureToggles map[stri
 
 		featureToggles[v.Name()] = b
 	}
-
-	// track if feature toggles are enabled or not using an info metric
-	for k, v := range featureToggles {
-		if v {
-			featureToggleInfo.WithLabelValues(k).Set(1)
-		} else {
-			featureToggleInfo.WithLabelValues(k).Set(0)
-		}
-	}
-
 	return featureToggles, nil
 }