From 121a4bcc911f6c9b91e3961229a5a93012b59afe Mon Sep 17 00:00:00 2001
From: Roman Zeyde <me@romanzey.de>
Date: Fri, 15 Oct 2021 10:39:13 +0300
Subject: [PATCH] Re-introduce mempool vsize and txs' count metrics' -m Fixes

---
 src/mempool.rs | 11 +++++++++--
 src/tracker.rs |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/mempool.rs b/src/mempool.rs
index c095d03..f8be605 100644
--- a/src/mempool.rs
+++ b/src/mempool.rs
@@ -11,7 +11,7 @@ use bitcoincore_rpc::json;
 use rayon::prelude::*;
 use serde::ser::{Serialize, SerializeSeq, Serializer};
 
-use crate::{daemon::Daemon, types::ScriptHash};
+use crate::{daemon::Daemon, types::ScriptHash, metrics::{Metrics, Gauge}};
 
 pub(crate) struct Entry {
     pub txid: Txid,
@@ -27,6 +27,9 @@ pub(crate) struct Mempool {
     by_funding: BTreeSet<(ScriptHash, Txid)>,
     by_spending: BTreeSet<(OutPoint, Txid)>,
     fees: FeeHistogram,
+    // stats
+    vsize: Gauge,
+    count: Gauge,
 }
 
 // Smallest possible txid
@@ -40,12 +43,14 @@ fn txid_max() -> Txid {
 }
 
 impl Mempool {
-    pub fn new() -> Self {
+    pub fn new(metrics: &Metrics) -> Self {
         Self {
             entries: Default::default(),
             by_funding: Default::default(),
             by_spending: Default::default(),
             fees: FeeHistogram::empty(),
+            vsize: metrics.gauge("mempool_txs_vsize", "Total vsize of mempool transactions (in bytes)"),
+            count: metrics.gauge("mempool_txs_count", "Total number of mempool transactions"),
         }
     }
 
@@ -116,6 +121,8 @@ impl Mempool {
             self.add_entry(*txid, tx, entry);
         }
         self.fees = FeeHistogram::new(self.entries.values().map(|e| (e.fee, e.vsize)));
+        self.vsize.set(self.entries.values().map(|e| e.vsize).sum::<u64>() as f64);
+        self.count.set(self.entries.values().len() as f64);
         debug!(
             "{} mempool txs: {} added, {} removed",
             self.entries.len(),
diff --git a/src/tracker.rs b/src/tracker.rs
index ce0e03e..b2d9c05 100644
--- a/src/tracker.rs
+++ b/src/tracker.rs
@@ -37,7 +37,7 @@ impl Tracker {
                 config.reindex_last_blocks,
             )
             .context("failed to open index")?,
-            mempool: Mempool::new(),
+            mempool: Mempool::new(&metrics),
             metrics,
             ignore_mempool: config.ignore_mempool,
         })