mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-26 23:19:07 +00:00
Four conflicts, all where this branch's replacement of the StatsD path with native OTLP met the upstream spanmetrics -> span_metrics rename. This branch's design wins in every case; the rename is carried into its text rather than reverting it, so the connector, its pipeline references, the header comment, the TESTING.md summary and the runbook all use span_metrics while keeping the native-OTLP wording. One addition beyond a straight take-a-side: publish the collector's health check port. This branch restored the health_check extension and its own TESTING.md polls http://localhost:13133/ to decide the collector is ready, but the port was never published on this side of docker-compose.yml, so that check could not pass from the host. Verified the merged config loads with no deprecation warnings and that 13133 is published exactly once. No metric name changed: traces_span_metrics_* already read that way before the rename, which only ever touched component names and prose.