From ecf103104b0be6449358866c2e4d3c5c95b64884 Mon Sep 17 00:00:00 2001 From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> Date: Tue, 31 Mar 2026 18:43:39 +0100 Subject: [PATCH] fix(telemetry): fix CI failures in MetricsRegistry test, levelization, and dashboard titles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update MockServiceRegistry to match current ServiceRegistry interface (17 method renames: get* prefix, PathRequests→PathRequestManager) - Make throwUnimplemented() static to satisfy clang-tidy - Regenerate levelization ordering.txt and loops.txt - Remove 'rippled' prefix from 3 StatsD dashboard titles Co-Authored-By: Claude Opus 4.6 --- .../scripts/levelization/results/loops.txt | 2 +- .../scripts/levelization/results/ordering.txt | 4 +- .../dashboards/statsd-network-traffic.json | 2 +- .../dashboards/statsd-node-health.json | 2 +- .../dashboards/statsd-rpc-pathfinding.json | 2 +- src/test/telemetry/MetricsRegistry_test.cpp | 40 +++++++++---------- 6 files changed, 27 insertions(+), 25 deletions(-) diff --git a/.github/scripts/levelization/results/loops.txt b/.github/scripts/levelization/results/loops.txt index e5d8dd4c1f..2b704b7a92 100644 --- a/.github/scripts/levelization/results/loops.txt +++ b/.github/scripts/levelization/results/loops.txt @@ -17,7 +17,7 @@ Loop: xrpld.app xrpld.shamap xrpld.shamap ~= xrpld.app Loop: xrpld.app xrpld.telemetry - xrpld.telemetry == xrpld.app + xrpld.telemetry ~= xrpld.app Loop: xrpld.overlay xrpld.rpc xrpld.rpc ~= xrpld.overlay diff --git a/.github/scripts/levelization/results/ordering.txt b/.github/scripts/levelization/results/ordering.txt index 3e44b38d7b..fb963639db 100644 --- a/.github/scripts/levelization/results/ordering.txt +++ b/.github/scripts/levelization/results/ordering.txt @@ -175,6 +175,8 @@ test.shamap > xrpl.basics test.shamap > xrpl.nodestore test.shamap > xrpl.protocol test.shamap > xrpl.shamap +test.telemetry > xrpl.core +test.telemetry > xrpld.telemetry test.toplevel > test.csf test.toplevel > xrpl.json test.unit_test > xrpl.basics @@ -230,7 +232,6 @@ xrpld.app > xrpl.basics xrpld.app > xrpl.core xrpld.app > xrpld.consensus xrpld.app > xrpld.core -xrpld.app > xrpld.telemetry xrpld.app > xrpl.json xrpld.app > xrpl.ledger xrpld.app > xrpl.net @@ -289,6 +290,7 @@ xrpld.rpc > xrpl.tx xrpld.shamap > xrpl.shamap xrpld.telemetry > xrpl.basics xrpld.telemetry > xrpl.core +xrpld.telemetry > xrpld.core xrpld.telemetry > xrpl.nodestore xrpld.telemetry > xrpl.protocol xrpld.telemetry > xrpl.rdb diff --git a/docker/telemetry/grafana/dashboards/statsd-network-traffic.json b/docker/telemetry/grafana/dashboards/statsd-network-traffic.json index e4dd0a379a..70e63cb873 100644 --- a/docker/telemetry/grafana/dashboards/statsd-network-traffic.json +++ b/docker/telemetry/grafana/dashboards/statsd-network-traffic.json @@ -465,6 +465,6 @@ "tags": ["rippled", "statsd", "network", "telemetry"], "templating": { "list": [] }, "time": { "from": "now-1h", "to": "now" }, - "title": "rippled Network Traffic (StatsD)", + "title": "Network Traffic (StatsD)", "uid": "rippled-statsd-network" } diff --git a/docker/telemetry/grafana/dashboards/statsd-node-health.json b/docker/telemetry/grafana/dashboards/statsd-node-health.json index de415bdcd8..215187f382 100644 --- a/docker/telemetry/grafana/dashboards/statsd-node-health.json +++ b/docker/telemetry/grafana/dashboards/statsd-node-health.json @@ -410,6 +410,6 @@ "from": "now-1h", "to": "now" }, - "title": "rippled Node Health (StatsD)", + "title": "Node Health (StatsD)", "uid": "rippled-statsd-node-health" } diff --git a/docker/telemetry/grafana/dashboards/statsd-rpc-pathfinding.json b/docker/telemetry/grafana/dashboards/statsd-rpc-pathfinding.json index 5831889631..10bf1575e3 100644 --- a/docker/telemetry/grafana/dashboards/statsd-rpc-pathfinding.json +++ b/docker/telemetry/grafana/dashboards/statsd-rpc-pathfinding.json @@ -391,6 +391,6 @@ "from": "now-1h", "to": "now" }, - "title": "rippled RPC & Pathfinding (StatsD)", + "title": "RPC & Pathfinding (StatsD)", "uid": "rippled-statsd-rpc" } diff --git a/src/test/telemetry/MetricsRegistry_test.cpp b/src/test/telemetry/MetricsRegistry_test.cpp index 29877d4604..83b504671c 100644 --- a/src/test/telemetry/MetricsRegistry_test.cpp +++ b/src/test/telemetry/MetricsRegistry_test.cpp @@ -29,8 +29,8 @@ namespace test { */ class MockServiceRegistry : public ServiceRegistry { - [[noreturn]] void - throwUnimplemented() const + [[noreturn]] static void + throwUnimplemented() { Throw("MockServiceRegistry: method not implemented"); } @@ -48,7 +48,7 @@ public: throwUnimplemented(); } TimeKeeper& - timeKeeper() override + getTimeKeeper() override { throwUnimplemented(); } @@ -63,7 +63,7 @@ public: throwUnimplemented(); } CachedSLEs& - cachedSLEs() override + getCachedSLEs() override { throwUnimplemented(); } @@ -98,37 +98,37 @@ public: throwUnimplemented(); } ValidatorList& - validators() override + getValidators() override { throwUnimplemented(); } ValidatorSite& - validatorSites() override + getValidatorSites() override { throwUnimplemented(); } ManifestCache& - validatorManifests() override + getValidatorManifests() override { throwUnimplemented(); } ManifestCache& - publisherManifests() override + getPublisherManifests() override { throwUnimplemented(); } Overlay& - overlay() override + getOverlay() override { throwUnimplemented(); } Cluster& - cluster() override + getCluster() override { throwUnimplemented(); } PeerReservationTable& - peerReservations() override + getPeerReservations() override { throwUnimplemented(); } @@ -183,17 +183,17 @@ public: throwUnimplemented(); } PendingSaves& - pendingSaves() override + getPendingSaves() override { throwUnimplemented(); } OpenLedger& - openLedger() override + getOpenLedger() override { throwUnimplemented(); } OpenLedger const& - openLedger() const override + getOpenLedger() const override { throwUnimplemented(); } @@ -217,8 +217,8 @@ public: { throwUnimplemented(); } - PathRequests& - getPathRequests() override + PathRequestManager& + getPathRequestManager() override { throwUnimplemented(); } @@ -248,7 +248,7 @@ public: return false; } beast::Journal - journal(std::string const&) override + getJournal(std::string const&) override { return beast::Journal(beast::Journal::getNullSink()); } @@ -258,12 +258,12 @@ public: throwUnimplemented(); } Logs& - logs() override + getLogs() override { throwUnimplemented(); } std::optional const& - trapTxID() const override + getTrapTxID() const override { static std::optional const empty; return empty; @@ -274,7 +274,7 @@ public: throwUnimplemented(); } Application& - app() override + getApp() override { throwUnimplemented(); }