mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-27 15:28:03 +00:00
Two files conflicted and both were composed rather than taken from one side. integration-test.sh: kept this branch's spanmetrics names, since the collector sets namespace: "span" here and traces_span_metrics_* matches nothing, and took phase-6's --max-time on every probe. The Tempo time bound needed restoring by hand: RUN_START, the check_span guard and the start/end parameters are on phase-6 and absent here, so a plain resolution kept phase-6's comment about bounding the search while shipping no bound. All four pieces are back. TESTING.md: kept server=otel with the metrics endpoint. Phase-6's template sets server=statsd and documents prefix, which this branch's OTel path ignores.