refactor: enable the metrics flag

lambdaclass · Jul 29, 2024 · e938cf9 · e938cf9
1 parent 632630b
commit e938cf9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/config/config.exs b/config/config.exs
@@ -20,8 +20,6 @@ config :lambda_ethereum_consensus, :fork, fork
 # Configure logging
 config :logger, level: :info, truncate: :infinity
 
-config :lambda_ethereum_consensus, LambdaEthereumConsensus.Telemetry, enable: true
-
 # Use Jason for JSON parsing in Phoenix
 config :phoenix, :json_library, Jason
 
@@ -37,19 +35,6 @@ config :sentry,
   enable_source_code_context: true,
   root_source_code_paths: [File.cwd!()]
 
-config :lambda_ethereum_consensus, LambdaEthereumConsensus.PromEx,
-  metrics_server: [
-    port: 9568,
-    auth_strategy: :none
-  ],
-  grafana: [
-    host: "http://localhost:3000",
-    # Authenticate via Basic Auth
-    username: "admin",
-    password: "admin",
-    upload_dashboards_on_start: true
-  ]
-
 config :lambda_ethereum_consensus, :logger, [
   {:handler, :sentry_handler, Sentry.LoggerHandler,
    %{

diff --git a/config/runtime.exs b/config/runtime.exs
@@ -14,7 +14,6 @@ switches = [
   datadir: :string,
   testnet_dir: :string,
   metrics: :boolean,
-  metrics_port: :integer,
   log_file: :string,
   beacon_api: :boolean,
   beacon_api_port: :integer,
@@ -43,8 +42,7 @@ checkpoint_sync_url = Keyword.get(args, :checkpoint_sync_url)
 execution_endpoint = Keyword.get(args, :execution_endpoint, "http://localhost:8551")
 jwt_path = Keyword.get(args, :execution_jwt)
 testnet_dir = Keyword.get(args, :testnet_dir)
-enable_metrics = Keyword.get(args, :metrics, false)
-metrics_port = Keyword.get(args, :metrics_port, if(enable_metrics, do: 9568, else: nil))
+disable_metrics = not Keyword.get(args, :metrics, false)
 beacon_api_port = Keyword.get(args, :beacon_api_port, nil)
 enable_beacon_api = Keyword.get(args, :beacon_api, not is_nil(beacon_api_port))
 listen_addresses = Keyword.get_values(args, :listen_address)
@@ -188,6 +186,20 @@ block_time_ms =
 
 # Metrics
 
+config :lambda_ethereum_consensus, LambdaEthereumConsensus.PromEx,
+  disabled: disable_metrics,
+  metrics_server: [
+    port: 9568,
+    auth_strategy: :none
+  ],
+  grafana: [
+    host: "http://localhost:3000",
+    # Authenticate via Basic Auth
+    username: "admin",
+    password: "admin",
+    upload_dashboards_on_start: true
+  ]
+
 config :lambda_ethereum_consensus, LambdaEthereumConsensus.PromExPlugin,
   block_processing_buckets: [0.5, 1.0, 1.5, 2, 4, 6, 8] |> Enum.map(&(&1 * block_time_ms))