mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-27 07:26:51 +00:00
8d1eacc5fc
Three conflicts, all composed rather than resolved by taking a side: - TelemetryConfig.cpp: phase-6 kept networkTypeFromId file-local with [[nodiscard]]; phase-7 had relocated it to public scope for Application.cpp. Kept phase-7's relocation, so one definition remains. The [[nodiscard]] survives on the declaration in Telemetry.h. - Telemetry.cpp x2: phase-7 added getMeter overrides, phase-6 added [[nodiscard]] to the startSpan below them. Kept both, and put [[nodiscard]] on getMeter too. - TESTING.md: phase-7 had the right metric name (span_calls_total, which the spanmetrics namespace produces) but the wrong label. Its xrpl.rpc.command appears nowhere else in the branch; the attribute is bare `command`, which is what the dashboards query. Took phase-7's metric with the correct label. Both signalEndpoint call sites follow the renamed member. signalEndpoint itself is left in place: removing it and adding metrics_endpoint is a design change, not part of propagating a rename.