From f81951dd00f11d860ef9c249680d27506b19a706 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 2 Sep 2024 11:56:07 +0000
Subject: [PATCH 01/13] stats: make `statsClient` a `std::unique_ptr`, denote
 as global variable

This step is needed so we can simplify construction in an upcoming
commit
---
 src/init.cpp                   | 38 +++++++++++++++-----------
 src/net.cpp                    | 40 +++++++++++++--------------
 src/net_processing.cpp         | 10 +++----
 src/statsd_client.cpp          |  2 +-
 src/statsd_client.h            |  2 +-
 src/test/util/setup_common.cpp |  3 ++
 src/txorphanage.cpp            |  8 +++---
 src/validation.cpp             | 50 +++++++++++++++++-----------------
 8 files changed, 81 insertions(+), 72 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 1bd565b760..9e616b5e5b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -289,6 +289,7 @@ void PrepareShutdown(NodeContext& node)
     node.banman.reset();
     node.addrman.reset();
     node.netgroupman.reset();
+    ::statsClient.reset();
 
     if (node.mempool && node.mempool->IsLoaded() && node.args->GetBoolArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
         DumpMempool(*node.mempool);
@@ -839,12 +840,12 @@ static void PeriodicStats(ArgsManager& args, ChainstateManager& chainman, const
     CCoinsStats stats{CoinStatsHashType::NONE};
     chainman.ActiveChainstate().ForceFlushStateToDisk();
     if (WITH_LOCK(cs_main, return GetUTXOStats(&chainman.ActiveChainstate().CoinsDB(), std::ref(chainman.m_blockman), stats, RpcInterruptionPoint, chainman.ActiveChain().Tip()))) {
-        statsClient.gauge("utxoset.tx", stats.nTransactions, 1.0f);
-        statsClient.gauge("utxoset.txOutputs", stats.nTransactionOutputs, 1.0f);
-        statsClient.gauge("utxoset.dbSizeBytes", stats.nDiskSize, 1.0f);
-        statsClient.gauge("utxoset.blockHeight", stats.nHeight, 1.0f);
+        ::statsClient->gauge("utxoset.tx", stats.nTransactions, 1.0f);
+        ::statsClient->gauge("utxoset.txOutputs", stats.nTransactionOutputs, 1.0f);
+        ::statsClient->gauge("utxoset.dbSizeBytes", stats.nDiskSize, 1.0f);
+        ::statsClient->gauge("utxoset.blockHeight", stats.nHeight, 1.0f);
         if (stats.total_amount.has_value()) {
-            statsClient.gauge("utxoset.totalAmount", (double)stats.total_amount.value() / (double)COIN, 1.0f);
+            ::statsClient->gauge("utxoset.totalAmount", (double)stats.total_amount.value() / (double)COIN, 1.0f);
         }
     } else {
         // something went wrong
@@ -866,22 +867,22 @@ static void PeriodicStats(ArgsManager& args, ChainstateManager& chainman, const
     int64_t timeDiff = maxTime - minTime;
     double nNetworkHashPS = workDiff.getdouble() / timeDiff;
 
-    statsClient.gaugeDouble("network.hashesPerSecond", nNetworkHashPS);
-    statsClient.gaugeDouble("network.terahashesPerSecond", nNetworkHashPS / 1e12);
-    statsClient.gaugeDouble("network.petahashesPerSecond", nNetworkHashPS / 1e15);
-    statsClient.gaugeDouble("network.exahashesPerSecond", nNetworkHashPS / 1e18);
+    ::statsClient->gaugeDouble("network.hashesPerSecond", nNetworkHashPS);
+    ::statsClient->gaugeDouble("network.terahashesPerSecond", nNetworkHashPS / 1e12);
+    ::statsClient->gaugeDouble("network.petahashesPerSecond", nNetworkHashPS / 1e15);
+    ::statsClient->gaugeDouble("network.exahashesPerSecond", nNetworkHashPS / 1e18);
     // No need for cs_main, we never use null tip here
-    statsClient.gaugeDouble("network.difficulty", (double)GetDifficulty(tip));
+    ::statsClient->gaugeDouble("network.difficulty", (double)GetDifficulty(tip));
 
-    statsClient.gauge("transactions.txCacheSize", WITH_LOCK(cs_main, return chainman.ActiveChainstate().CoinsTip().GetCacheSize()), 1.0f);
-    statsClient.gauge("transactions.totalTransactions", tip->nChainTx, 1.0f);
+    ::statsClient->gauge("transactions.txCacheSize", WITH_LOCK(cs_main, return chainman.ActiveChainstate().CoinsTip().GetCacheSize()), 1.0f);
+    ::statsClient->gauge("transactions.totalTransactions", tip->nChainTx, 1.0f);
 
     {
         LOCK(mempool.cs);
-        statsClient.gauge("transactions.mempool.totalTransactions", mempool.size(), 1.0f);
-        statsClient.gauge("transactions.mempool.totalTxBytes", (int64_t) mempool.GetTotalTxSize(), 1.0f);
-        statsClient.gauge("transactions.mempool.memoryUsageBytes", (int64_t) mempool.DynamicMemoryUsage(), 1.0f);
-        statsClient.gauge("transactions.mempool.minFeePerKb", mempool.GetMinFee(args.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK(), 1.0f);
+        ::statsClient->gauge("transactions.mempool.totalTransactions", mempool.size(), 1.0f);
+        ::statsClient->gauge("transactions.mempool.totalTxBytes", (int64_t) mempool.GetTotalTxSize(), 1.0f);
+        ::statsClient->gauge("transactions.mempool.memoryUsageBytes", (int64_t) mempool.DynamicMemoryUsage(), 1.0f);
+        ::statsClient->gauge("transactions.mempool.minFeePerKb", mempool.GetMinFee(args.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK(), 1.0f);
     }
 }
 
@@ -1524,6 +1525,11 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     fDiscover = args.GetBoolArg("-discover", true);
     const bool ignores_incoming_txs{args.GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)};
 
+    // We need to initialize statsClient early as currently, statsClient is called
+    // regardless of whether transmitting stats are desirable or not and if
+    // statsClient isn't present when that attempt is made, the client will crash.
+    ::statsClient = std::make_unique<statsd::StatsdClient>();
+
     {
 
         // Read asmap file if configured
diff --git a/src/net.cpp b/src/net.cpp
index 4fcbbfb3c1..a9d06db3d6 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -623,7 +623,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
                              /*inbound_onion=*/false,
                              std::move(i2p_transient_session));
     pnode->AddRef();
-    statsClient.inc("peers.connect", 1.0f);
+    ::statsClient->inc("peers.connect", 1.0f);
 
     // We're making a new connection, harvest entropy from the time (and our peer count)
     RandAddEvent((uint32_t)id);
@@ -666,7 +666,7 @@ void CNode::CloseSocketDisconnect(CConnman* connman)
     m_sock.reset();
     m_i2p_sam_session.reset();
 
-    statsClient.inc("peers.disconnect", 1.0f);
+    ::statsClient->inc("peers.disconnect", 1.0f);
 }
 
 void CConnman::AddWhitelistPermissionFlags(NetPermissionFlags& flags, const CNetAddr &addr) const {
@@ -817,7 +817,7 @@ bool CNode::ReceiveMsgBytes(Span<const uint8_t> msg_bytes, bool& complete)
             }
             assert(i != mapRecvBytesPerMsgType.end());
             i->second += msg.m_raw_message_size;
-            statsClient.count("bandwidth.message." + std::string(msg.m_type) + ".bytesReceived", msg.m_raw_message_size, 1.0f);
+            ::statsClient->count("bandwidth.message." + std::string(msg.m_type) + ".bytesReceived", msg.m_raw_message_size, 1.0f);
 
             // push the message to the process queue,
             vRecvMsg.push_back(std::move(msg));
@@ -1741,20 +1741,20 @@ void CConnman::CalculateNumConnectionsChangedStats()
             torNodes++;
         const auto last_ping_time = count_microseconds(pnode->m_last_ping_time);
         if (last_ping_time > 0)
-            statsClient.timing("peers.ping_us", last_ping_time, 1.0f);
+            ::statsClient->timing("peers.ping_us", last_ping_time, 1.0f);
     }
     for (const std::string &msg : getAllNetMessageTypes()) {
-        statsClient.gauge("bandwidth.message." + msg + ".totalBytesReceived", mapRecvBytesMsgStats[msg], 1.0f);
-        statsClient.gauge("bandwidth.message." + msg + ".totalBytesSent", mapSentBytesMsgStats[msg], 1.0f);
+        ::statsClient->gauge("bandwidth.message." + msg + ".totalBytesReceived", mapRecvBytesMsgStats[msg], 1.0f);
+        ::statsClient->gauge("bandwidth.message." + msg + ".totalBytesSent", mapSentBytesMsgStats[msg], 1.0f);
     }
-    statsClient.gauge("peers.totalConnections", nPrevNodeCount, 1.0f);
-    statsClient.gauge("peers.spvNodeConnections", spvNodes, 1.0f);
-    statsClient.gauge("peers.fullNodeConnections", fullNodes, 1.0f);
-    statsClient.gauge("peers.inboundConnections", inboundNodes, 1.0f);
-    statsClient.gauge("peers.outboundConnections", outboundNodes, 1.0f);
-    statsClient.gauge("peers.ipv4Connections", ipv4Nodes, 1.0f);
-    statsClient.gauge("peers.ipv6Connections", ipv6Nodes, 1.0f);
-    statsClient.gauge("peers.torConnections", torNodes, 1.0f);
+    ::statsClient->gauge("peers.totalConnections", nPrevNodeCount, 1.0f);
+    ::statsClient->gauge("peers.spvNodeConnections", spvNodes, 1.0f);
+    ::statsClient->gauge("peers.fullNodeConnections", fullNodes, 1.0f);
+    ::statsClient->gauge("peers.inboundConnections", inboundNodes, 1.0f);
+    ::statsClient->gauge("peers.outboundConnections", outboundNodes, 1.0f);
+    ::statsClient->gauge("peers.ipv4Connections", ipv4Nodes, 1.0f);
+    ::statsClient->gauge("peers.ipv6Connections", ipv6Nodes, 1.0f);
+    ::statsClient->gauge("peers.torConnections", torNodes, 1.0f);
 }
 
 bool CConnman::ShouldRunInactivityChecks(const CNode& node, std::chrono::seconds now) const
@@ -4124,8 +4124,8 @@ bool CConnman::DisconnectNode(NodeId id)
 void CConnman::RecordBytesRecv(uint64_t bytes)
 {
     nTotalBytesRecv += bytes;
-    statsClient.count("bandwidth.bytesReceived", bytes, 0.1f);
-    statsClient.gauge("bandwidth.totalBytesReceived", nTotalBytesRecv, 0.01f);
+    ::statsClient->count("bandwidth.bytesReceived", bytes, 0.1f);
+    ::statsClient->gauge("bandwidth.totalBytesReceived", nTotalBytesRecv, 0.01f);
 }
 
 void CConnman::RecordBytesSent(uint64_t bytes)
@@ -4134,8 +4134,8 @@ void CConnman::RecordBytesSent(uint64_t bytes)
     LOCK(m_total_bytes_sent_mutex);
 
     nTotalBytesSent += bytes;
-    statsClient.count("bandwidth.bytesSent", bytes, 0.01f);
-    statsClient.gauge("bandwidth.totalBytesSent", nTotalBytesSent, 0.01f);
+    ::statsClient->count("bandwidth.bytesSent", bytes, 0.01f);
+    ::statsClient->gauge("bandwidth.totalBytesSent", nTotalBytesSent, 0.01f);
 
     const auto now = GetTime<std::chrono::seconds>();
     if (nMaxOutboundCycleStartTime + MAX_UPLOAD_TIMEFRAME < now)
@@ -4291,8 +4291,8 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
         msg.data.data()
     );
 
-    statsClient.count(strprintf("bandwidth.message.%s.bytesSent", msg.m_type), nMessageSize, 1.0f);
-    statsClient.inc(strprintf("message.sent.%s", msg.m_type), 1.0f);
+    ::statsClient->count(strprintf("bandwidth.message.%s.bytesSent", msg.m_type), nMessageSize, 1.0f);
+    ::statsClient->inc(strprintf("message.sent.%s", msg.m_type), 1.0f);
 
     {
         LOCK(pnode->cs_vSend);
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 4c9cb376da..ae060bdaa8 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1688,9 +1688,9 @@ void PeerManagerImpl::Misbehaving(const NodeId pnode, const int howmuch, const s
     if (score_now >= DISCOURAGEMENT_THRESHOLD && score_before < DISCOURAGEMENT_THRESHOLD) {
         warning = " DISCOURAGE THRESHOLD EXCEEDED";
         peer->m_should_discourage = true;
-        statsClient.inc("misbehavior.banned", 1.0f);
+        ::statsClient->inc("misbehavior.banned", 1.0f);
     } else {
-        statsClient.count("misbehavior.amount", howmuch, 1.0);
+        ::statsClient->count("misbehavior.amount", howmuch, 1.0);
     }
 
     LogPrint(BCLog::NET, "Misbehaving: peer=%d (%d -> %d)%s%s\n",
@@ -3260,7 +3260,7 @@ void PeerManagerImpl::ProcessMessage(
     AssertLockHeld(g_msgproc_mutex);
 
     LogPrint(BCLog::NET, "received: %s (%u bytes) peer=%d\n", SanitizeString(msg_type), vRecv.size(), pfrom.GetId());
-    statsClient.inc("message.received." + SanitizeString(msg_type), 1.0f);
+    ::statsClient->inc("message.received." + SanitizeString(msg_type), 1.0f);
 
     const bool is_masternode = m_mn_activeman != nullptr;
 
@@ -3759,7 +3759,7 @@ void PeerManagerImpl::ProcessMessage(
             if (inv.IsMsgBlk()) {
                 const bool fAlreadyHave = AlreadyHaveBlock(inv.hash);
                 LogPrint(BCLog::NET, "got inv: %s  %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom.GetId());
-                statsClient.inc(strprintf("message.received.inv_%s", inv.GetCommand()), 1.0f);
+                ::statsClient->inc(strprintf("message.received.inv_%s", inv.GetCommand()), 1.0f);
 
                 UpdateBlockAvailability(pfrom.GetId(), inv.hash);
                 if (!fAlreadyHave && !fImporting && !fReindex && !mapBlocksInFlight.count(inv.hash)) {
@@ -3774,7 +3774,7 @@ void PeerManagerImpl::ProcessMessage(
             } else {
                 const bool fAlreadyHave = AlreadyHave(inv);
                 LogPrint(BCLog::NET, "got inv: %s  %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom.GetId());
-                statsClient.inc(strprintf("message.received.inv_%s", inv.GetCommand()), 1.0f);
+                ::statsClient->inc(strprintf("message.received.inv_%s", inv.GetCommand()), 1.0f);
 
                 static std::set<int> allowWhileInIBDObjs = {
                         MSG_SPORK
diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index d291510ac6..4fc9170245 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cmath>
 #include <cstdio>
 
-statsd::StatsdClient statsClient;
+std::unique_ptr<statsd::StatsdClient> statsClient;
 
 namespace statsd {
 
diff --git a/src/statsd_client.h b/src/statsd_client.h
index f06fd1b5c1..5b6dea5799 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -66,6 +66,6 @@ class StatsdClient {
 
 } // namespace statsd
 
-extern statsd::StatsdClient statsClient;
+extern std::unique_ptr<statsd::StatsdClient> statsClient;
 
 #endif // BITCOIN_STATSD_CLIENT_H
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 7f775a14e7..ac4b868ed5 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -39,6 +39,7 @@
 #include <scheduler.h>
 #include <script/sigcache.h>
 #include <spork.h>
+#include <statsd_client.h>
 #include <streams.h>
 #include <test/util/index.h>
 #include <txdb.h>
@@ -182,6 +183,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
     SetupNetworking();
     InitSignatureCache();
     InitScriptExecutionCache();
+    ::statsClient = std::make_unique<statsd::StatsdClient>();
     m_node.chain = interfaces::MakeChain(m_node);
 
     m_node.netgroupman = std::make_unique<NetGroupManager>(/*asmap=*/std::vector<bool>());
@@ -217,6 +219,7 @@ BasicTestingSetup::~BasicTestingSetup()
     m_node.connman.reset();
     m_node.addrman.reset();
     m_node.netgroupman.reset();
+    ::statsClient.reset();
 
     LogInstance().DisconnectTestLogger();
     fs::remove_all(m_path_root);
diff --git a/src/txorphanage.cpp b/src/txorphanage.cpp
index 6e224e93ad..b79bf88d62 100644
--- a/src/txorphanage.cpp
+++ b/src/txorphanage.cpp
@@ -51,8 +51,8 @@ bool TxOrphanage::AddTx(const CTransactionRef& tx, NodeId peer)
 
     LogPrint(BCLog::MEMPOOL, "stored orphan tx %s (mapsz %u outsz %u)\n", hash.ToString(),
              m_orphans.size(), m_outpoint_to_orphan_it.size());
-    statsClient.inc("transactions.orphans.add", 1.0f);
-    statsClient.gauge("transactions.orphans", m_orphans.size());
+    ::statsClient->inc("transactions.orphans.add", 1.0f);
+    ::statsClient->gauge("transactions.orphans", m_orphans.size());
 
     return true;
 }
@@ -87,8 +87,8 @@ int TxOrphanage::EraseTx(const uint256& txid)
     assert(m_orphan_tx_size >= it->second.nTxSize);
     m_orphan_tx_size -= it->second.nTxSize;
     m_orphans.erase(it);
-    statsClient.inc("transactions.orphans.remove", 1.0f);
-    statsClient.gauge("transactions.orphans", m_orphans.size());
+    ::statsClient->inc("transactions.orphans.remove", 1.0f);
+    ::statsClient->gauge("transactions.orphans", m_orphans.size());
     return 1;
 }
 
diff --git a/src/validation.cpp b/src/validation.cpp
index bc2498ce5a..5c7610d181 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -612,7 +612,7 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
 
     // is it already in the memory pool?
     if (m_pool.exists(hash)) {
-        statsClient.inc("transactions.duplicate", 1.0f);
+        ::statsClient->inc("transactions.duplicate", 1.0f);
         return state.Invalid(TxValidationResult::TX_CONFLICT, "txn-already-in-mempool");
     }
 
@@ -838,11 +838,11 @@ bool MemPoolAccept::Finalize(const ATMPArgs& args, Workspace& ws)
     CAmount nValueOut = tx.GetValueOut();
     unsigned int nSigOps = GetTransactionSigOpCount(tx, m_view, STANDARD_SCRIPT_VERIFY_FLAGS);
 
-    statsClient.count("transactions.sizeBytes", entry->GetTxSize(), 1.0f);
-    statsClient.count("transactions.fees", nModifiedFees, 1.0f);
-    statsClient.count("transactions.inputValue", nValueOut - nModifiedFees, 1.0f);
-    statsClient.count("transactions.outputValue", nValueOut, 1.0f);
-    statsClient.count("transactions.sigOps", nSigOps, 1.0f);
+    ::statsClient->count("transactions.sizeBytes", entry->GetTxSize(), 1.0f);
+    ::statsClient->count("transactions.fees", nModifiedFees, 1.0f);
+    ::statsClient->count("transactions.inputValue", nValueOut - nModifiedFees, 1.0f);
+    ::statsClient->count("transactions.outputValue", nValueOut, 1.0f);
+    ::statsClient->count("transactions.sigOps", nSigOps, 1.0f);
 
     // Add memory address index
     if (fAddressIndex) {
@@ -895,10 +895,10 @@ MempoolAcceptResult MemPoolAccept::AcceptSingleTransaction(const CTransactionRef
     const CTransaction& tx = *ptx;
     auto finish = Now<SteadyMilliseconds>();
     auto diff = finish - start;
-    statsClient.timing("AcceptToMemoryPool_ms", count_milliseconds(diff), 1.0f);
-    statsClient.inc("transactions.accepted", 1.0f);
-    statsClient.count("transactions.inputs", tx.vin.size(), 1.0f);
-    statsClient.count("transactions.outputs", tx.vout.size(), 1.0f);
+    ::statsClient->timing("AcceptToMemoryPool_ms", count_milliseconds(diff), 1.0f);
+    ::statsClient->inc("transactions.accepted", 1.0f);
+    ::statsClient->count("transactions.inputs", tx.vin.size(), 1.0f);
+    ::statsClient->count("transactions.outputs", tx.vout.size(), 1.0f);
 
     return MempoolAcceptResult::Success(ws.m_base_fees);
 }
@@ -1319,7 +1319,7 @@ void CChainState::InvalidChainFound(CBlockIndex* pindexNew)
 {
     AssertLockHeld(cs_main);
 
-    statsClient.inc("warnings.InvalidChainFound", 1.0f);
+    ::statsClient->inc("warnings.InvalidChainFound", 1.0f);
 
     if (!m_chainman.m_best_invalid || pindexNew->nChainWork > m_chainman.m_best_invalid->nChainWork) {
         m_chainman.m_best_invalid = pindexNew;
@@ -1343,7 +1343,7 @@ void CChainState::ConflictingChainFound(CBlockIndex* pindexNew)
 {
     AssertLockHeld(cs_main);
 
-    statsClient.inc("warnings.ConflictingChainFound", 1.0f);
+    ::statsClient->inc("warnings.ConflictingChainFound", 1.0f);
 
     LogPrintf("%s: conflicting block=%s  height=%d  log2_work=%f  date=%s\n", __func__,
       pindexNew->GetBlockHash().ToString(), pindexNew->nHeight,
@@ -1362,7 +1362,7 @@ void CChainState::InvalidBlockFound(CBlockIndex *pindex, const BlockValidationSt
 {
     AssertLockHeld(cs_main);
 
-    statsClient.inc("warnings.InvalidBlockFound", 1.0f);
+    ::statsClient->inc("warnings.InvalidBlockFound", 1.0f);
     if (state.GetResult() != BlockValidationResult::BLOCK_MUTATED) {
         pindex->nStatus |= BLOCK_FAILED_VALID;
         m_chainman.m_failed_blocks.insert(pindex);
@@ -1526,7 +1526,7 @@ bool CheckInputScripts(const CTransaction& tx, TxValidationState &state, const C
 
     auto finish = Now<SteadyMilliseconds>();
     auto diff = finish - start;
-    statsClient.timing("CheckInputScripts_ms", count_milliseconds(diff), 1.0f);
+    ::statsClient->timing("CheckInputScripts_ms", count_milliseconds(diff), 1.0f);
     return true;
 }
 
@@ -1729,7 +1729,7 @@ DisconnectResult CChainState::DisconnectBlock(const CBlock& block, const CBlockI
 
     auto finish = Now<SteadyMilliseconds>();
     auto diff = finish - start;
-    statsClient.timing("DisconnectBlock_ms", count_milliseconds(diff), 1.0f);
+    ::statsClient->timing("DisconnectBlock_ms", count_milliseconds(diff), 1.0f);
 
     return fClean ? DISCONNECT_OK : DISCONNECT_UNCLEAN;
 }
@@ -2296,12 +2296,12 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state,
     int64_t nTime8 = GetTimeMicros(); nTimeCallbacks += nTime8 - nTime5;
     LogPrint(BCLog::BENCHMARK, "    - Callbacks: %.2fms [%.2fs (%.2fms/blk)]\n", MILLI * (nTime8 - nTime5), nTimeCallbacks * MICRO, nTimeCallbacks * MILLI / nBlocksTotal);
 
-    statsClient.timing("ConnectBlock_ms", (nTime8 - nTimeStart) / 1000, 1.0f);
-    statsClient.gauge("blocks.tip.SizeBytes", ::GetSerializeSize(block, PROTOCOL_VERSION), 1.0f);
-    statsClient.gauge("blocks.tip.Height", m_chain.Height(), 1.0f);
-    statsClient.gauge("blocks.tip.Version", block.nVersion, 1.0f);
-    statsClient.gauge("blocks.tip.NumTransactions", block.vtx.size(), 1.0f);
-    statsClient.gauge("blocks.tip.SigOps", nSigOps, 1.0f);
+    ::statsClient->timing("ConnectBlock_ms", (nTime8 - nTimeStart) / 1000, 1.0f);
+    ::statsClient->gauge("blocks.tip.SizeBytes", ::GetSerializeSize(block, PROTOCOL_VERSION), 1.0f);
+    ::statsClient->gauge("blocks.tip.Height", m_chain.Height(), 1.0f);
+    ::statsClient->gauge("blocks.tip.Version", block.nVersion, 1.0f);
+    ::statsClient->gauge("blocks.tip.NumTransactions", block.vtx.size(), 1.0f);
+    ::statsClient->gauge("blocks.tip.SigOps", nSigOps, 1.0f);
 
     TRACE6(validation, block_connected,
         block.GetHash().data(),
@@ -2772,7 +2772,7 @@ bool CChainState::ConnectTip(BlockValidationState& state, CBlockIndex* pindexNew
     LogPrint(BCLog::BENCHMARK, "  - Connect postprocess: %.2fms [%.2fs (%.2fms/blk)]\n", (nTime6 - nTime5) * MILLI, nTimePostConnect * MICRO, nTimePostConnect * MILLI / nBlocksTotal);
     LogPrint(BCLog::BENCHMARK, "- Connect block: %.2fms [%.2fs (%.2fms/blk)]\n", (nTime6 - nTime1) * MILLI, nTimeTotal * MICRO, nTimeTotal * MILLI / nBlocksTotal);
 
-    statsClient.timing("ConnectTip_ms", (nTime6 - nTime1) / 1000, 1.0f);
+    ::statsClient->timing("ConnectTip_ms", (nTime6 - nTime1) / 1000, 1.0f);
 
     connectTrace.BlockConnected(pindexNew, std::move(pthisBlock));
     return true;
@@ -3084,7 +3084,7 @@ bool CChainState::ActivateBestChain(BlockValidationState& state, std::shared_ptr
 
     auto finish = Now<SteadyMilliseconds>();
     auto diff = finish - start;
-    statsClient.timing("ActivateBestChain_ms", count_milliseconds(diff), 1.0f);
+    ::statsClient->timing("ActivateBestChain_ms", count_milliseconds(diff), 1.0f);
 
     // Write changes periodically to disk, after relay.
     if (!FlushStateToDisk(state, FlushStateMode::PERIODIC)) {
@@ -3572,7 +3572,7 @@ bool CheckBlock(const CBlock& block, BlockValidationState& state, const Consensu
 
     auto finish = Now<SteadyMicroseconds>();
     auto diff = finish - start;
-    statsClient.timing("CheckBlock_us", count_microseconds(diff), 1.0f);
+    ::statsClient->timing("CheckBlock_us", count_microseconds(diff), 1.0f);
 
     return true;
 }
@@ -3943,7 +3943,7 @@ bool CChainState::AcceptBlock(const std::shared_ptr<const CBlock>& pblock, Block
 
     auto finish = Now<SteadyMicroseconds>();
     auto diff = finish - start;
-    statsClient.timing("AcceptBlock_us", count_microseconds(diff), 1.0f);
+    ::statsClient->timing("AcceptBlock_us", count_microseconds(diff), 1.0f);
 
     return true;
 }

From 5133d88415bdff2e32a921d3ee10f5e81920d91b Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 2 Sep 2024 12:00:02 +0000
Subject: [PATCH 02/13] stats: s/statsClient/g_stats_client/g

---
 src/init.cpp                   | 40 +++++++++++++--------------
 src/net.cpp                    | 40 +++++++++++++--------------
 src/net_processing.cpp         | 10 +++----
 src/statsd_client.cpp          |  2 +-
 src/statsd_client.h            |  2 +-
 src/test/util/setup_common.cpp |  4 +--
 src/txorphanage.cpp            |  8 +++---
 src/validation.cpp             | 50 +++++++++++++++++-----------------
 8 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 9e616b5e5b..6f3ba2c958 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -289,7 +289,7 @@ void PrepareShutdown(NodeContext& node)
     node.banman.reset();
     node.addrman.reset();
     node.netgroupman.reset();
-    ::statsClient.reset();
+    ::g_stats_client.reset();
 
     if (node.mempool && node.mempool->IsLoaded() && node.args->GetBoolArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
         DumpMempool(*node.mempool);
@@ -840,12 +840,12 @@ static void PeriodicStats(ArgsManager& args, ChainstateManager& chainman, const
     CCoinsStats stats{CoinStatsHashType::NONE};
     chainman.ActiveChainstate().ForceFlushStateToDisk();
     if (WITH_LOCK(cs_main, return GetUTXOStats(&chainman.ActiveChainstate().CoinsDB(), std::ref(chainman.m_blockman), stats, RpcInterruptionPoint, chainman.ActiveChain().Tip()))) {
-        ::statsClient->gauge("utxoset.tx", stats.nTransactions, 1.0f);
-        ::statsClient->gauge("utxoset.txOutputs", stats.nTransactionOutputs, 1.0f);
-        ::statsClient->gauge("utxoset.dbSizeBytes", stats.nDiskSize, 1.0f);
-        ::statsClient->gauge("utxoset.blockHeight", stats.nHeight, 1.0f);
+        ::g_stats_client->gauge("utxoset.tx", stats.nTransactions, 1.0f);
+        ::g_stats_client->gauge("utxoset.txOutputs", stats.nTransactionOutputs, 1.0f);
+        ::g_stats_client->gauge("utxoset.dbSizeBytes", stats.nDiskSize, 1.0f);
+        ::g_stats_client->gauge("utxoset.blockHeight", stats.nHeight, 1.0f);
         if (stats.total_amount.has_value()) {
-            ::statsClient->gauge("utxoset.totalAmount", (double)stats.total_amount.value() / (double)COIN, 1.0f);
+            ::g_stats_client->gauge("utxoset.totalAmount", (double)stats.total_amount.value() / (double)COIN, 1.0f);
         }
     } else {
         // something went wrong
@@ -867,22 +867,22 @@ static void PeriodicStats(ArgsManager& args, ChainstateManager& chainman, const
     int64_t timeDiff = maxTime - minTime;
     double nNetworkHashPS = workDiff.getdouble() / timeDiff;
 
-    ::statsClient->gaugeDouble("network.hashesPerSecond", nNetworkHashPS);
-    ::statsClient->gaugeDouble("network.terahashesPerSecond", nNetworkHashPS / 1e12);
-    ::statsClient->gaugeDouble("network.petahashesPerSecond", nNetworkHashPS / 1e15);
-    ::statsClient->gaugeDouble("network.exahashesPerSecond", nNetworkHashPS / 1e18);
+    ::g_stats_client->gaugeDouble("network.hashesPerSecond", nNetworkHashPS);
+    ::g_stats_client->gaugeDouble("network.terahashesPerSecond", nNetworkHashPS / 1e12);
+    ::g_stats_client->gaugeDouble("network.petahashesPerSecond", nNetworkHashPS / 1e15);
+    ::g_stats_client->gaugeDouble("network.exahashesPerSecond", nNetworkHashPS / 1e18);
     // No need for cs_main, we never use null tip here
-    ::statsClient->gaugeDouble("network.difficulty", (double)GetDifficulty(tip));
+    ::g_stats_client->gaugeDouble("network.difficulty", (double)GetDifficulty(tip));
 
-    ::statsClient->gauge("transactions.txCacheSize", WITH_LOCK(cs_main, return chainman.ActiveChainstate().CoinsTip().GetCacheSize()), 1.0f);
-    ::statsClient->gauge("transactions.totalTransactions", tip->nChainTx, 1.0f);
+    ::g_stats_client->gauge("transactions.txCacheSize", WITH_LOCK(cs_main, return chainman.ActiveChainstate().CoinsTip().GetCacheSize()), 1.0f);
+    ::g_stats_client->gauge("transactions.totalTransactions", tip->nChainTx, 1.0f);
 
     {
         LOCK(mempool.cs);
-        ::statsClient->gauge("transactions.mempool.totalTransactions", mempool.size(), 1.0f);
-        ::statsClient->gauge("transactions.mempool.totalTxBytes", (int64_t) mempool.GetTotalTxSize(), 1.0f);
-        ::statsClient->gauge("transactions.mempool.memoryUsageBytes", (int64_t) mempool.DynamicMemoryUsage(), 1.0f);
-        ::statsClient->gauge("transactions.mempool.minFeePerKb", mempool.GetMinFee(args.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK(), 1.0f);
+        ::g_stats_client->gauge("transactions.mempool.totalTransactions", mempool.size(), 1.0f);
+        ::g_stats_client->gauge("transactions.mempool.totalTxBytes", (int64_t) mempool.GetTotalTxSize(), 1.0f);
+        ::g_stats_client->gauge("transactions.mempool.memoryUsageBytes", (int64_t) mempool.DynamicMemoryUsage(), 1.0f);
+        ::g_stats_client->gauge("transactions.mempool.minFeePerKb", mempool.GetMinFee(args.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK(), 1.0f);
     }
 }
 
@@ -1525,10 +1525,10 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     fDiscover = args.GetBoolArg("-discover", true);
     const bool ignores_incoming_txs{args.GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)};
 
-    // We need to initialize statsClient early as currently, statsClient is called
+    // We need to initialize g_stats_client early as currently, g_stats_client is called
     // regardless of whether transmitting stats are desirable or not and if
-    // statsClient isn't present when that attempt is made, the client will crash.
-    ::statsClient = std::make_unique<statsd::StatsdClient>();
+    // g_stats_client isn't present when that attempt is made, the client will crash.
+    ::g_stats_client = std::make_unique<statsd::StatsdClient>();
 
     {
 
diff --git a/src/net.cpp b/src/net.cpp
index a9d06db3d6..5a33ebc725 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -623,7 +623,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
                              /*inbound_onion=*/false,
                              std::move(i2p_transient_session));
     pnode->AddRef();
-    ::statsClient->inc("peers.connect", 1.0f);
+    ::g_stats_client->inc("peers.connect", 1.0f);
 
     // We're making a new connection, harvest entropy from the time (and our peer count)
     RandAddEvent((uint32_t)id);
@@ -666,7 +666,7 @@ void CNode::CloseSocketDisconnect(CConnman* connman)
     m_sock.reset();
     m_i2p_sam_session.reset();
 
-    ::statsClient->inc("peers.disconnect", 1.0f);
+    ::g_stats_client->inc("peers.disconnect", 1.0f);
 }
 
 void CConnman::AddWhitelistPermissionFlags(NetPermissionFlags& flags, const CNetAddr &addr) const {
@@ -817,7 +817,7 @@ bool CNode::ReceiveMsgBytes(Span<const uint8_t> msg_bytes, bool& complete)
             }
             assert(i != mapRecvBytesPerMsgType.end());
             i->second += msg.m_raw_message_size;
-            ::statsClient->count("bandwidth.message." + std::string(msg.m_type) + ".bytesReceived", msg.m_raw_message_size, 1.0f);
+            ::g_stats_client->count("bandwidth.message." + std::string(msg.m_type) + ".bytesReceived", msg.m_raw_message_size, 1.0f);
 
             // push the message to the process queue,
             vRecvMsg.push_back(std::move(msg));
@@ -1741,20 +1741,20 @@ void CConnman::CalculateNumConnectionsChangedStats()
             torNodes++;
         const auto last_ping_time = count_microseconds(pnode->m_last_ping_time);
         if (last_ping_time > 0)
-            ::statsClient->timing("peers.ping_us", last_ping_time, 1.0f);
+            ::g_stats_client->timing("peers.ping_us", last_ping_time, 1.0f);
     }
     for (const std::string &msg : getAllNetMessageTypes()) {
-        ::statsClient->gauge("bandwidth.message." + msg + ".totalBytesReceived", mapRecvBytesMsgStats[msg], 1.0f);
-        ::statsClient->gauge("bandwidth.message." + msg + ".totalBytesSent", mapSentBytesMsgStats[msg], 1.0f);
+        ::g_stats_client->gauge("bandwidth.message." + msg + ".totalBytesReceived", mapRecvBytesMsgStats[msg], 1.0f);
+        ::g_stats_client->gauge("bandwidth.message." + msg + ".totalBytesSent", mapSentBytesMsgStats[msg], 1.0f);
     }
-    ::statsClient->gauge("peers.totalConnections", nPrevNodeCount, 1.0f);
-    ::statsClient->gauge("peers.spvNodeConnections", spvNodes, 1.0f);
-    ::statsClient->gauge("peers.fullNodeConnections", fullNodes, 1.0f);
-    ::statsClient->gauge("peers.inboundConnections", inboundNodes, 1.0f);
-    ::statsClient->gauge("peers.outboundConnections", outboundNodes, 1.0f);
-    ::statsClient->gauge("peers.ipv4Connections", ipv4Nodes, 1.0f);
-    ::statsClient->gauge("peers.ipv6Connections", ipv6Nodes, 1.0f);
-    ::statsClient->gauge("peers.torConnections", torNodes, 1.0f);
+    ::g_stats_client->gauge("peers.totalConnections", nPrevNodeCount, 1.0f);
+    ::g_stats_client->gauge("peers.spvNodeConnections", spvNodes, 1.0f);
+    ::g_stats_client->gauge("peers.fullNodeConnections", fullNodes, 1.0f);
+    ::g_stats_client->gauge("peers.inboundConnections", inboundNodes, 1.0f);
+    ::g_stats_client->gauge("peers.outboundConnections", outboundNodes, 1.0f);
+    ::g_stats_client->gauge("peers.ipv4Connections", ipv4Nodes, 1.0f);
+    ::g_stats_client->gauge("peers.ipv6Connections", ipv6Nodes, 1.0f);
+    ::g_stats_client->gauge("peers.torConnections", torNodes, 1.0f);
 }
 
 bool CConnman::ShouldRunInactivityChecks(const CNode& node, std::chrono::seconds now) const
@@ -4124,8 +4124,8 @@ bool CConnman::DisconnectNode(NodeId id)
 void CConnman::RecordBytesRecv(uint64_t bytes)
 {
     nTotalBytesRecv += bytes;
-    ::statsClient->count("bandwidth.bytesReceived", bytes, 0.1f);
-    ::statsClient->gauge("bandwidth.totalBytesReceived", nTotalBytesRecv, 0.01f);
+    ::g_stats_client->count("bandwidth.bytesReceived", bytes, 0.1f);
+    ::g_stats_client->gauge("bandwidth.totalBytesReceived", nTotalBytesRecv, 0.01f);
 }
 
 void CConnman::RecordBytesSent(uint64_t bytes)
@@ -4134,8 +4134,8 @@ void CConnman::RecordBytesSent(uint64_t bytes)
     LOCK(m_total_bytes_sent_mutex);
 
     nTotalBytesSent += bytes;
-    ::statsClient->count("bandwidth.bytesSent", bytes, 0.01f);
-    ::statsClient->gauge("bandwidth.totalBytesSent", nTotalBytesSent, 0.01f);
+    ::g_stats_client->count("bandwidth.bytesSent", bytes, 0.01f);
+    ::g_stats_client->gauge("bandwidth.totalBytesSent", nTotalBytesSent, 0.01f);
 
     const auto now = GetTime<std::chrono::seconds>();
     if (nMaxOutboundCycleStartTime + MAX_UPLOAD_TIMEFRAME < now)
@@ -4291,8 +4291,8 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
         msg.data.data()
     );
 
-    ::statsClient->count(strprintf("bandwidth.message.%s.bytesSent", msg.m_type), nMessageSize, 1.0f);
-    ::statsClient->inc(strprintf("message.sent.%s", msg.m_type), 1.0f);
+    ::g_stats_client->count(strprintf("bandwidth.message.%s.bytesSent", msg.m_type), nMessageSize, 1.0f);
+    ::g_stats_client->inc(strprintf("message.sent.%s", msg.m_type), 1.0f);
 
     {
         LOCK(pnode->cs_vSend);
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index ae060bdaa8..e5498bbbf6 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1688,9 +1688,9 @@ void PeerManagerImpl::Misbehaving(const NodeId pnode, const int howmuch, const s
     if (score_now >= DISCOURAGEMENT_THRESHOLD && score_before < DISCOURAGEMENT_THRESHOLD) {
         warning = " DISCOURAGE THRESHOLD EXCEEDED";
         peer->m_should_discourage = true;
-        ::statsClient->inc("misbehavior.banned", 1.0f);
+        ::g_stats_client->inc("misbehavior.banned", 1.0f);
     } else {
-        ::statsClient->count("misbehavior.amount", howmuch, 1.0);
+        ::g_stats_client->count("misbehavior.amount", howmuch, 1.0);
     }
 
     LogPrint(BCLog::NET, "Misbehaving: peer=%d (%d -> %d)%s%s\n",
@@ -3260,7 +3260,7 @@ void PeerManagerImpl::ProcessMessage(
     AssertLockHeld(g_msgproc_mutex);
 
     LogPrint(BCLog::NET, "received: %s (%u bytes) peer=%d\n", SanitizeString(msg_type), vRecv.size(), pfrom.GetId());
-    ::statsClient->inc("message.received." + SanitizeString(msg_type), 1.0f);
+    ::g_stats_client->inc("message.received." + SanitizeString(msg_type), 1.0f);
 
     const bool is_masternode = m_mn_activeman != nullptr;
 
@@ -3759,7 +3759,7 @@ void PeerManagerImpl::ProcessMessage(
             if (inv.IsMsgBlk()) {
                 const bool fAlreadyHave = AlreadyHaveBlock(inv.hash);
                 LogPrint(BCLog::NET, "got inv: %s  %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom.GetId());
-                ::statsClient->inc(strprintf("message.received.inv_%s", inv.GetCommand()), 1.0f);
+                ::g_stats_client->inc(strprintf("message.received.inv_%s", inv.GetCommand()), 1.0f);
 
                 UpdateBlockAvailability(pfrom.GetId(), inv.hash);
                 if (!fAlreadyHave && !fImporting && !fReindex && !mapBlocksInFlight.count(inv.hash)) {
@@ -3774,7 +3774,7 @@ void PeerManagerImpl::ProcessMessage(
             } else {
                 const bool fAlreadyHave = AlreadyHave(inv);
                 LogPrint(BCLog::NET, "got inv: %s  %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom.GetId());
-                ::statsClient->inc(strprintf("message.received.inv_%s", inv.GetCommand()), 1.0f);
+                ::g_stats_client->inc(strprintf("message.received.inv_%s", inv.GetCommand()), 1.0f);
 
                 static std::set<int> allowWhileInIBDObjs = {
                         MSG_SPORK
diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index 4fc9170245..cd8a940125 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cmath>
 #include <cstdio>
 
-std::unique_ptr<statsd::StatsdClient> statsClient;
+std::unique_ptr<statsd::StatsdClient> g_stats_client;
 
 namespace statsd {
 
diff --git a/src/statsd_client.h b/src/statsd_client.h
index 5b6dea5799..736b55e167 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -66,6 +66,6 @@ class StatsdClient {
 
 } // namespace statsd
 
-extern std::unique_ptr<statsd::StatsdClient> statsClient;
+extern std::unique_ptr<statsd::StatsdClient> g_stats_client;
 
 #endif // BITCOIN_STATSD_CLIENT_H
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index ac4b868ed5..2f7538ddf5 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -183,7 +183,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
     SetupNetworking();
     InitSignatureCache();
     InitScriptExecutionCache();
-    ::statsClient = std::make_unique<statsd::StatsdClient>();
+    ::g_stats_client = std::make_unique<statsd::StatsdClient>();
     m_node.chain = interfaces::MakeChain(m_node);
 
     m_node.netgroupman = std::make_unique<NetGroupManager>(/*asmap=*/std::vector<bool>());
@@ -219,7 +219,7 @@ BasicTestingSetup::~BasicTestingSetup()
     m_node.connman.reset();
     m_node.addrman.reset();
     m_node.netgroupman.reset();
-    ::statsClient.reset();
+    ::g_stats_client.reset();
 
     LogInstance().DisconnectTestLogger();
     fs::remove_all(m_path_root);
diff --git a/src/txorphanage.cpp b/src/txorphanage.cpp
index b79bf88d62..31f6997da5 100644
--- a/src/txorphanage.cpp
+++ b/src/txorphanage.cpp
@@ -51,8 +51,8 @@ bool TxOrphanage::AddTx(const CTransactionRef& tx, NodeId peer)
 
     LogPrint(BCLog::MEMPOOL, "stored orphan tx %s (mapsz %u outsz %u)\n", hash.ToString(),
              m_orphans.size(), m_outpoint_to_orphan_it.size());
-    ::statsClient->inc("transactions.orphans.add", 1.0f);
-    ::statsClient->gauge("transactions.orphans", m_orphans.size());
+    ::g_stats_client->inc("transactions.orphans.add", 1.0f);
+    ::g_stats_client->gauge("transactions.orphans", m_orphans.size());
 
     return true;
 }
@@ -87,8 +87,8 @@ int TxOrphanage::EraseTx(const uint256& txid)
     assert(m_orphan_tx_size >= it->second.nTxSize);
     m_orphan_tx_size -= it->second.nTxSize;
     m_orphans.erase(it);
-    ::statsClient->inc("transactions.orphans.remove", 1.0f);
-    ::statsClient->gauge("transactions.orphans", m_orphans.size());
+    ::g_stats_client->inc("transactions.orphans.remove", 1.0f);
+    ::g_stats_client->gauge("transactions.orphans", m_orphans.size());
     return 1;
 }
 
diff --git a/src/validation.cpp b/src/validation.cpp
index 5c7610d181..5f422c122e 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -612,7 +612,7 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
 
     // is it already in the memory pool?
     if (m_pool.exists(hash)) {
-        ::statsClient->inc("transactions.duplicate", 1.0f);
+        ::g_stats_client->inc("transactions.duplicate", 1.0f);
         return state.Invalid(TxValidationResult::TX_CONFLICT, "txn-already-in-mempool");
     }
 
@@ -838,11 +838,11 @@ bool MemPoolAccept::Finalize(const ATMPArgs& args, Workspace& ws)
     CAmount nValueOut = tx.GetValueOut();
     unsigned int nSigOps = GetTransactionSigOpCount(tx, m_view, STANDARD_SCRIPT_VERIFY_FLAGS);
 
-    ::statsClient->count("transactions.sizeBytes", entry->GetTxSize(), 1.0f);
-    ::statsClient->count("transactions.fees", nModifiedFees, 1.0f);
-    ::statsClient->count("transactions.inputValue", nValueOut - nModifiedFees, 1.0f);
-    ::statsClient->count("transactions.outputValue", nValueOut, 1.0f);
-    ::statsClient->count("transactions.sigOps", nSigOps, 1.0f);
+    ::g_stats_client->count("transactions.sizeBytes", entry->GetTxSize(), 1.0f);
+    ::g_stats_client->count("transactions.fees", nModifiedFees, 1.0f);
+    ::g_stats_client->count("transactions.inputValue", nValueOut - nModifiedFees, 1.0f);
+    ::g_stats_client->count("transactions.outputValue", nValueOut, 1.0f);
+    ::g_stats_client->count("transactions.sigOps", nSigOps, 1.0f);
 
     // Add memory address index
     if (fAddressIndex) {
@@ -895,10 +895,10 @@ MempoolAcceptResult MemPoolAccept::AcceptSingleTransaction(const CTransactionRef
     const CTransaction& tx = *ptx;
     auto finish = Now<SteadyMilliseconds>();
     auto diff = finish - start;
-    ::statsClient->timing("AcceptToMemoryPool_ms", count_milliseconds(diff), 1.0f);
-    ::statsClient->inc("transactions.accepted", 1.0f);
-    ::statsClient->count("transactions.inputs", tx.vin.size(), 1.0f);
-    ::statsClient->count("transactions.outputs", tx.vout.size(), 1.0f);
+    ::g_stats_client->timing("AcceptToMemoryPool_ms", count_milliseconds(diff), 1.0f);
+    ::g_stats_client->inc("transactions.accepted", 1.0f);
+    ::g_stats_client->count("transactions.inputs", tx.vin.size(), 1.0f);
+    ::g_stats_client->count("transactions.outputs", tx.vout.size(), 1.0f);
 
     return MempoolAcceptResult::Success(ws.m_base_fees);
 }
@@ -1319,7 +1319,7 @@ void CChainState::InvalidChainFound(CBlockIndex* pindexNew)
 {
     AssertLockHeld(cs_main);
 
-    ::statsClient->inc("warnings.InvalidChainFound", 1.0f);
+    ::g_stats_client->inc("warnings.InvalidChainFound", 1.0f);
 
     if (!m_chainman.m_best_invalid || pindexNew->nChainWork > m_chainman.m_best_invalid->nChainWork) {
         m_chainman.m_best_invalid = pindexNew;
@@ -1343,7 +1343,7 @@ void CChainState::ConflictingChainFound(CBlockIndex* pindexNew)
 {
     AssertLockHeld(cs_main);
 
-    ::statsClient->inc("warnings.ConflictingChainFound", 1.0f);
+    ::g_stats_client->inc("warnings.ConflictingChainFound", 1.0f);
 
     LogPrintf("%s: conflicting block=%s  height=%d  log2_work=%f  date=%s\n", __func__,
       pindexNew->GetBlockHash().ToString(), pindexNew->nHeight,
@@ -1362,7 +1362,7 @@ void CChainState::InvalidBlockFound(CBlockIndex *pindex, const BlockValidationSt
 {
     AssertLockHeld(cs_main);
 
-    ::statsClient->inc("warnings.InvalidBlockFound", 1.0f);
+    ::g_stats_client->inc("warnings.InvalidBlockFound", 1.0f);
     if (state.GetResult() != BlockValidationResult::BLOCK_MUTATED) {
         pindex->nStatus |= BLOCK_FAILED_VALID;
         m_chainman.m_failed_blocks.insert(pindex);
@@ -1526,7 +1526,7 @@ bool CheckInputScripts(const CTransaction& tx, TxValidationState &state, const C
 
     auto finish = Now<SteadyMilliseconds>();
     auto diff = finish - start;
-    ::statsClient->timing("CheckInputScripts_ms", count_milliseconds(diff), 1.0f);
+    ::g_stats_client->timing("CheckInputScripts_ms", count_milliseconds(diff), 1.0f);
     return true;
 }
 
@@ -1729,7 +1729,7 @@ DisconnectResult CChainState::DisconnectBlock(const CBlock& block, const CBlockI
 
     auto finish = Now<SteadyMilliseconds>();
     auto diff = finish - start;
-    ::statsClient->timing("DisconnectBlock_ms", count_milliseconds(diff), 1.0f);
+    ::g_stats_client->timing("DisconnectBlock_ms", count_milliseconds(diff), 1.0f);
 
     return fClean ? DISCONNECT_OK : DISCONNECT_UNCLEAN;
 }
@@ -2296,12 +2296,12 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state,
     int64_t nTime8 = GetTimeMicros(); nTimeCallbacks += nTime8 - nTime5;
     LogPrint(BCLog::BENCHMARK, "    - Callbacks: %.2fms [%.2fs (%.2fms/blk)]\n", MILLI * (nTime8 - nTime5), nTimeCallbacks * MICRO, nTimeCallbacks * MILLI / nBlocksTotal);
 
-    ::statsClient->timing("ConnectBlock_ms", (nTime8 - nTimeStart) / 1000, 1.0f);
-    ::statsClient->gauge("blocks.tip.SizeBytes", ::GetSerializeSize(block, PROTOCOL_VERSION), 1.0f);
-    ::statsClient->gauge("blocks.tip.Height", m_chain.Height(), 1.0f);
-    ::statsClient->gauge("blocks.tip.Version", block.nVersion, 1.0f);
-    ::statsClient->gauge("blocks.tip.NumTransactions", block.vtx.size(), 1.0f);
-    ::statsClient->gauge("blocks.tip.SigOps", nSigOps, 1.0f);
+    ::g_stats_client->timing("ConnectBlock_ms", (nTime8 - nTimeStart) / 1000, 1.0f);
+    ::g_stats_client->gauge("blocks.tip.SizeBytes", ::GetSerializeSize(block, PROTOCOL_VERSION), 1.0f);
+    ::g_stats_client->gauge("blocks.tip.Height", m_chain.Height(), 1.0f);
+    ::g_stats_client->gauge("blocks.tip.Version", block.nVersion, 1.0f);
+    ::g_stats_client->gauge("blocks.tip.NumTransactions", block.vtx.size(), 1.0f);
+    ::g_stats_client->gauge("blocks.tip.SigOps", nSigOps, 1.0f);
 
     TRACE6(validation, block_connected,
         block.GetHash().data(),
@@ -2772,7 +2772,7 @@ bool CChainState::ConnectTip(BlockValidationState& state, CBlockIndex* pindexNew
     LogPrint(BCLog::BENCHMARK, "  - Connect postprocess: %.2fms [%.2fs (%.2fms/blk)]\n", (nTime6 - nTime5) * MILLI, nTimePostConnect * MICRO, nTimePostConnect * MILLI / nBlocksTotal);
     LogPrint(BCLog::BENCHMARK, "- Connect block: %.2fms [%.2fs (%.2fms/blk)]\n", (nTime6 - nTime1) * MILLI, nTimeTotal * MICRO, nTimeTotal * MILLI / nBlocksTotal);
 
-    ::statsClient->timing("ConnectTip_ms", (nTime6 - nTime1) / 1000, 1.0f);
+    ::g_stats_client->timing("ConnectTip_ms", (nTime6 - nTime1) / 1000, 1.0f);
 
     connectTrace.BlockConnected(pindexNew, std::move(pthisBlock));
     return true;
@@ -3084,7 +3084,7 @@ bool CChainState::ActivateBestChain(BlockValidationState& state, std::shared_ptr
 
     auto finish = Now<SteadyMilliseconds>();
     auto diff = finish - start;
-    ::statsClient->timing("ActivateBestChain_ms", count_milliseconds(diff), 1.0f);
+    ::g_stats_client->timing("ActivateBestChain_ms", count_milliseconds(diff), 1.0f);
 
     // Write changes periodically to disk, after relay.
     if (!FlushStateToDisk(state, FlushStateMode::PERIODIC)) {
@@ -3572,7 +3572,7 @@ bool CheckBlock(const CBlock& block, BlockValidationState& state, const Consensu
 
     auto finish = Now<SteadyMicroseconds>();
     auto diff = finish - start;
-    ::statsClient->timing("CheckBlock_us", count_microseconds(diff), 1.0f);
+    ::g_stats_client->timing("CheckBlock_us", count_microseconds(diff), 1.0f);
 
     return true;
 }
@@ -3943,7 +3943,7 @@ bool CChainState::AcceptBlock(const std::shared_ptr<const CBlock>& pblock, Block
 
     auto finish = Now<SteadyMicroseconds>();
     auto diff = finish - start;
-    ::statsClient->timing("AcceptBlock_us", count_microseconds(diff), 1.0f);
+    ::g_stats_client->timing("AcceptBlock_us", count_microseconds(diff), 1.0f);
 
     return true;
 }

From 30c30c1397d23fbe6b6e7da57c2b52e97d1899c9 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 2 Sep 2024 14:16:34 +0000
Subject: [PATCH 03/13] stats: fetch all arguments needed when constructing
 `g_stats_client`

There's little sense in passing a ref to `ArgsManager` just to set a few
values because we'll be `const`-ing them in an upcoming commit.
Arguments supplied are expected to last the lifetime of the program's
instance and there's little reason to keep re-fetching those values.
---
 src/init.cpp                   |  6 +++++-
 src/statsd_client.cpp          | 22 +++++++++-------------
 src/statsd_client.h            |  8 ++++++--
 src/test/util/setup_common.cpp |  8 +++++++-
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 6f3ba2c958..8630d10a32 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1528,7 +1528,11 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     // We need to initialize g_stats_client early as currently, g_stats_client is called
     // regardless of whether transmitting stats are desirable or not and if
     // g_stats_client isn't present when that attempt is made, the client will crash.
-    ::g_stats_client = std::make_unique<statsd::StatsdClient>();
+    ::g_stats_client = std::make_unique<statsd::StatsdClient>(args.GetArg("-statshost", DEFAULT_STATSD_HOST),
+                                                              args.GetArg("-statshostname", DEFAULT_STATSD_HOSTNAME),
+                                                              args.GetArg("-statsport", DEFAULT_STATSD_PORT),
+                                                              args.GetArg("-statsns", DEFAULT_STATSD_NAMESPACE),
+                                                              args.GetBoolArg("-statsenabled", DEFAULT_STATSD_ENABLE));
 
     {
 
diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index cd8a940125..429ad72e35 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -74,11 +74,12 @@ struct _StatsdClientData {
     char    errmsg[1024];
 };
 
-StatsdClient::StatsdClient(const std::string& host, int port, const std::string& ns) :
-    d(std::make_unique<_StatsdClientData>())
+StatsdClient::StatsdClient(const std::string& host, const std::string& nodename, int port, const std::string& ns,
+                           bool enabled)
+    : d{std::make_unique<_StatsdClientData>()}, m_enabled{enabled}
 {
     d->sock = INVALID_SOCKET;
-    config(host, port, ns);
+    config(host, nodename, port, ns);
 }
 
 StatsdClient::~StatsdClient()
@@ -87,10 +88,11 @@ StatsdClient::~StatsdClient()
     CloseSocket(d->sock);
 }
 
-void StatsdClient::config(const std::string& host, int port, const std::string& ns)
+void StatsdClient::config(const std::string& host, const std::string& nodename, int port, const std::string& ns)
 {
     d->ns = ns;
     d->host = host;
+    d->nodename = nodename;
     d->port = port;
     d->init = false;
     CloseSocket(d->sock);
@@ -98,13 +100,8 @@ void StatsdClient::config(const std::string& host, int port, const std::string&
 
 int StatsdClient::init()
 {
-    static bool fEnabled = gArgs.GetBoolArg("-statsenabled", DEFAULT_STATSD_ENABLE);
-    if (!fEnabled) return -3;
-
     if ( d->init ) return 0;
 
-    config(gArgs.GetArg("-statshost", DEFAULT_STATSD_HOST), gArgs.GetArg("-statsport", DEFAULT_STATSD_PORT), gArgs.GetArg("-statsns", DEFAULT_STATSD_NAMESPACE));
-
     d->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
     if ( d->sock == INVALID_SOCKET ) {
         snprintf(d->errmsg, sizeof(d->errmsg), "could not create socket, err=%m");
@@ -121,10 +118,6 @@ int StatsdClient::init()
         return -2;
     }
 
-    if (gArgs.IsArgSet("-statshostname")) {
-        d->nodename = gArgs.GetArg("-statshostname", DEFAULT_STATSD_HOSTNAME);
-    }
-
     d->init = true;
     return 0;
 }
@@ -226,6 +219,9 @@ int StatsdClient::sendDouble(std::string key, double value, const std::string& t
 
 int StatsdClient::send(const std::string& message)
 {
+    if (!m_enabled)
+        return -3;
+
     int ret = init();
     if ( ret )
     {
diff --git a/src/statsd_client.h b/src/statsd_client.h
index 736b55e167..f93469d20b 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -25,12 +25,13 @@ struct _StatsdClientData;
 
 class StatsdClient {
     public:
-        explicit StatsdClient(const std::string& host = DEFAULT_STATSD_HOST, int port = DEFAULT_STATSD_PORT, const std::string& ns = DEFAULT_STATSD_NAMESPACE);
+        explicit StatsdClient(const std::string& host, const std::string& nodename, int port, const std::string& ns,
+                              bool enabled);
         ~StatsdClient();
 
     public:
         // you can config at anytime; client will use new address (useful for Singleton)
-        void config(const std::string& host, int port, const std::string& ns = DEFAULT_STATSD_NAMESPACE);
+        void config(const std::string& host, const std::string& nodename, int port, const std::string& ns);
         const char* errmsg();
 
     public:
@@ -62,6 +63,9 @@ class StatsdClient {
 
     protected:
         const std::unique_ptr<struct _StatsdClientData> d;
+
+    private:
+        const bool m_enabled{false};
 };
 
 } // namespace statsd
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 2f7538ddf5..4e98f2cc3a 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -183,7 +183,13 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::ve
     SetupNetworking();
     InitSignatureCache();
     InitScriptExecutionCache();
-    ::g_stats_client = std::make_unique<statsd::StatsdClient>();
+    ::g_stats_client = std::make_unique<statsd::StatsdClient>(
+        m_node.args->GetArg("-statshost", DEFAULT_STATSD_HOST),
+        m_node.args->GetArg("-statshostname", DEFAULT_STATSD_HOSTNAME),
+        m_node.args->GetArg("-statsport", DEFAULT_STATSD_PORT),
+        m_node.args->GetArg("-statsns", DEFAULT_STATSD_NAMESPACE),
+        m_node.args->GetBoolArg("-statsenabled", DEFAULT_STATSD_ENABLE)
+    );
     m_node.chain = interfaces::MakeChain(m_node);
 
     m_node.netgroupman = std::make_unique<NetGroupManager>(/*asmap=*/std::vector<bool>());

From a9d1b1494d4f430531c8f4345d63576d454a1e2e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 5 Sep 2024 07:51:25 +0000
Subject: [PATCH 04/13] stats: move `_StatsdClientData` variables into
 `StatsdClient`

There doesn't seem to be a benefit to keeping these values in a separate
struct.
---
 src/statsd_client.cpp | 79 ++++++++++++++-----------------------------
 src/statsd_client.h   | 24 +++++++------
 2 files changed, 39 insertions(+), 64 deletions(-)

diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index 429ad72e35..efb61c90af 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 std::unique_ptr<statsd::StatsdClient> g_stats_client;
 
 namespace statsd {
-
 inline bool fequal(float a, float b)
 {
     const float epsilon = 0.0001;
@@ -61,64 +60,39 @@ inline bool should_send(float sample_rate)
     return sample_rate > p;
 }
 
-struct _StatsdClientData {
-    SOCKET  sock;
-    struct  sockaddr_in server;
-
-    std::string  ns;
-    std::string  host;
-    std::string  nodename;
-    short   port;
-    bool    init;
-
-    char    errmsg[1024];
-};
-
-StatsdClient::StatsdClient(const std::string& host, const std::string& nodename, int port, const std::string& ns,
+StatsdClient::StatsdClient(const std::string& host, const std::string& nodename, short port, const std::string& ns,
                            bool enabled)
-    : d{std::make_unique<_StatsdClientData>()}, m_enabled{enabled}
+    : m_enabled{enabled}, m_port{port}, m_host{host}, m_nodename{nodename}, m_ns{ns}
 {
-    d->sock = INVALID_SOCKET;
-    config(host, nodename, port, ns);
 }
 
 StatsdClient::~StatsdClient()
 {
     // close socket
-    CloseSocket(d->sock);
-}
-
-void StatsdClient::config(const std::string& host, const std::string& nodename, int port, const std::string& ns)
-{
-    d->ns = ns;
-    d->host = host;
-    d->nodename = nodename;
-    d->port = port;
-    d->init = false;
-    CloseSocket(d->sock);
+    CloseSocket(m_sock);
 }
 
 int StatsdClient::init()
 {
-    if ( d->init ) return 0;
+    if ( m_init ) return 0;
 
-    d->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if ( d->sock == INVALID_SOCKET ) {
-        snprintf(d->errmsg, sizeof(d->errmsg), "could not create socket, err=%m");
+    m_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    if ( m_sock == INVALID_SOCKET ) {
+        snprintf(m_errmsg, sizeof(m_errmsg), "could not create socket, err=%m");
         return -1;
     }
 
-    memset(&d->server, 0, sizeof(d->server));
-    d->server.sin_family = AF_INET;
-    d->server.sin_port = htons(d->port);
+    memset(&m_server, 0, sizeof(m_server));
+    m_server.sin_family = AF_INET;
+    m_server.sin_port = htons(m_port);
 
-    CNetAddr netaddr(d->server.sin_addr);
-    if (!LookupHost(d->host, netaddr, true) || !netaddr.GetInAddr(&d->server.sin_addr)) {
-        snprintf(d->errmsg, sizeof(d->errmsg), "LookupHost or GetInAddr failed");
+    CNetAddr netaddr(m_server.sin_addr);
+    if (!LookupHost(m_host, netaddr, true) || !netaddr.GetInAddr(&m_server.sin_addr)) {
+        snprintf(m_errmsg, sizeof(m_errmsg), "LookupHost or GetInAddr failed");
         return -2;
     }
 
-    d->init = true;
+    m_init = true;
     return 0;
 }
 
@@ -170,8 +144,8 @@ int StatsdClient::send(std::string key, size_t value, const std::string& type, f
     }
 
     // partition stats by node name if set
-    if (!d->nodename.empty())
-        key = key + "." + d->nodename;
+    if (!m_nodename.empty())
+        key = key + "." + m_nodename;
 
     cleanup(key);
 
@@ -179,12 +153,12 @@ int StatsdClient::send(std::string key, size_t value, const std::string& type, f
     if ( fequal( sample_rate, 1.0 ) )
     {
         snprintf(buf, sizeof(buf), "%s%s:%zd|%s",
-                d->ns.c_str(), key.c_str(), (ssize_t) value, type.c_str());
+                m_ns.c_str(), key.c_str(), (ssize_t) value, type.c_str());
     }
     else
     {
         snprintf(buf, sizeof(buf), "%s%s:%zd|%s|@%.2f",
-                d->ns.c_str(), key.c_str(), (ssize_t) value, type.c_str(), sample_rate);
+                m_ns.c_str(), key.c_str(), (ssize_t) value, type.c_str(), sample_rate);
     }
 
     return send(buf);
@@ -197,8 +171,8 @@ int StatsdClient::sendDouble(std::string key, double value, const std::string& t
     }
 
     // partition stats by node name if set
-    if (!d->nodename.empty())
-        key = key + "." + d->nodename;
+    if (!m_nodename.empty())
+        key = key + "." + m_nodename;
 
     cleanup(key);
 
@@ -206,12 +180,12 @@ int StatsdClient::sendDouble(std::string key, double value, const std::string& t
     if ( fequal( sample_rate, 1.0 ) )
     {
         snprintf(buf, sizeof(buf), "%s%s:%f|%s",
-                d->ns.c_str(), key.c_str(), value, type.c_str());
+                m_ns.c_str(), key.c_str(), value, type.c_str());
     }
     else
     {
         snprintf(buf, sizeof(buf), "%s%s:%f|%s|@%.2f",
-                d->ns.c_str(), key.c_str(), value, type.c_str(), sample_rate);
+                m_ns.c_str(), key.c_str(), value, type.c_str(), sample_rate);
     }
 
     return send(buf);
@@ -227,10 +201,10 @@ int StatsdClient::send(const std::string& message)
     {
         return ret;
     }
-    ret = sendto(d->sock, message.data(), message.size(), 0, reinterpret_cast<const sockaddr*>(&d->server), sizeof(d->server));
+    ret = sendto(m_sock, message.data(), message.size(), 0, reinterpret_cast<const sockaddr*>(&m_server), sizeof(m_server));
     if ( ret == -1) {
-        snprintf(d->errmsg, sizeof(d->errmsg),
-                "sendto server fail, host=%s:%d, err=%m", d->host.c_str(), d->port);
+        snprintf(m_errmsg, sizeof(m_errmsg),
+                "sendto server fail, host=%s:%d, err=%m", m_host.c_str(), m_port);
         return -1;
     }
     return 0;
@@ -238,7 +212,6 @@ int StatsdClient::send(const std::string& message)
 
 const char* StatsdClient::errmsg()
 {
-    return d->errmsg;
+    return m_errmsg;
 }
-
 } // namespace statsd
diff --git a/src/statsd_client.h b/src/statsd_client.h
index f93469d20b..ea51d3bb95 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -5,6 +5,8 @@
 #ifndef BITCOIN_STATSD_CLIENT_H
 #define BITCOIN_STATSD_CLIENT_H
 
+#include <util/sock.h>
+
 #include <string>
 #include <memory>
 
@@ -20,18 +22,13 @@ static const int MIN_STATSD_PERIOD = 5;
 static const int MAX_STATSD_PERIOD = 60 * 60;
 
 namespace statsd {
-
-struct _StatsdClientData;
-
 class StatsdClient {
     public:
-        explicit StatsdClient(const std::string& host, const std::string& nodename, int port, const std::string& ns,
+        explicit StatsdClient(const std::string& host, const std::string& nodename, short port, const std::string& ns,
                               bool enabled);
         ~StatsdClient();
 
     public:
-        // you can config at anytime; client will use new address (useful for Singleton)
-        void config(const std::string& host, const std::string& nodename, int port, const std::string& ns);
         const char* errmsg();
 
     public:
@@ -61,13 +58,18 @@ class StatsdClient {
         int init();
         static void cleanup(std::string& key);
 
-    protected:
-        const std::unique_ptr<struct _StatsdClientData> d;
-
     private:
-        const bool m_enabled{false};
-};
+        bool m_init{false};
+        char m_errmsg[1024];
+        SOCKET m_sock{INVALID_SOCKET};
+        struct sockaddr_in m_server;
 
+        const bool m_enabled{false};
+        const short m_port;
+        const std::string m_host;
+        const std::string m_nodename;
+        const std::string m_ns;
+};
 } // namespace statsd
 
 extern std::unique_ptr<statsd::StatsdClient> g_stats_client;

From 85890ddb1370fc625101e37f7bfb225c24f973ff Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 5 Sep 2024 07:52:37 +0000
Subject: [PATCH 05/13] docs: add copyright notice to source file, update
 notice in header

---
 src/statsd_client.cpp | 5 +++++
 src/statsd_client.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index efb61c90af..43a7907148 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -1,3 +1,8 @@
+// Copyright (c) 2014-2017 Statoshi Developers
+// Copyright (c) 2020-2024 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 /**
 Copyright (c) 2014, Rex
 All rights reserved.
diff --git a/src/statsd_client.h b/src/statsd_client.h
index ea51d3bb95..d98f7edac7 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -1,3 +1,4 @@
+// Copyright (c) 2014-2017 Statoshi Developers
 // Copyright (c) 2020-2023 The Dash Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

From 840241eefd7c65abd39a73fc1831976ab0694ecb Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:33:55 +0000
Subject: [PATCH 06/13] stats: cleanup error logging, improve code sanity

- Use `uint16_t` instead of `short`, `int64_t` instead of `size_t`
- Get rid of the `errmsg` buffer and use `LogPrintf` to report errors
- Use `strprintf` instead of `snprintf`
- Rephrase networking error logs to allow inclusion of error strings
---
 src/statsd_client.cpp                | 75 ++++++++++++----------------
 src/statsd_client.h                  | 18 +++----
 test/lint/run-lint-format-strings.py |  2 -
 3 files changed, 38 insertions(+), 57 deletions(-)

diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index 43a7907148..81f0aac5d3 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -65,7 +65,7 @@ inline bool should_send(float sample_rate)
     return sample_rate > p;
 }
 
-StatsdClient::StatsdClient(const std::string& host, const std::string& nodename, short port, const std::string& ns,
+StatsdClient::StatsdClient(const std::string& host, const std::string& nodename, uint16_t port, const std::string& ns,
                            bool enabled)
     : m_enabled{enabled}, m_port{port}, m_host{host}, m_nodename{nodename}, m_ns{ns}
 {
@@ -79,11 +79,11 @@ StatsdClient::~StatsdClient()
 
 int StatsdClient::init()
 {
-    if ( m_init ) return 0;
+    if (m_init) return 0;
 
-    m_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if ( m_sock == INVALID_SOCKET ) {
-        snprintf(m_errmsg, sizeof(m_errmsg), "could not create socket, err=%m");
+    m_sock = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    if (m_sock == INVALID_SOCKET) {
+        LogPrintf("ERROR: Cannot create socket (socket() returned error %s)\n", NetworkErrorString(WSAGetLastError()));
         return -1;
     }
 
@@ -93,7 +93,7 @@ int StatsdClient::init()
 
     CNetAddr netaddr(m_server.sin_addr);
     if (!LookupHost(m_host, netaddr, true) || !netaddr.GetInAddr(&m_server.sin_addr)) {
-        snprintf(m_errmsg, sizeof(m_errmsg), "LookupHost or GetInAddr failed");
+        LogPrintf("ERROR: LookupHost or GetInAddr failed\n");
         return -2;
     }
 
@@ -104,8 +104,8 @@ int StatsdClient::init()
 /* will change the original string */
 void StatsdClient::cleanup(std::string& key)
 {
-    size_t pos = key.find_first_of(":|@");
-    while ( pos != std::string::npos )
+    auto pos = key.find_first_of(":|@");
+    while (pos != std::string::npos)
     {
         key[pos] = '_';
         pos = key.find_first_of(":|@");
@@ -122,12 +122,12 @@ int StatsdClient::inc(const std::string& key, float sample_rate)
     return count(key, 1, sample_rate);
 }
 
-int StatsdClient::count(const std::string& key, size_t value, float sample_rate)
+int StatsdClient::count(const std::string& key, int64_t value, float sample_rate)
 {
     return send(key, value, "c", sample_rate);
 }
 
-int StatsdClient::gauge(const std::string& key, size_t value, float sample_rate)
+int StatsdClient::gauge(const std::string& key, int64_t value, float sample_rate)
 {
     return send(key, value, "g", sample_rate);
 }
@@ -137,12 +137,12 @@ int StatsdClient::gaugeDouble(const std::string& key, double value, float sample
     return sendDouble(key, value, "g", sample_rate);
 }
 
-int StatsdClient::timing(const std::string& key, size_t ms, float sample_rate)
+int StatsdClient::timing(const std::string& key, int64_t ms, float sample_rate)
 {
     return send(key, ms, "ms", sample_rate);
 }
 
-int StatsdClient::send(std::string key, size_t value, const std::string& type, float sample_rate)
+int StatsdClient::send(std::string key, int64_t value, const std::string& type, float sample_rate)
 {
     if (!should_send(sample_rate)) {
         return 0;
@@ -154,16 +154,11 @@ int StatsdClient::send(std::string key, size_t value, const std::string& type, f
 
     cleanup(key);
 
-    char buf[256];
-    if ( fequal( sample_rate, 1.0 ) )
-    {
-        snprintf(buf, sizeof(buf), "%s%s:%zd|%s",
-                m_ns.c_str(), key.c_str(), (ssize_t) value, type.c_str());
-    }
-    else
-    {
-        snprintf(buf, sizeof(buf), "%s%s:%zd|%s|@%.2f",
-                m_ns.c_str(), key.c_str(), (ssize_t) value, type.c_str(), sample_rate);
+    std::string buf{""};
+    if (fequal(sample_rate, 1.0)) {
+        buf = strprintf("%s%s:%d|%s", m_ns, key, value, type);
+    } else {
+        buf = strprintf("%s%s:%d|%s|@%.2f", m_ns, key, value, type, sample_rate);
     }
 
     return send(buf);
@@ -181,16 +176,11 @@ int StatsdClient::sendDouble(std::string key, double value, const std::string& t
 
     cleanup(key);
 
-    char buf[256];
-    if ( fequal( sample_rate, 1.0 ) )
-    {
-        snprintf(buf, sizeof(buf), "%s%s:%f|%s",
-                m_ns.c_str(), key.c_str(), value, type.c_str());
-    }
-    else
-    {
-        snprintf(buf, sizeof(buf), "%s%s:%f|%s|@%.2f",
-                m_ns.c_str(), key.c_str(), value, type.c_str(), sample_rate);
+    std::string buf{""};
+    if (fequal(sample_rate, 1.0)) {
+        buf = strprintf("%s%s:%f|%s", m_ns, key, value, type);
+    } else {
+        buf = strprintf("%s%s:%f|%s|@%.2f", m_ns, key, value, type, sample_rate);
     }
 
     return send(buf);
@@ -202,21 +192,18 @@ int StatsdClient::send(const std::string& message)
         return -3;
 
     int ret = init();
-    if ( ret )
-    {
+    if (ret) {
         return ret;
     }
-    ret = sendto(m_sock, message.data(), message.size(), 0, reinterpret_cast<const sockaddr*>(&m_server), sizeof(m_server));
-    if ( ret == -1) {
-        snprintf(m_errmsg, sizeof(m_errmsg),
-                "sendto server fail, host=%s:%d, err=%m", m_host.c_str(), m_port);
-        return -1;
+
+    ret = ::sendto(m_sock, message.data(), message.size(), 0, reinterpret_cast<const sockaddr*>(&m_server),
+                   sizeof(m_server));
+    if (ret == -1) {
+        LogPrintf("ERROR: Unable to send message (sendto() returned error %s), host=%s:%d\n",
+                  NetworkErrorString(WSAGetLastError()), m_host, m_port);
+        return ret;
     }
+
     return 0;
 }
-
-const char* StatsdClient::errmsg()
-{
-    return m_errmsg;
-}
 } // namespace statsd
diff --git a/src/statsd_client.h b/src/statsd_client.h
index d98f7edac7..ec24e2f5b1 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -12,7 +12,7 @@
 #include <memory>
 
 static const bool DEFAULT_STATSD_ENABLE = false;
-static const int DEFAULT_STATSD_PORT = 8125;
+static const uint16_t DEFAULT_STATSD_PORT = 8125;
 static const std::string DEFAULT_STATSD_HOST = "127.0.0.1";
 static const std::string DEFAULT_STATSD_HOSTNAME = "";
 static const std::string DEFAULT_STATSD_NAMESPACE = "";
@@ -25,20 +25,17 @@ static const int MAX_STATSD_PERIOD = 60 * 60;
 namespace statsd {
 class StatsdClient {
     public:
-        explicit StatsdClient(const std::string& host, const std::string& nodename, short port, const std::string& ns,
+        explicit StatsdClient(const std::string& host, const std::string& nodename, uint16_t port, const std::string& ns,
                               bool enabled);
         ~StatsdClient();
 
-    public:
-        const char* errmsg();
-
     public:
         int inc(const std::string& key, float sample_rate = 1.0);
         int dec(const std::string& key, float sample_rate = 1.0);
-        int count(const std::string& key, size_t value, float sample_rate = 1.0);
-        int gauge(const std::string& key, size_t value, float sample_rate = 1.0);
+        int count(const std::string& key, int64_t value, float sample_rate = 1.0);
+        int gauge(const std::string& key, int64_t value, float sample_rate = 1.0);
         int gaugeDouble(const std::string& key, double value, float sample_rate = 1.0);
-        int timing(const std::string& key, size_t ms, float sample_rate = 1.0);
+        int timing(const std::string& key, int64_t ms, float sample_rate = 1.0);
 
     public:
         /**
@@ -50,7 +47,7 @@ class StatsdClient {
         /* (Low Level Api) manually send a message
          * type = "c", "g" or "ms"
          */
-        int send(std::string key, size_t value,
+        int send(std::string key, int64_t value,
                 const std::string& type, float sample_rate);
         int sendDouble(std::string key, double value,
                 const std::string& type, float sample_rate);
@@ -61,12 +58,11 @@ class StatsdClient {
 
     private:
         bool m_init{false};
-        char m_errmsg[1024];
         SOCKET m_sock{INVALID_SOCKET};
         struct sockaddr_in m_server;
 
         const bool m_enabled{false};
-        const short m_port;
+        const uint16_t m_port;
         const std::string m_host;
         const std::string m_nodename;
         const std::string m_ns;
diff --git a/test/lint/run-lint-format-strings.py b/test/lint/run-lint-format-strings.py
index 3e3bdf07b4..b7803b9274 100755
--- a/test/lint/run-lint-format-strings.py
+++ b/test/lint/run-lint-format-strings.py
@@ -24,8 +24,6 @@ FALSE_POSITIVES = [
     ("src/qt/networkstyle.cpp", "strprintf(titleAddText, gArgs.GetDevNetName())"),
     ("src/rpc/evo.cpp", "strprintf(it->second, nParamNum)"),
     ("src/stacktraces.cpp", "strprintf(fmtStr, i, si.pc, lstr, fstr)"),
-    ("src/statsd_client.cpp", "snprintf(d->errmsg, sizeof(d->errmsg), \"could not create socket, err=%m\")"),
-    ("src/statsd_client.cpp", "snprintf(d->errmsg, sizeof(d->errmsg), \"sendto server fail, host=%s:%d, err=%m\", d->host.c_str(), d->port)"),
     ("src/util/system.cpp", "strprintf(_(COPYRIGHT_HOLDERS).translated, COPYRIGHT_HOLDERS_SUBSTITUTION)"),
     ("src/validationinterface.cpp", "LogPrint(BCLog::VALIDATION, fmt \"\\n\", __VA_ARGS__)"),
     ("src/wallet/wallet.h",  "WalletLogPrintf(std::string fmt, Params... parameters)"),

From 4bc727cd6c235415f63a076f0377043959f10b60 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 5 Sep 2024 20:42:14 +0000
Subject: [PATCH 07/13] stats: clean up randomization code, move
 `FastRandomContext` inward

We can skip the computationally expensive dice-roll if our sample rate
is zero as that means we should never send it. Also get rid of the
`FastRandomContext::operator()` that isn't used anywhere else in the
codebase.
---
 src/random.h          |  4 ----
 src/statsd_client.cpp | 46 ++++++++++++++++++-------------------------
 src/statsd_client.h   | 20 +++++++++++++------
 3 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/src/random.h b/src/random.h
index 71cdbf4a11..7f3b903622 100644
--- a/src/random.h
+++ b/src/random.h
@@ -207,10 +207,6 @@ public:
         return rand32() % nMax;
     }
 
-    uint32_t operator()(uint32_t nMax) {
-        return rand32(nMax);
-    }
-
     /** Generate random bytes. */
     template <typename B = unsigned char>
     std::vector<B> randbytes(size_t len);
diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index 81f0aac5d3..81056cd357 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -37,32 +37,28 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <compat.h>
 #include <netbase.h>
-#include <random.h>
 #include <util/system.h>
 
 #include <cmath>
 #include <cstdio>
+#include <random>
 
 std::unique_ptr<statsd::StatsdClient> g_stats_client;
 
 namespace statsd {
-inline bool fequal(float a, float b)
+bool StatsdClient::ShouldSend(float sample_rate)
 {
-    const float epsilon = 0.0001;
-    return ( fabs(a - b) < epsilon );
-}
+    sample_rate = std::clamp(sample_rate, 0.f, 1.f);
 
-thread_local FastRandomContext insecure_rand;
+    constexpr float EPSILON{0.0001f};
+    /* If sample rate is 1, we should always send */
+    if (std::fabs(sample_rate - 1.f) < EPSILON) return true;
+    /* If sample rate is 0, we should never send */
+    if (std::fabs(sample_rate) < EPSILON) return false;
 
-inline bool should_send(float sample_rate)
-{
-    if ( fequal(sample_rate, 1.0) )
-    {
-        return true;
-    }
-
-    float p = float(insecure_rand(std::numeric_limits<uint32_t>::max())) / float(std::numeric_limits<uint32_t>::max());
-    return sample_rate > p;
+    /* Sample rate is >0 and <1, roll the dice */
+    LOCK(cs);
+    return sample_rate > std::uniform_real_distribution<float>(0.f, 1.f)(insecure_rand);
 }
 
 StatsdClient::StatsdClient(const std::string& host, const std::string& nodename, uint16_t port, const std::string& ns,
@@ -144,7 +140,7 @@ int StatsdClient::timing(const std::string& key, int64_t ms, float sample_rate)
 
 int StatsdClient::send(std::string key, int64_t value, const std::string& type, float sample_rate)
 {
-    if (!should_send(sample_rate)) {
+    if (!ShouldSend(sample_rate)) {
         return 0;
     }
 
@@ -154,11 +150,9 @@ int StatsdClient::send(std::string key, int64_t value, const std::string& type,
 
     cleanup(key);
 
-    std::string buf{""};
-    if (fequal(sample_rate, 1.0)) {
-        buf = strprintf("%s%s:%d|%s", m_ns, key, value, type);
-    } else {
-        buf = strprintf("%s%s:%d|%s|@%.2f", m_ns, key, value, type, sample_rate);
+    std::string buf{strprintf("%s%s:%d|%s", m_ns, key, value, type)};
+    if (sample_rate < 1.f) {
+        buf += strprintf("|@%.2f", sample_rate);
     }
 
     return send(buf);
@@ -166,7 +160,7 @@ int StatsdClient::send(std::string key, int64_t value, const std::string& type,
 
 int StatsdClient::sendDouble(std::string key, double value, const std::string& type, float sample_rate)
 {
-    if (!should_send(sample_rate)) {
+    if (!ShouldSend(sample_rate)) {
         return 0;
     }
 
@@ -176,11 +170,9 @@ int StatsdClient::sendDouble(std::string key, double value, const std::string& t
 
     cleanup(key);
 
-    std::string buf{""};
-    if (fequal(sample_rate, 1.0)) {
-        buf = strprintf("%s%s:%f|%s", m_ns, key, value, type);
-    } else {
-        buf = strprintf("%s%s:%f|%s|@%.2f", m_ns, key, value, type, sample_rate);
+    std::string buf{strprintf("%s%s:%f|%s", m_ns, key, value, type)};
+    if (sample_rate < 1.f) {
+        buf += strprintf("|@%.2f", sample_rate);
     }
 
     return send(buf);
diff --git a/src/statsd_client.h b/src/statsd_client.h
index ec24e2f5b1..20d87f6bec 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -6,6 +6,8 @@
 #ifndef BITCOIN_STATSD_CLIENT_H
 #define BITCOIN_STATSD_CLIENT_H
 
+#include <random.h>
+#include <threadsafety.h>
 #include <util/sock.h>
 
 #include <string>
@@ -30,12 +32,12 @@ class StatsdClient {
         ~StatsdClient();
 
     public:
-        int inc(const std::string& key, float sample_rate = 1.0);
-        int dec(const std::string& key, float sample_rate = 1.0);
-        int count(const std::string& key, int64_t value, float sample_rate = 1.0);
-        int gauge(const std::string& key, int64_t value, float sample_rate = 1.0);
-        int gaugeDouble(const std::string& key, double value, float sample_rate = 1.0);
-        int timing(const std::string& key, int64_t ms, float sample_rate = 1.0);
+        int inc(const std::string& key, float sample_rate = 1.f);
+        int dec(const std::string& key, float sample_rate = 1.f);
+        int count(const std::string& key, int64_t value, float sample_rate = 1.f);
+        int gauge(const std::string& key, int64_t value, float sample_rate = 1.f);
+        int gaugeDouble(const std::string& key, double value, float sample_rate = 1.f);
+        int timing(const std::string& key, int64_t ms, float sample_rate = 1.f);
 
     public:
         /**
@@ -57,6 +59,12 @@ class StatsdClient {
         static void cleanup(std::string& key);
 
     private:
+        bool ShouldSend(float sample_rate);
+
+    private:
+        mutable Mutex cs;
+        mutable FastRandomContext insecure_rand GUARDED_BY(cs);
+
         bool m_init{false};
         SOCKET m_sock{INVALID_SOCKET};
         struct sockaddr_in m_server;

From 2def905044702dc9c9149b07d8a0bae17badd0d5 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 3 Sep 2024 18:04:33 +0000
Subject: [PATCH 08/13] stats: move init logic into constructor

Also, add log messages to inform us if we're skipping initialization or
it has successfully been initialized.
---
 src/statsd_client.cpp | 45 +++++++++++++++++++------------------------
 src/statsd_client.h   |  2 --
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index 81056cd357..f78cbaf4e6 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -63,24 +63,18 @@ bool StatsdClient::ShouldSend(float sample_rate)
 
 StatsdClient::StatsdClient(const std::string& host, const std::string& nodename, uint16_t port, const std::string& ns,
                            bool enabled)
-    : m_enabled{enabled}, m_port{port}, m_host{host}, m_nodename{nodename}, m_ns{ns}
+    : m_port{port}, m_host{host}, m_nodename{nodename}, m_ns{ns}
 {
-}
-
-StatsdClient::~StatsdClient()
-{
-    // close socket
-    CloseSocket(m_sock);
-}
-
-int StatsdClient::init()
-{
-    if (m_init) return 0;
+    if (!enabled) {
+        LogPrintf("Transmitting stats are disabled, will not init StatsdClient\n");
+        return;
+    }
 
     m_sock = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
     if (m_sock == INVALID_SOCKET) {
-        LogPrintf("ERROR: Cannot create socket (socket() returned error %s)\n", NetworkErrorString(WSAGetLastError()));
-        return -1;
+        LogPrintf("ERROR: Cannot create socket (socket() returned error %s), cannot init StatsdClient\n",
+                  NetworkErrorString(WSAGetLastError()));
+        return;
     }
 
     memset(&m_server, 0, sizeof(m_server));
@@ -89,12 +83,18 @@ int StatsdClient::init()
 
     CNetAddr netaddr(m_server.sin_addr);
     if (!LookupHost(m_host, netaddr, true) || !netaddr.GetInAddr(&m_server.sin_addr)) {
-        LogPrintf("ERROR: LookupHost or GetInAddr failed\n");
-        return -2;
+        LogPrintf("ERROR: LookupHost or GetInAddr failed, cannot init StatsdClient\n");
+        return;
     }
 
     m_init = true;
-    return 0;
+
+    LogPrintf("StatsdClient initialized to transmit stats to %s:%d\n", m_host, m_port);
+}
+
+StatsdClient::~StatsdClient()
+{
+    CloseSocket(m_sock);
 }
 
 /* will change the original string */
@@ -180,16 +180,11 @@ int StatsdClient::sendDouble(std::string key, double value, const std::string& t
 
 int StatsdClient::send(const std::string& message)
 {
-    if (!m_enabled)
+    if (!m_init)
         return -3;
 
-    int ret = init();
-    if (ret) {
-        return ret;
-    }
-
-    ret = ::sendto(m_sock, message.data(), message.size(), 0, reinterpret_cast<const sockaddr*>(&m_server),
-                   sizeof(m_server));
+    int ret = ::sendto(m_sock, message.data(), message.size(), 0, reinterpret_cast<const sockaddr*>(&m_server),
+                       sizeof(m_server));
     if (ret == -1) {
         LogPrintf("ERROR: Unable to send message (sendto() returned error %s), host=%s:%d\n",
                   NetworkErrorString(WSAGetLastError()), m_host, m_port);
diff --git a/src/statsd_client.h b/src/statsd_client.h
index 20d87f6bec..d29b4c6e91 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -55,7 +55,6 @@ class StatsdClient {
                 const std::string& type, float sample_rate);
 
     protected:
-        int init();
         static void cleanup(std::string& key);
 
     private:
@@ -69,7 +68,6 @@ class StatsdClient {
         SOCKET m_sock{INVALID_SOCKET};
         struct sockaddr_in m_server;
 
-        const bool m_enabled{false};
         const uint16_t m_port;
         const std::string m_host;
         const std::string m_nodename;

From dbbfc8d766903569ee99759c1b331e55a4dbd306 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 3 Sep 2024 18:01:50 +0000
Subject: [PATCH 09/13] stats: use `Socks` wrapper, use `CService` to generate
 our `sockaddr`

---
 src/statsd_client.cpp | 35 +++++++++++++++++------------------
 src/statsd_client.h   |  5 ++---
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index f78cbaf4e6..5e1ef4376c 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -70,20 +70,25 @@ StatsdClient::StatsdClient(const std::string& host, const std::string& nodename,
         return;
     }
 
-    m_sock = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (m_sock == INVALID_SOCKET) {
+    SOCKET hSocket = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    if (hSocket == INVALID_SOCKET) {
         LogPrintf("ERROR: Cannot create socket (socket() returned error %s), cannot init StatsdClient\n",
                   NetworkErrorString(WSAGetLastError()));
         return;
     }
+    m_sock = std::make_unique<Sock>(hSocket);
 
-    memset(&m_server, 0, sizeof(m_server));
-    m_server.sin_family = AF_INET;
-    m_server.sin_port = htons(m_port);
-
-    CNetAddr netaddr(m_server.sin_addr);
-    if (!LookupHost(m_host, netaddr, true) || !netaddr.GetInAddr(&m_server.sin_addr)) {
-        LogPrintf("ERROR: LookupHost or GetInAddr failed, cannot init StatsdClient\n");
+    CNetAddr netaddr;
+    if (!LookupHost(m_host, netaddr, /*fAllowLookup=*/true)) {
+        LogPrintf("ERROR: Unable to lookup host %s, cannot init StatsdClient\n", m_host);
+        return;
+    }
+    if (!netaddr.IsIPv4()) {
+        LogPrintf("ERROR: Host %s on unsupported network, cannot init StatsdClient\n", m_host);
+        return;
+    }
+    if (!CService(netaddr, port).GetSockAddr(reinterpret_cast<struct sockaddr*>(&m_server.first), &m_server.second)) {
+        LogPrintf("ERROR: Cannot get socket address for %s, cannot init StatsdClient\n", m_host);
         return;
     }
 
@@ -92,11 +97,6 @@ StatsdClient::StatsdClient(const std::string& host, const std::string& nodename,
     LogPrintf("StatsdClient initialized to transmit stats to %s:%d\n", m_host, m_port);
 }
 
-StatsdClient::~StatsdClient()
-{
-    CloseSocket(m_sock);
-}
-
 /* will change the original string */
 void StatsdClient::cleanup(std::string& key)
 {
@@ -183,12 +183,11 @@ int StatsdClient::send(const std::string& message)
     if (!m_init)
         return -3;
 
-    int ret = ::sendto(m_sock, message.data(), message.size(), 0, reinterpret_cast<const sockaddr*>(&m_server),
-                       sizeof(m_server));
-    if (ret == -1) {
+    if (::sendto(m_sock->Get(), message.data(), message.size(), /*flags=*/0,
+                 reinterpret_cast<struct sockaddr*>(&m_server.first), m_server.second) == SOCKET_ERROR) {
         LogPrintf("ERROR: Unable to send message (sendto() returned error %s), host=%s:%d\n",
                   NetworkErrorString(WSAGetLastError()), m_host, m_port);
-        return ret;
+        return -1;
     }
 
     return 0;
diff --git a/src/statsd_client.h b/src/statsd_client.h
index d29b4c6e91..4bf92fa31e 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -29,7 +29,6 @@ class StatsdClient {
     public:
         explicit StatsdClient(const std::string& host, const std::string& nodename, uint16_t port, const std::string& ns,
                               bool enabled);
-        ~StatsdClient();
 
     public:
         int inc(const std::string& key, float sample_rate = 1.f);
@@ -65,8 +64,8 @@ class StatsdClient {
         mutable FastRandomContext insecure_rand GUARDED_BY(cs);
 
         bool m_init{false};
-        SOCKET m_sock{INVALID_SOCKET};
-        struct sockaddr_in m_server;
+        std::unique_ptr<Sock> m_sock{nullptr};
+        std::pair<struct sockaddr_storage, socklen_t> m_server{{}, sizeof(struct sockaddr_storage)};
 
         const uint16_t m_port;
         const std::string m_host;

From 1a81979c1e8cf47df28d785689b4049e1504d0d1 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:32:46 +0000
Subject: [PATCH 10/13] stats: initialize socket after we have a valid socket
 address

As creating the socket is now the last step, we don't need
`m_init` anymore. We can just see if a socket is successfully
constructed and take that as our validity indicator.

We'll also move it out of the inner `send` function so we can bail out
before we bother with all the string processing and manipulation.
---
 src/statsd_client.cpp | 27 ++++++++++++++++-----------
 src/statsd_client.h   |  1 -
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index 5e1ef4376c..925e47cd3e 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -70,14 +70,6 @@ StatsdClient::StatsdClient(const std::string& host, const std::string& nodename,
         return;
     }
 
-    SOCKET hSocket = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (hSocket == INVALID_SOCKET) {
-        LogPrintf("ERROR: Cannot create socket (socket() returned error %s), cannot init StatsdClient\n",
-                  NetworkErrorString(WSAGetLastError()));
-        return;
-    }
-    m_sock = std::make_unique<Sock>(hSocket);
-
     CNetAddr netaddr;
     if (!LookupHost(m_host, netaddr, /*fAllowLookup=*/true)) {
         LogPrintf("ERROR: Unable to lookup host %s, cannot init StatsdClient\n", m_host);
@@ -92,7 +84,13 @@ StatsdClient::StatsdClient(const std::string& host, const std::string& nodename,
         return;
     }
 
-    m_init = true;
+    SOCKET hSocket = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    if (hSocket == INVALID_SOCKET) {
+        LogPrintf("ERROR: Cannot create socket (socket() returned error %s), cannot init StatsdClient\n",
+                  NetworkErrorString(WSAGetLastError()));
+        return;
+    }
+    m_sock = std::make_unique<Sock>(hSocket);
 
     LogPrintf("StatsdClient initialized to transmit stats to %s:%d\n", m_host, m_port);
 }
@@ -140,6 +138,10 @@ int StatsdClient::timing(const std::string& key, int64_t ms, float sample_rate)
 
 int StatsdClient::send(std::string key, int64_t value, const std::string& type, float sample_rate)
 {
+    if (!m_sock) {
+        return -3;
+    }
+
     if (!ShouldSend(sample_rate)) {
         return 0;
     }
@@ -160,6 +162,10 @@ int StatsdClient::send(std::string key, int64_t value, const std::string& type,
 
 int StatsdClient::sendDouble(std::string key, double value, const std::string& type, float sample_rate)
 {
+    if (!m_sock) {
+        return -3;
+    }
+
     if (!ShouldSend(sample_rate)) {
         return 0;
     }
@@ -180,8 +186,7 @@ int StatsdClient::sendDouble(std::string key, double value, const std::string& t
 
 int StatsdClient::send(const std::string& message)
 {
-    if (!m_init)
-        return -3;
+    assert(m_sock);
 
     if (::sendto(m_sock->Get(), message.data(), message.size(), /*flags=*/0,
                  reinterpret_cast<struct sockaddr*>(&m_server.first), m_server.second) == SOCKET_ERROR) {
diff --git a/src/statsd_client.h b/src/statsd_client.h
index 4bf92fa31e..95ff75b2af 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -63,7 +63,6 @@ class StatsdClient {
         mutable Mutex cs;
         mutable FastRandomContext insecure_rand GUARDED_BY(cs);
 
-        bool m_init{false};
         std::unique_ptr<Sock> m_sock{nullptr};
         std::pair<struct sockaddr_storage, socklen_t> m_server{{}, sizeof(struct sockaddr_storage)};
 

From 9f967237742d3d19ece2fdbc294808f83d47073b Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:38:11 +0000
Subject: [PATCH 11/13] stats: stop using error codes, switch over to `bool`

---
 src/statsd_client.cpp | 32 +++++++++++++++++---------------
 src/statsd_client.h   | 35 +++++++++++++++--------------------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index 925e47cd3e..ec9c759a4f 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -106,44 +106,45 @@ void StatsdClient::cleanup(std::string& key)
     }
 }
 
-int StatsdClient::dec(const std::string& key, float sample_rate)
+bool StatsdClient::dec(const std::string& key, float sample_rate)
 {
     return count(key, -1, sample_rate);
 }
 
-int StatsdClient::inc(const std::string& key, float sample_rate)
+bool StatsdClient::inc(const std::string& key, float sample_rate)
 {
     return count(key, 1, sample_rate);
 }
 
-int StatsdClient::count(const std::string& key, int64_t value, float sample_rate)
+bool StatsdClient::count(const std::string& key, int64_t value, float sample_rate)
 {
     return send(key, value, "c", sample_rate);
 }
 
-int StatsdClient::gauge(const std::string& key, int64_t value, float sample_rate)
+bool StatsdClient::gauge(const std::string& key, int64_t value, float sample_rate)
 {
     return send(key, value, "g", sample_rate);
 }
 
-int StatsdClient::gaugeDouble(const std::string& key, double value, float sample_rate)
+bool StatsdClient::gaugeDouble(const std::string& key, double value, float sample_rate)
 {
     return sendDouble(key, value, "g", sample_rate);
 }
 
-int StatsdClient::timing(const std::string& key, int64_t ms, float sample_rate)
+bool StatsdClient::timing(const std::string& key, int64_t ms, float sample_rate)
 {
     return send(key, ms, "ms", sample_rate);
 }
 
-int StatsdClient::send(std::string key, int64_t value, const std::string& type, float sample_rate)
+bool StatsdClient::send(std::string key, int64_t value, const std::string& type, float sample_rate)
 {
     if (!m_sock) {
-        return -3;
+        return false;
     }
 
     if (!ShouldSend(sample_rate)) {
-        return 0;
+        // Not our turn to send but report that we have
+        return true;
     }
 
     // partition stats by node name if set
@@ -160,14 +161,15 @@ int StatsdClient::send(std::string key, int64_t value, const std::string& type,
     return send(buf);
 }
 
-int StatsdClient::sendDouble(std::string key, double value, const std::string& type, float sample_rate)
+bool StatsdClient::sendDouble(std::string key, double value, const std::string& type, float sample_rate)
 {
     if (!m_sock) {
-        return -3;
+        return false;
     }
 
     if (!ShouldSend(sample_rate)) {
-        return 0;
+        // Not our turn to send but report that we have
+        return true;
     }
 
     // partition stats by node name if set
@@ -184,7 +186,7 @@ int StatsdClient::sendDouble(std::string key, double value, const std::string& t
     return send(buf);
 }
 
-int StatsdClient::send(const std::string& message)
+bool StatsdClient::send(const std::string& message)
 {
     assert(m_sock);
 
@@ -192,9 +194,9 @@ int StatsdClient::send(const std::string& message)
                  reinterpret_cast<struct sockaddr*>(&m_server.first), m_server.second) == SOCKET_ERROR) {
         LogPrintf("ERROR: Unable to send message (sendto() returned error %s), host=%s:%d\n",
                   NetworkErrorString(WSAGetLastError()), m_host, m_port);
-        return -1;
+        return false;
     }
 
-    return 0;
+    return true;
 }
 } // namespace statsd
diff --git a/src/statsd_client.h b/src/statsd_client.h
index 95ff75b2af..6fdb25d0f2 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -31,32 +31,27 @@ class StatsdClient {
                               bool enabled);
 
     public:
-        int inc(const std::string& key, float sample_rate = 1.f);
-        int dec(const std::string& key, float sample_rate = 1.f);
-        int count(const std::string& key, int64_t value, float sample_rate = 1.f);
-        int gauge(const std::string& key, int64_t value, float sample_rate = 1.f);
-        int gaugeDouble(const std::string& key, double value, float sample_rate = 1.f);
-        int timing(const std::string& key, int64_t ms, float sample_rate = 1.f);
-
-    public:
-        /**
-         * (Low Level Api) manually send a message
-         * which might be composed of several lines.
-         */
-        int send(const std::string& message);
+        bool inc(const std::string& key, float sample_rate = 1.f);
+        bool dec(const std::string& key, float sample_rate = 1.f);
+        bool count(const std::string& key, int64_t value, float sample_rate = 1.f);
+        bool gauge(const std::string& key, int64_t value, float sample_rate = 1.f);
+        bool gaugeDouble(const std::string& key, double value, float sample_rate = 1.f);
+        bool timing(const std::string& key, int64_t ms, float sample_rate = 1.f);
 
         /* (Low Level Api) manually send a message
          * type = "c", "g" or "ms"
          */
-        int send(std::string key, int64_t value,
-                const std::string& type, float sample_rate);
-        int sendDouble(std::string key, double value,
-                const std::string& type, float sample_rate);
-
-    protected:
-        static void cleanup(std::string& key);
+        bool send(std::string key, int64_t value, const std::string& type, float sample_rate);
+        bool sendDouble(std::string key, double value, const std::string& type, float sample_rate);
 
     private:
+        /**
+         * (Low Level Api) manually send a message
+         * which might be composed of several lines.
+         */
+        bool send(const std::string& message);
+
+        void cleanup(std::string& key);
         bool ShouldSend(float sample_rate);
 
     private:

From 0401c581eb3f4ea2303c9390d81ac081980af953 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 5 Sep 2024 20:04:47 +0000
Subject: [PATCH 12/13] stats: `const`-ify variables and arguments

We cannot convert `DEFAULT_STATSD*` to `std::string_view`s as they're
being used as default arguments and `GetArgs` expects `std::string`s
---
 src/statsd_client.cpp |  4 ++--
 src/statsd_client.h   | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index ec9c759a4f..dd1b37d205 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -61,8 +61,8 @@ bool StatsdClient::ShouldSend(float sample_rate)
     return sample_rate > std::uniform_real_distribution<float>(0.f, 1.f)(insecure_rand);
 }
 
-StatsdClient::StatsdClient(const std::string& host, const std::string& nodename, uint16_t port, const std::string& ns,
-                           bool enabled)
+StatsdClient::StatsdClient(const std::string& host, const std::string& nodename, uint16_t port,
+                           const std::string& ns, bool enabled)
     : m_port{port}, m_host{host}, m_nodename{nodename}, m_ns{ns}
 {
     if (!enabled) {
diff --git a/src/statsd_client.h b/src/statsd_client.h
index 6fdb25d0f2..d253caaeb1 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -13,22 +13,22 @@
 #include <string>
 #include <memory>
 
-static const bool DEFAULT_STATSD_ENABLE = false;
-static const uint16_t DEFAULT_STATSD_PORT = 8125;
-static const std::string DEFAULT_STATSD_HOST = "127.0.0.1";
-static const std::string DEFAULT_STATSD_HOSTNAME = "";
-static const std::string DEFAULT_STATSD_NAMESPACE = "";
+static constexpr bool DEFAULT_STATSD_ENABLE{false};
+static constexpr uint16_t DEFAULT_STATSD_PORT{8125};
+static const std::string DEFAULT_STATSD_HOST{"127.0.0.1"};
+static const std::string DEFAULT_STATSD_HOSTNAME{""};
+static const std::string DEFAULT_STATSD_NAMESPACE{""};
 
 // schedule periodic measurements, in seconds: default - 1 minute, min - 5 sec, max - 1h.
-static const int DEFAULT_STATSD_PERIOD = 60;
-static const int MIN_STATSD_PERIOD = 5;
-static const int MAX_STATSD_PERIOD = 60 * 60;
+static constexpr int DEFAULT_STATSD_PERIOD{60};
+static constexpr int MIN_STATSD_PERIOD{5};
+static constexpr int MAX_STATSD_PERIOD{60*60};
 
 namespace statsd {
 class StatsdClient {
     public:
-        explicit StatsdClient(const std::string& host, const std::string& nodename, uint16_t port, const std::string& ns,
-                              bool enabled);
+        explicit StatsdClient(const std::string& host, const std::string& nodename, uint16_t port,
+                              const std::string& ns, bool enabled);
 
     public:
         bool inc(const std::string& key, float sample_rate = 1.f);

From cc998abec16bfb1f2d55d92e4c0e6a495576c775 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Wed, 11 Sep 2024 15:02:10 +0000
Subject: [PATCH 13/13] fmt: apply `clang-format-diff.py` suggestions

---
 src/statsd_client.cpp | 28 +++++++++++-----------------
 src/statsd_client.h   |  2 +-
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
index dd1b37d205..63e178302e 100644
--- a/src/statsd_client.cpp
+++ b/src/statsd_client.cpp
@@ -61,9 +61,12 @@ bool StatsdClient::ShouldSend(float sample_rate)
     return sample_rate > std::uniform_real_distribution<float>(0.f, 1.f)(insecure_rand);
 }
 
-StatsdClient::StatsdClient(const std::string& host, const std::string& nodename, uint16_t port,
-                           const std::string& ns, bool enabled)
-    : m_port{port}, m_host{host}, m_nodename{nodename}, m_ns{ns}
+StatsdClient::StatsdClient(const std::string& host, const std::string& nodename, uint16_t port, const std::string& ns,
+                           bool enabled) :
+    m_port{port},
+    m_host{host},
+    m_nodename{nodename},
+    m_ns{ns}
 {
     if (!enabled) {
         LogPrintf("Transmitting stats are disabled, will not init StatsdClient\n");
@@ -99,22 +102,15 @@ StatsdClient::StatsdClient(const std::string& host, const std::string& nodename,
 void StatsdClient::cleanup(std::string& key)
 {
     auto pos = key.find_first_of(":|@");
-    while (pos != std::string::npos)
-    {
+    while (pos != std::string::npos) {
         key[pos] = '_';
         pos = key.find_first_of(":|@");
     }
 }
 
-bool StatsdClient::dec(const std::string& key, float sample_rate)
-{
-    return count(key, -1, sample_rate);
-}
+bool StatsdClient::dec(const std::string& key, float sample_rate) { return count(key, -1, sample_rate); }
 
-bool StatsdClient::inc(const std::string& key, float sample_rate)
-{
-    return count(key, 1, sample_rate);
-}
+bool StatsdClient::inc(const std::string& key, float sample_rate) { return count(key, 1, sample_rate); }
 
 bool StatsdClient::count(const std::string& key, int64_t value, float sample_rate)
 {
@@ -148,8 +144,7 @@ bool StatsdClient::send(std::string key, int64_t value, const std::string& type,
     }
 
     // partition stats by node name if set
-    if (!m_nodename.empty())
-        key = key + "." + m_nodename;
+    if (!m_nodename.empty()) key = key + "." + m_nodename;
 
     cleanup(key);
 
@@ -173,8 +168,7 @@ bool StatsdClient::sendDouble(std::string key, double value, const std::string&
     }
 
     // partition stats by node name if set
-    if (!m_nodename.empty())
-        key = key + "." + m_nodename;
+    if (!m_nodename.empty()) key = key + "." + m_nodename;
 
     cleanup(key);
 
diff --git a/src/statsd_client.h b/src/statsd_client.h
index d253caaeb1..7568d8cd0e 100644
--- a/src/statsd_client.h
+++ b/src/statsd_client.h
@@ -22,7 +22,7 @@ static const std::string DEFAULT_STATSD_NAMESPACE{""};
 // schedule periodic measurements, in seconds: default - 1 minute, min - 5 sec, max - 1h.
 static constexpr int DEFAULT_STATSD_PERIOD{60};
 static constexpr int MIN_STATSD_PERIOD{5};
-static constexpr int MAX_STATSD_PERIOD{60*60};
+static constexpr int MAX_STATSD_PERIOD{60 * 60};
 
 namespace statsd {
 class StatsdClient {