Update config handling to use prefix

grafana · Jul 28, 2022 · 7160417 · 7160417
1 parent c0e430e
commit 7160417
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/cmd/tempo/app/config.go b/cmd/tempo/app/config.go
@@ -109,7 +109,7 @@ func (c *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet) {
 	c.Frontend.RegisterFlagsAndApplyDefaults(util.PrefixConfig(prefix, "frontend"), f)
 	c.Compactor.RegisterFlagsAndApplyDefaults(util.PrefixConfig(prefix, "compactor"), f)
 	c.StorageConfig.RegisterFlagsAndApplyDefaults(util.PrefixConfig(prefix, "storage"), f)
-
+	c.UsageReport.RegisterFlagsAndApplyDefaults(util.PrefixConfig(prefix, "reporting"), f)
 }
 
 // MultitenancyIsEnabled checks if multitenancy is enabled

diff --git a/pkg/usagestats/config.go b/pkg/usagestats/config.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/grafana/dskit/backoff"
+	"github.com/grafana/tempo/pkg/util"
 )
 
 type Config struct {
@@ -14,9 +15,10 @@ type Config struct {
 }
 
 // RegisterFlags adds the flags required to config this to the given FlagSet
-func (cfg *Config) RegisterFlagsAndApplyDefaults(f *flag.FlagSet) {
-	f.BoolVar(&cfg.Enabled, "reporting.enabled", true, "Enable anonymous usage reporting.")
-	f.DurationVar(&cfg.Backoff.MaxBackoff, "reporting.backoff.max_backoff", time.Minute, "maximum time to back off retry")
-	f.DurationVar(&cfg.Backoff.MinBackoff, "reporting.backoff.min_backoff", time.Second, "minimum time to back off retry")
-	f.IntVar(&cfg.Backoff.MaxRetries, "reporting.backoff.max_retries", 0, "maximum number of times to retry")
+func (cfg *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet) {
+
+	f.BoolVar(&cfg.Enabled, util.PrefixConfig(prefix, "enabled"), true, "Enable anonymous usage reporting.")
+	f.DurationVar(&cfg.Backoff.MaxBackoff, util.PrefixConfig(prefix, "backoff.max_backoff"), time.Minute, "maximum time to back off retry")
+	f.DurationVar(&cfg.Backoff.MinBackoff, util.PrefixConfig(prefix, "backoff.min_backoff"), time.Second, "minimum time to back off retry")
+	f.IntVar(&cfg.Backoff.MaxRetries, util.PrefixConfig(prefix, "backoff.max_retries"), 0, "maximum number of times to retry")
 }