mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-27 15:28:03 +00:00
a5d5d0911f
Telemetry.cpp conflicted. Phase-9 rewrote the metrics pipeline into makeTracerResource()/makeMetricsResource()/initMetrics() further down the class, so its side of the region is empty and phase-8's private helper block does not apply. Resolved to phase-9's structure; phase-8's own hunks outside the region (the deleted kTracesPath/kMetricsPath, the verbatim traces URL, the two-endpoint startup log) merged in. Phase-9's initMetrics() still derives the metrics URL by suffix-swap. That is fixed in the next commit, not here.