apollo_consensus_orchestrator,apollo_dashboard: add USD fee target panel and unit suffixes

Author: sirandreww-starkware

crates/apollo_consensus_orchestrator/src/metrics.rs

@@ -35,9 +35,10 @@ define_metrics!(
 
         // SNIP-35 dynamic gas pricing metrics.
         // STRK/USD rate metrics are in `apollo_l1_gas_price`.
-        MetricGauge { SNIP35_FEE_ACTUAL, "snip35_fee_actual", "The current fee_actual (median of recent fee_proposals sliding window)" },
-        MetricGauge { SNIP35_FEE_PROPOSAL, "snip35_fee_proposal", "The fee_proposal this node published in the latest block" },
-        MetricGauge { SNIP35_FEE_TARGET, "snip35_fee_target", "The fee_target computed from the STRK/USD oracle" },
+        MetricGauge { SNIP35_FEE_ACTUAL_FRI, "snip35_fee_actual_fri", "The current fee_actual (median of recent fee_proposals sliding window), in Fri" },
+        MetricGauge { SNIP35_FEE_PROPOSAL_FRI, "snip35_fee_proposal_fri", "The fee_proposal this node published in the latest block, in Fri" },
+        MetricGauge { SNIP35_FEE_TARGET_FRI, "snip35_fee_target_fri", "The fee_target computed from the STRK/USD oracle, in Fri" },
+        MetricGauge { SNIP35_FEE_TARGET_ATTO_USD, "snip35_fee_target_atto_usd", "Configured target USD cost per L2 gas unit, in atto-USD" },
     }
 );
 
@@ -106,7 +107,8 @@ pub(crate) fn register_metrics() {
     CONSENSUS_BUILD_PROPOSAL_FAILURE.register();
     CONSENSUS_VALIDATE_PROPOSAL_FAILURE.register();
     CONSENSUS_PROOF_MANAGER_STORE_LATENCY.register();
-    SNIP35_FEE_ACTUAL.register();
-    SNIP35_FEE_PROPOSAL.register();
-    SNIP35_FEE_TARGET.register();
+    SNIP35_FEE_ACTUAL_FRI.register();
+    SNIP35_FEE_PROPOSAL_FRI.register();
+    SNIP35_FEE_TARGET_FRI.register();
+    SNIP35_FEE_TARGET_ATTO_USD.register();
 }

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs

@@ -101,9 +101,10 @@ use crate::metrics::{
     record_validate_proposal_failure,
     register_metrics,
     CONSENSUS_L2_GAS_PRICE,
-    SNIP35_FEE_ACTUAL,
-    SNIP35_FEE_PROPOSAL,
-    SNIP35_FEE_TARGET,
+    SNIP35_FEE_ACTUAL_FRI,
+    SNIP35_FEE_PROPOSAL_FRI,
+    SNIP35_FEE_TARGET_ATTO_USD,
+    SNIP35_FEE_TARGET_FRI,
 };
 use crate::utils::{
     convert_to_sn_api_block_info,
@@ -446,19 +447,20 @@ impl SequencerConsensusContext {
         timestamp: u64,
         target_atto_usd_per_l2_gas: u128,
     ) -> GasPrice {
+        SNIP35_FEE_TARGET_ATTO_USD.set_lossy(target_atto_usd_per_l2_gas);
         let Some(fee_actual) = fee_actual else {
             warn!("fee_actual unavailable, freezing fee_proposal at l2_gas_price");
-            SNIP35_FEE_PROPOSAL.set_lossy(self.l2_gas_price.0);
+            SNIP35_FEE_PROPOSAL_FRI.set_lossy(self.l2_gas_price.0);
             return self.l2_gas_price;
         };
-        SNIP35_FEE_ACTUAL.set_lossy(fee_actual.0);
+        SNIP35_FEE_ACTUAL_FRI.set_lossy(fee_actual.0);
 
         let fee_target = match self.deps.l1_gas_price_provider.get_strk_to_usd_rate(timestamp).await
         {
             Ok(rate) => {
                 let target = compute_fee_target(target_atto_usd_per_l2_gas, rate);
                 match target {
-                    Some(t) => SNIP35_FEE_TARGET.set_lossy(t.0),
+                    Some(t) => SNIP35_FEE_TARGET_FRI.set_lossy(t.0),
                     None => warn!("STRK/USD oracle returned zero rate, freezing fee_proposal"),
                 }
                 target
@@ -474,7 +476,7 @@ impl SequencerConsensusContext {
             fee_actual,
             VersionedConstants::latest_constants().fee_proposal_margin_ppt,
         );
-        SNIP35_FEE_PROPOSAL.set_lossy(proposal.0);
+        SNIP35_FEE_PROPOSAL_FRI.set_lossy(proposal.0);
         proposal
     }
 

crates/apollo_dashboard/resources/dev_grafana.json

@@ -402,7 +402,7 @@
           "description": "Median of recent fee_proposals over the sliding window, in GFri",
           "type": "timeseries",
           "exprs": [
-            "snip35_fee_actual{cluster=~\"$cluster\", namespace=~\"$namespace\", pod=~\"$pod\"} / 1e9"
+            "snip35_fee_actual_fri{cluster=~\"$cluster\", namespace=~\"$namespace\", pod=~\"$pod\"} / 1e9"
           ],
           "extra_params": {}
         },
@@ -411,7 +411,7 @@
           "description": "fee_proposal this node published in the latest block, in GFri",
           "type": "timeseries",
           "exprs": [
-            "snip35_fee_proposal{cluster=~\"$cluster\", namespace=~\"$namespace\", pod=~\"$pod\"} / 1e9"
+            "snip35_fee_proposal_fri{cluster=~\"$cluster\", namespace=~\"$namespace\", pod=~\"$pod\"} / 1e9"
           ],
           "extra_params": {}
         },
@@ -420,7 +420,16 @@
           "description": "fee_target computed from the STRK/USD oracle, in GFri",
           "type": "timeseries",
           "exprs": [
-            "snip35_fee_target{cluster=~\"$cluster\", namespace=~\"$namespace\", pod=~\"$pod\"} / 1e9"
+            "snip35_fee_target_fri{cluster=~\"$cluster\", namespace=~\"$namespace\", pod=~\"$pod\"} / 1e9"
+          ],
+          "extra_params": {}
+        },
+        {
+          "title": "Fee Target (USD per 1B L2 gas)",
+          "description": "Configured target USD cost per 1 billion L2 gas units (raw metric is atto-USD per L2 gas; atto-USD / 1e9 = USD per 1B L2 gas)",
+          "type": "timeseries",
+          "exprs": [
+            "snip35_fee_target_atto_usd{cluster=~\"$cluster\", namespace=~\"$namespace\", pod=~\"$pod\"} / 1e9"
           ],
           "extra_params": {}
         },

crates/apollo_dashboard/src/panels/consensus.rs

@@ -56,9 +56,10 @@ use apollo_consensus_orchestrator::metrics::{
     LABEL_BUILD_PROPOSAL_FAILURE_REASON,
     LABEL_CENDE_FAILURE_REASON,
     LABEL_VALIDATE_PROPOSAL_FAILURE_REASON,
-    SNIP35_FEE_ACTUAL,
-    SNIP35_FEE_PROPOSAL,
-    SNIP35_FEE_TARGET,
+    SNIP35_FEE_ACTUAL_FRI,
+    SNIP35_FEE_PROPOSAL_FRI,
+    SNIP35_FEE_TARGET_ATTO_USD,
+    SNIP35_FEE_TARGET_FRI,
 };
 use apollo_l1_gas_price::metrics::{
     SNIP35_STRK_USD_ERROR_COUNT,
@@ -725,7 +726,7 @@ fn get_panel_snip35_fee_actual() -> Panel {
     Panel::new(
         "Fee Actual (GFri)",
         "Median of recent fee_proposals over the sliding window, in GFri",
-        format!("{} / 1e9", SNIP35_FEE_ACTUAL.get_name_with_filter()),
+        format!("{} / 1e9", SNIP35_FEE_ACTUAL_FRI.get_name_with_filter()),
         PanelType::TimeSeries,
     )
 }
@@ -734,7 +735,7 @@ fn get_panel_snip35_fee_proposal() -> Panel {
     Panel::new(
         "Fee Proposal (GFri)",
         "fee_proposal this node published in the latest block, in GFri",
-        format!("{} / 1e9", SNIP35_FEE_PROPOSAL.get_name_with_filter()),
+        format!("{} / 1e9", SNIP35_FEE_PROPOSAL_FRI.get_name_with_filter()),
         PanelType::TimeSeries,
     )
 }
@@ -743,7 +744,17 @@ fn get_panel_snip35_fee_target() -> Panel {
     Panel::new(
         "Fee Target (GFri)",
         "fee_target computed from the STRK/USD oracle, in GFri",
-        format!("{} / 1e9", SNIP35_FEE_TARGET.get_name_with_filter()),
+        format!("{} / 1e9", SNIP35_FEE_TARGET_FRI.get_name_with_filter()),
+        PanelType::TimeSeries,
+    )
+}
+
+fn get_panel_snip35_fee_target_atto_usd() -> Panel {
+    Panel::new(
+        "Fee Target (USD per 1B L2 gas)",
+        "Configured target USD cost per 1 billion L2 gas units (raw metric is atto-USD per L2 gas; \
+         atto-USD / 1e9 = USD per 1B L2 gas)",
+        format!("{} / 1e9", SNIP35_FEE_TARGET_ATTO_USD.get_name_with_filter()),
         PanelType::TimeSeries,
     )
 }
@@ -799,6 +810,7 @@ pub(crate) fn get_snip35_row() -> Row {
             get_panel_snip35_fee_actual(),
             get_panel_snip35_fee_proposal(),
             get_panel_snip35_fee_target(),
+            get_panel_snip35_fee_target_atto_usd(),
             get_panel_snip35_strk_usd_rate(),
             get_panel_snip35_strk_usd_success_count(),
             get_panel_snip35_strk_usd_error_count(),