Update as per PR feedback

evmos · Oct 13, 2022 · 66c5829 · 66c5829
1 parent 1f2cb83
commit 66c5829
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/server/flags/flags.go b/server/flags/flags.go
@@ -49,7 +49,10 @@ const (
  JSONRPCAllowUnprotectedTxs = "json-rpc.allow-unprotected-txs"
  JSONRPCMaxOpenConnections = "json-rpc.max-open-connections"
  JSONRPCEnableIndexer = "json-rpc.enable-indexer"
- JSONRPCEnableMetrics = "metrics"
+ // JSONRPCEnableMetrics enables EVM RPC metrics server.
+ // Set to `metrics` which is hardcoded flag from go-ethereum.
+ // https://github.com/ethereum/go-ethereum/blob/master/metrics/metrics.go#L35-L55
+ JSONRPCEnableMetrics = "metrics"
 )
 
 // EVM flags

diff --git a/server/start.go b/server/start.go
@@ -33,7 +33,6 @@ import (
  "github.com/cosmos/cosmos-sdk/server/rosetta"
  crgserver "github.com/cosmos/cosmos-sdk/server/rosetta/lib/server"
 
- ethmetrics "github.com/ethereum/go-ethereum/metrics"
  ethmetricsexp "github.com/ethereum/go-ethereum/metrics/exp"
 
  "github.com/cosmos/cosmos-sdk/client"
@@ -344,8 +343,9 @@ func startInProcess(ctx *server.Context, clientCtx client.Context, appCreator ty
  app.RegisterTendermintService(clientCtx)
  }
 
- if ctx.Viper.GetBool(srvflags.JSONRPCEnableMetrics) {
- ethmetrics.Enabled = true
+ // Enable metrics if JSONRPC is enabled and --metrics is passed
+ // Flag not added in config to avoid user enabling in config without passing in CLI
+ if config.JSONRPC.Enable && ctx.Viper.GetBool(srvflags.JSONRPCEnableMetrics) {
  ethmetricsexp.Setup(config.JSONRPC.MetricsAddress)
  }