diff --git a/cmd/geth/config.go b/cmd/geth/config.go index ddb5b5e1ff..a8705d8c91 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -257,12 +257,6 @@ func dumpConfig(ctx *cli.Context) error { } func applyMetricConfig(ctx *cli.Context, cfg *gethConfig) { - if ctx.IsSet(utils.MetricsEnabledFlag.Name) { - cfg.Metrics.Enabled = ctx.Bool(utils.MetricsEnabledFlag.Name) - } - if ctx.IsSet(utils.MetricsEnabledExpensiveFlag.Name) { - cfg.Metrics.EnabledExpensive = ctx.Bool(utils.MetricsEnabledExpensiveFlag.Name) - } if ctx.IsSet(utils.MetricsHTTPFlag.Name) { cfg.Metrics.HTTP = ctx.String(utils.MetricsHTTPFlag.Name) } diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 8655c3356f..04ff3966d7 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -2044,7 +2044,7 @@ func SetupMetrics(ctx *cli.Context) { } func SetupMetricsFromConfig(c *metrics.Config) { - if !c.Enabled { + if metrics.Enabled { return } diff --git a/metrics/config.go b/metrics/config.go index cea9b0d2b5..065ef6cd87 100644 --- a/metrics/config.go +++ b/metrics/config.go @@ -22,8 +22,6 @@ import ( // Config contains the configuration for the metric collection. type Config struct { - Enabled bool `toml:",omitempty"` - EnabledExpensive bool `toml:",omitempty"` HTTP string `toml:",omitempty"` Port int `toml:",omitempty"` EnableInfluxDB bool `toml:",omitempty"` @@ -54,8 +52,6 @@ func (c *Config) Validate() error { // DefaultConfig is the default config for metrics used in go-ethereum. var DefaultConfig = Config{ - Enabled: false, - EnabledExpensive: false, HTTP: "127.0.0.1", Port: 6060, EnableInfluxDB: false,