Remove unneeded metrics

Author: kuznetsss

src/rpc/Counters.cpp

@@ -144,27 +144,6 @@ Counters::Counters(Reportable const& wq)
               "Total number of internal errors"
           )
       )
-    , ledgerCurrentCounter_(
-          PrometheusService::counterInt(
-              "rpc_ledger_requests_total",
-              Labels({Label{"ledger_type", "current"}}),
-              "Total number of RPC requests for current ledger"
-          )
-      )
-    , ledgerValidatedCounter_(
-          PrometheusService::counterInt(
-              "rpc_ledger_requests_total",
-              Labels({Label{"ledger_type", "validated"}}),
-              "Total number of RPC requests for validated ledger"
-          )
-      )
-    , ledgerSpecificCounter_(
-          PrometheusService::counterInt(
-              "rpc_ledger_requests_total",
-              Labels({Label{"ledger_type", "specific"}}),
-              "Total number of RPC requests for specific ledger sequence"
-          )
-      )
     , ledgerAgeLedgersHistogram_(
           PrometheusService::histogramInt(
               "rpc_requested_ledger_age_histogram",
@@ -256,22 +235,19 @@ void
 Counters::recordLedgerRequest(boost::json::object const& params, std::uint32_t currentLedgerSequence)
 {
     if (not params.contains("ledger_index")) {
-        ++ledgerValidatedCounter_.get();
+        ledgerAgeLedgersHistogram_.get().observe(0);
         return;
     }
     auto const& indexValue = params.at("ledger_index");
     if (auto const parsed = util::getLedgerIndex(indexValue); parsed.has_value()) {
-        ++ledgerSpecificCounter_.get();
         if (*parsed <= currentLedgerSequence) {
             auto const ageLedgers = static_cast<std::int64_t>(currentLedgerSequence - *parsed);
             ledgerAgeLedgersHistogram_.get().observe(ageLedgers);
         }
     } else if (indexValue.is_string()) {
         auto const indexStr = boost::json::value_to<std::string>(indexValue);
-        if (indexStr == "current") {
-            ++ledgerCurrentCounter_.get();
-        } else if (indexStr == "validated") {
-            ++ledgerValidatedCounter_.get();
+        if (indexStr == "validated") {
+            ledgerAgeLedgersHistogram_.get().observe(0);
         }
     }
 }

src/rpc/Counters.hpp

@@ -68,10 +68,6 @@ class Counters {
     CounterType unknownCommandCounter_;
     CounterType internalErrorCounter_;
 
-    // ledger request tracking metrics
-    CounterType ledgerCurrentCounter_;
-    CounterType ledgerValidatedCounter_;
-    CounterType ledgerSpecificCounter_;
     std::reference_wrapper<util::prometheus::HistogramInt> ledgerAgeLedgersHistogram_;
 
     std::reference_wrapper<Reportable const> workQueue_;

tests/unit/rpc/CountersTests.cpp

@@ -31,6 +31,7 @@
 #include <xrpl/protocol/jss.h>
 
 #include <chrono>
+#include <cstdint>
 #include <string>
 
 using namespace rpc;
@@ -197,67 +198,60 @@ TEST_F(RPCCountersMockPrometheusTests, onInternalError)
     counters.onInternalError();
 }
 
-TEST_F(RPCCountersMockPrometheusTests, recordLedgerRequestCurrent)
+struct RPCCountersMockPrometheusRecotdLedgerRequestTest : RPCCountersMockPrometheusTests {
+    testing::StrictMock<util::prometheus::MockHistogramImpl<int64_t>>& ageLedgersHistogramMock =
+        makeMock<util::prometheus::HistogramInt>("rpc_requested_ledger_age_histogram", "");
+};
+TEST_F(RPCCountersMockPrometheusRecotdLedgerRequestTest, currentLedger)
 {
-    auto& currentCounterMock = makeMock<CounterInt>("rpc_ledger_requests_total", "{ledger_type=\"current\"}");
-    EXPECT_CALL(currentCounterMock, add(1));
-
+    // "current" is not tracked in the histogram (it's not a historical ledger lookup)
+    // No mock expectations needed
     boost::json::object params;
     params["ledger_index"] = "current";
     counters.recordLedgerRequest(params, 1000);
 }
 
-TEST_F(RPCCountersMockPrometheusTests, recordLedgerRequestValidated)
+TEST_F(RPCCountersMockPrometheusRecotdLedgerRequestTest, validateLedger)
 {
-    auto& validatedCounterMock = makeMock<CounterInt>("rpc_ledger_requests_total", "{ledger_type=\"validated\"}");
-    EXPECT_CALL(validatedCounterMock, add(1));
+    EXPECT_CALL(ageLedgersHistogramMock, observe(0));
 
     boost::json::object params;
     params["ledger_index"] = "validated";
     counters.recordLedgerRequest(params, 1000);
 }
 
-TEST_F(RPCCountersMockPrometheusTests, recordLedgerRequestValidatedDefault)
+TEST_F(RPCCountersMockPrometheusRecotdLedgerRequestTest, validatedDefaultLedger)
 {
-    auto& validatedCounterMock = makeMock<CounterInt>("rpc_ledger_requests_total", "{ledger_type=\"validated\"}");
-    EXPECT_CALL(validatedCounterMock, add(1));
+    EXPECT_CALL(ageLedgersHistogramMock, observe(0));
 
     boost::json::object params;
     counters.recordLedgerRequest(params, 1000);
 }
 
-TEST_F(RPCCountersMockPrometheusTests, recordLedgerRequestSpecificNumber)
+TEST_F(RPCCountersMockPrometheusRecotdLedgerRequestTest, specificLedger)
 {
-    auto& specificCounterMock = makeMock<CounterInt>("rpc_ledger_requests_total", "{ledger_type=\"specific\"}");
     auto& ageLedgersHistogramMock = makeMock<util::prometheus::HistogramInt>("rpc_requested_ledger_age_histogram", "");
 
-    EXPECT_CALL(specificCounterMock, add(1));
     EXPECT_CALL(ageLedgersHistogramMock, observe(100));  // age is 1000 - 900 = 100
 
     boost::json::object params;
     params["ledger_index"] = 900;
     counters.recordLedgerRequest(params, 1000);
 }
 
-TEST_F(RPCCountersMockPrometheusTests, recordLedgerRequestSpecificStringNumber)
+TEST_F(RPCCountersMockPrometheusRecotdLedgerRequestTest, stringNumberLedger)
 {
-    auto& specificCounterMock = makeMock<CounterInt>("rpc_ledger_requests_total", "{ledger_type=\"specific\"}");
-    auto& ageLedgersHistogramMock = makeMock<util::prometheus::HistogramInt>("rpc_requested_ledger_age_histogram", "");
-
-    EXPECT_CALL(specificCounterMock, add(1));
     EXPECT_CALL(ageLedgersHistogramMock, observe(50));  // 1000 - 950 = 50 ledgers
 
     boost::json::object params;
     params["ledger_index"] = "950";
     counters.recordLedgerRequest(params, 1000);
 }
 
-TEST_F(RPCCountersMockPrometheusTests, recordLedgerRequestZeroAge)
+TEST_F(RPCCountersMockPrometheusRecotdLedgerRequestTest, zeroAgeLedger)
 {
-    auto& specificCounterMock = makeMock<CounterInt>("rpc_ledger_requests_total", "{ledger_type=\"specific\"}");
     auto& ageLedgersHistogramMock = makeMock<util::prometheus::HistogramInt>("rpc_requested_ledger_age_histogram", "");
 
-    EXPECT_CALL(specificCounterMock, add(1));
     EXPECT_CALL(ageLedgersHistogramMock, observe(0));  // 1000 - 1000 = 0 ledgers
 
     boost::json::object params;