mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-27 15:28:03 +00:00
2e3e25d056
Two conflicts, both in PeerImp's proposal and validation receive paths, and both resolved by taking the incoming side: it holds the span in a handle that stays empty when telemetry is compiled out and moves every attribute behind if (span && *span), which supersedes the unguarded form on this side. Taking the incoming text renamed consSpan to span in both blocks, while the two job-lambda captures further down had merged cleanly and still named consSpan. Renamed those captures so each names the handle its own function declares. This branch's own guard on the inbound-validation ledger_hash attribute is a different span in a different function; it merged cleanly and is preserved.