Fix build when telemetry is disabled (#2583)

informalsystems · Aug 22, 2022 · ed4dd8c · ed4dd8c
1 parent 949144e
commit ed4dd8c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/relayer/src/chain/cosmos/retry.rs b/relayer/src/chain/cosmos/retry.rs
@@ -45,13 +45,13 @@ pub async fn send_tx_with_account_sequence_retry(
     let _span =
         span!(Level::ERROR, "send_tx_with_account_sequence_retry", id = %config.chain_id).entered();
 
-    let number_messages = messages.len() as u64;
+    let _number_messages = messages.len() as u64;
 
     match do_send_tx_with_account_sequence_retry(config, key_entry, account, tx_memo, messages)
         .await
     {
         Ok(res) => {
-            telemetry!(total_messages_submitted, &config.chain_id, number_messages);
+            telemetry!(total_messages_submitted, &config.chain_id, _number_messages);
             Ok(res)
         }
         Err(e) => Err(e),

diff --git a/relayer/src/supervisor/scan.rs b/relayer/src/supervisor/scan.rs
@@ -13,7 +13,6 @@ use ibc::core::{
     },
     ics24_host::identifier::{ChainId, ChannelId, ClientId, ConnectionId, PortId},
 };
-use ibc_telemetry::state::WorkerType;
 
 use crate::{
     chain::{
@@ -859,6 +858,7 @@ fn query_connection_channels<Chain: ChainHandle>(
 /// For example if the client workers or client misbehaviour detection have
 /// been disabled in the configuration, the `client_misbehaviours_submitted`
 /// will never record any value as no misbehaviour will be submitted.
+#[allow(unused_variables)]
 fn init_telemetry(
     chain_id: &ChainId,
     client: &ClientId,

diff --git a/relayer/src/telemetry.rs b/relayer/src/telemetry.rs
@@ -33,19 +33,20 @@ pub type Telemetry = TelemetryDisabled;
 macro_rules! telemetry {
     ($id:ident, $($args:expr),* $(,)*) => {
         #[cfg(feature = "telemetry")]
+        #[allow(unused_imports, unused_variables)]
         {
-            ::ibc_telemetry::global().$id($($args),*);
-        }
+            use ::ibc_telemetry::state::WorkerType;
 
-        #[cfg(not(feature = "telemetry"))]
-        {
-            let _ = ($($args),*);
+            ::ibc_telemetry::global().$id($($args),*);
         }
     };
 
     ($e:expr) => {
         #[cfg(feature = "telemetry")]
+        #[allow(unused_imports, unused_variables)]
         {
+            use ::ibc_telemetry::state::WorkerType;
+
             $e;
         }
     };