chore(bridge-withdrawer): change batch value metric to a histogram

crates/astria-bridge-withdrawer/CHANGELOG.md

@@ -9,10 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Histogram etric `batch_settled_value` now a histogram [#2016](https://github.com/astriaorg/astria/pull/2016).
+
 ### Changed
 
 - Update `idna` dependency to resolve cargo audit warning [#1869](https://github.com/astriaorg/astria/pull/1869).
 
+### Removed
+
+- Metric `batch_total_settled_value` removed in favor of `batch_settled_value` [#2016](https://github.com/astriaorg/astria/pull/2016).
+
 ## [1.0.1] - 2024-11-01
 
 ### Changed

crates/astria-bridge-withdrawer/src/bridge_withdrawer/submitter/mod.rs

@@ -145,7 +145,7 @@ impl Submitter {
         } = self;
 
         if actions.is_empty() {
-            metrics.set_batch_total_settled_value(0);
+            metrics.record_batch_settled_value(0);
 
             return Ok(());
         }
@@ -213,7 +213,7 @@ impl Submitter {
                 batch.value = total_value,
                 "withdraw batch successfully executed."
             );
-            metrics.set_batch_total_settled_value(total_value);
+            metrics.record_batch_settled_value(total_value);
             state.set_last_rollup_height_submitted(rollup_height);
             state.set_last_sequencer_height(tx_response.height.value());
             state.set_last_sequencer_tx_hash(tx_response.hash);

crates/astria-bridge-withdrawer/src/main.rs

@@ -37,7 +37,7 @@ async fn main() -> ExitCode {
     }
 
     let (metrics, _telemetry_guard) = match telemetry_conf
-        .try_init(&())
+        .try_init(&cfg)
         .wrap_err("failed to setup telemetry")
     {
         Err(e) => {

crates/astria-bridge-withdrawer/src/metrics.rs

@@ -18,7 +18,7 @@ pub struct Metrics {
     nonce_fetch_latency: Histogram,
     sequencer_submission_failure_count: Counter,
     sequencer_submission_latency: Histogram,
-    batch_total_settled_value: Gauge,
+    batch_settled_value: Histogram,
 }
 
 impl Metrics {
@@ -46,17 +46,17 @@ impl Metrics {
         self.sequencer_submission_failure_count.increment(1);
     }
 
-    pub(crate) fn set_batch_total_settled_value(&self, value: u128) {
-        self.batch_total_settled_value.set(value);
+    pub(crate) fn record_batch_settled_value(&self, value: u128) {
+        self.batch_settled_value.record(value);
     }
 }
 
 impl metrics::Metrics for Metrics {
-    type Config = ();
+    type Config = crate::Config;
 
     fn register(
         builder: &mut RegisteringBuilder,
-        _config: &Self::Config,
+        config: &Self::Config,
     ) -> Result<Self, metrics::Error> {
         let current_nonce = builder
             .new_gauge_factory(CURRENT_NONCE, "The current nonce")?
@@ -97,12 +97,13 @@ impl metrics::Metrics for Metrics {
             )?
             .register()?;
 
-        let batch_total_settled_value = builder
-            .new_gauge_factory(
-                BATCH_TOTAL_SETTLED_VALUE,
+        let denom_name = format!("{}", config.rollup_asset_denomination);
+        let batch_settled_value = builder
+            .new_histogram_factory(
+                BATCH_SETTLED_VALUE,
                 "Total value of withdrawals settled in a given sequencer block",
             )?
-            .register()?;
+            .register_with_labels(&[("denom", denom_name)])?;
 
         Ok(Self {
             current_nonce,
@@ -111,7 +112,7 @@ impl metrics::Metrics for Metrics {
             nonce_fetch_latency,
             sequencer_submission_failure_count,
             sequencer_submission_latency,
-            batch_total_settled_value,
+            batch_settled_value,
         })
     }
 }
@@ -123,13 +124,13 @@ metric_names!(const METRICS_NAMES:
     CURRENT_NONCE,
     SEQUENCER_SUBMISSION_FAILURE_COUNT,
     SEQUENCER_SUBMISSION_LATENCY,
-    BATCH_TOTAL_SETTLED_VALUE,
+    BATCH_SETTLED_VALUE,
 );
 
 #[cfg(test)]
 mod tests {
     use super::{
-        BATCH_TOTAL_SETTLED_VALUE,
+        BATCH_SETTLED_VALUE,
         CURRENT_NONCE,
         NONCE_FETCH_COUNT,
         NONCE_FETCH_FAILURE_COUNT,
@@ -157,6 +158,6 @@ mod tests {
             "sequencer_submission_failure_count",
         );
         assert_const(SEQUENCER_SUBMISSION_LATENCY, "sequencer_submission_latency");
-        assert_const(BATCH_TOTAL_SETTLED_VALUE, "batch_total_settled_value");
+        assert_const(BATCH_SETTLED_VALUE, "batch_settled_value");
     }
 }

crates/astria-bridge-withdrawer/tests/blackbox/helpers/test_bridge_withdrawer.rs

@@ -2,7 +2,6 @@ use std::{
     io::Write as _,
     mem,
     net::SocketAddr,
-    sync::LazyLock,
     time::Duration,
 };
 
@@ -74,25 +73,6 @@ pub(crate) const DEFAULT_IBC_DENOM: &str = "transfer/channel-0/utia";
 pub(crate) const SEQUENCER_CHAIN_ID: &str = "test-sequencer";
 const ASTRIA_ADDRESS_PREFIX: &str = "astria";
 
-static TELEMETRY: LazyLock<()> = LazyLock::new(|| {
-    if std::env::var_os("TEST_LOG").is_some() {
-        let filter_directives = std::env::var("RUST_LOG").unwrap_or_else(|_| "info".into());
-        telemetry::configure()
-            .set_no_otel(true)
-            .set_stdout_writer(std::io::stdout)
-            .set_pretty_print(true)
-            .set_filter_directives(&filter_directives)
-            .try_init::<Metrics>(&())
-            .unwrap();
-    } else {
-        telemetry::configure()
-            .set_no_otel(true)
-            .set_stdout_writer(std::io::sink)
-            .try_init::<Metrics>(&())
-            .unwrap();
-    }
-});
-
 pub struct TestBridgeWithdrawer {
     /// The address of the public API server (health, ready).
     pub api_address: SocketAddr,
@@ -251,7 +231,6 @@ impl TestBridgeWithdrawerConfig {
             ethereum_config,
             asset_denom,
         } = self;
-        LazyLock::force(&TELEMETRY);
 
         // sequencer signer key
         let keyfile = NamedTempFile::new().unwrap();
@@ -287,12 +266,28 @@ impl TestBridgeWithdrawerConfig {
             metrics_http_listener_addr: String::new(),
             pretty_print: true,
         };
+        if std::env::var_os("TEST_LOG").is_some() {
+            let filter_directives = std::env::var("RUST_LOG").unwrap_or_else(|_| "info".into());
+            telemetry::configure()
+                .set_no_otel(true)
+                .set_stdout_writer(std::io::stdout)
+                .set_pretty_print(true)
+                .set_filter_directives(&filter_directives)
+                .try_init::<Metrics>(&config)
+                .unwrap();
+        } else {
+            telemetry::configure()
+                .set_no_otel(true)
+                .set_stdout_writer(std::io::sink)
+                .try_init::<Metrics>(&config)
+                .unwrap();
+        }
 
         info!(config = serde_json::to_string(&config).unwrap());
 
         let (metrics, metrics_handle) = metrics::ConfigBuilder::new()
             .set_global_recorder(false)
-            .build(&())
+            .build(&config)
             .unwrap();
         let metrics = Box::leak(Box::new(metrics));