mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-27 15:28:03 +00:00
d423863b82
Two conflicts. RCLConsensus.cpp: upstream restructured makeAcceptSpan so the accept span's attributes sit behind if (*span). This branch's own contribution there is the consensus round-duration histogram, which is kept -- placed inside the telemetry guard but OUTSIDE the span-liveness test, because a metric must still record when the trace category is disabled or the span was not created. The duplicated attribute lines on this side are dropped; the guarded block upstream added supersedes them. MetricsRegistry.cpp: kept this branch's JobQueue.h include, which it uses. Its Journal.h include was dropped as a duplicate -- the file already includes that header higher up, with a comment explaining why it is unguarded, and readability-duplicate-include is fatal under WarningsAsErrors.