From 3ad2335300d32bfeeac1dd65a1544f2aab33d385 Mon Sep 17 00:00:00 2001
From: Riordan Panayides <riordan@panayid.es>
Date: Thu, 8 Jun 2023 14:25:21 +0100
Subject: [PATCH] Re-add candles total metric

---
 src/worker/candle_batching/mod.rs   | 10 +++++++++-
 src/worker/trade_fetching/scrape.rs |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/worker/candle_batching/mod.rs b/src/worker/candle_batching/mod.rs
index 310f9e5..b6f25a4 100644
--- a/src/worker/candle_batching/mod.rs
+++ b/src/worker/candle_batching/mod.rs
@@ -16,6 +16,8 @@ use crate::{
 
 use self::higher_order_candles::batch_higher_order_candles;
 
+use super::metrics::METRIC_CANDLES_TOTAL;
+
 pub async fn batch_for_market(pool: &Pool, market: &MarketInfo) -> anyhow::Result<()> {
     loop {
         let market_clone = market.clone();
@@ -41,14 +43,20 @@ pub async fn batch_for_market(pool: &Pool, market: &MarketInfo) -> anyhow::Resul
 async fn batch_inner(pool: &Pool, market: &MarketInfo) -> anyhow::Result<()> {
     let market_name = &market.name.clone();
     let candles = batch_1m_candles(pool, market).await?;
+    METRIC_CANDLES_TOTAL
+        .with_label_values(&[market.name.as_str()])
+        .inc_by(candles.clone().len() as u64);
     save_candles(pool, candles).await?;
     for resolution in Resolution::iter() {
         if resolution == Resolution::R1m {
             continue;
         }
         let candles = batch_higher_order_candles(pool, market_name, resolution).await?;
+        METRIC_CANDLES_TOTAL
+            .with_label_values(&[market.name.as_str()])
+            .inc_by(candles.clone().len() as u64);
         save_candles(pool, candles).await?;
-    }
+    }   
     Ok(())
 }
 
diff --git a/src/worker/trade_fetching/scrape.rs b/src/worker/trade_fetching/scrape.rs
index 3955c4b..dca1b78 100644
--- a/src/worker/trade_fetching/scrape.rs
+++ b/src/worker/trade_fetching/scrape.rs
@@ -6,7 +6,7 @@ use solana_client::{
 };
 use solana_sdk::{commitment_config::CommitmentConfig, pubkey::Pubkey, signature::Signature};
 use solana_transaction_status::UiTransactionEncoding;
-use std::{collections::HashMap, str::FromStr, time::Duration as WaitDuration};
+use std::{collections::HashMap, str::FromStr};
 use tokio::sync::mpsc::Sender;
 
 use crate::{