Fixes and updates from Helius fork (metaplex-foundation#60)

Co-authored-by: Tahsin Tunan <[email protected]>

plerkle/src/geyser_plugin_nft.rs

@@ -665,8 +665,7 @@ impl GeyserPlugin for Plerkle<'static> {
         }
 
         metric! {
-            let slt_idx = format!("{}-{}", slot, transaction_info.index);
-            statsd_count!("transaction_seen_event", 1, "slot-idx" => &slt_idx);
+            statsd_count!("transaction_seen_event", 1);
         }
         Ok(())
     }

plerkle_messenger/Cargo.toml

@@ -18,6 +18,8 @@ futures = "0.3"
 async-mutex = "1.4.0"
 serde = {version = "1.0.137", features = ["derive"] }
 blake3 = "1.3.3"
+cadence = "0.29.0"
+cadence-macros = "0.29.0"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

plerkle_messenger/src/lib.rs

@@ -2,6 +2,7 @@
 pub mod redis_messenger;
 
 mod error;
+mod metrics;
 mod plerkle_messenger;
 
 pub use crate::{error::*, plerkle_messenger::*};

plerkle_messenger/src/metrics.rs

@@ -0,0 +1,10 @@
+#[macro_export]
+macro_rules! metric {
+    {$($block:stmt;)*} => {
+            if cadence_macros::is_global_default_set() {
+                $(
+                    $block
+                )*
+            }
+    };
+}

plerkle_messenger/src/redis_messenger.rs

@@ -1,8 +1,10 @@
 use crate::{
-    error::MessengerError, ConsumptionType, Messenger, MessengerConfig, MessengerType, RecvData,
+    error::MessengerError, metric, ConsumptionType, Messenger, MessengerConfig, MessengerType,
+    RecvData,
 };
 use async_trait::async_trait;
 
+use cadence_macros::statsd_count;
 use log::*;
 use redis::{
     aio::ConnectionManager,
@@ -76,10 +78,8 @@ impl RedisMessenger {
             .await
             .map_err(|e| MessengerError::AutoclaimError { msg: e.to_string() })?;
 
-        id = result.0;
         let range_reply = result.1;
-
-        if id == "0-0" || range_reply.ids.is_empty() {
+        if range_reply.ids.is_empty() {
             // We've reached the end of the PEL.
             return Ok(Vec::new());
         }
@@ -116,26 +116,29 @@ impl RedisMessenger {
             let info = if let Some(info) = pending.get(&id) {
                 info
             } else {
-                println!("No pending info for ID {id}");
+                warn!("No pending info for ID {id}");
                 continue;
             };
             let data = if let Some(data) = map.get(DATA_KEY) {
                 data
             } else {
-                println!("No Data was stored in Redis for ID {id}");
+                info!("No Data was stored in Redis for ID {id}");
                 continue;
             };
             // Get data from map.
 
             let bytes = match data {
                 Value::Data(bytes) => bytes,
                 _ => {
-                    println!("Redis data for ID {id} in wrong format");
+                    error!("Redis data for ID {id} in wrong format");
                     continue;
                 }
             };
 
             if info.times_delivered > self.retries {
+                metric! {
+                    statsd_count!("plerkle.messenger.retries.exceeded", 1);
+                }
                 error!("Message has reached maximum retries {} for id", id);
                 ack_list.push(id.clone());
                 continue;

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.64.0"
+channel = "stable"