mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-27 07:26:51 +00:00
1094b60223
Four conflicts. None was a take-a-side. xrpld-telemetry.cfg: dropped the incoming [insight] block. This branch already has one, and duplicate ini sections do not replace each other -- parseIniFile appends onto the same section, so keys merge last-wins and the effective config is one that appears nowhere in the file. src/tests/libxrpl/CMakeLists.txt: kept this branch's else() branch, which compiles MetricsRegistry.cpp for the telemetry-off build, and dropped only the ValidationTracker target_sources inside if(telemetry). Upstream relocated that one out of the guard, so keeping both would have compiled it twice. The else() branch is this branch's own: the MetricsRegistry test exists only here, and without its implementation the off build would not link. RCLConsensus.cpp: union. The metric macros and registry come from this branch, PropagationHelpers from upstream; all three are used. PeerImp.cpp: MetricMacros.h stays unguarded, because all seven XRPL_METRIC_* uses in this file are on unconditional paths and the header is what defines them. ConsensusReceiveTracing.h takes upstream's guarded placement, and this branch's guarded GetObjectMetricNames.h is kept beside it.