mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-27 15:28:03 +00:00
28773e903b
Merges pratik/otel-phase6-statsd into pratik/otel-phase7-native-metrics. Phase-6 dropped the three onCollectionReady() calls that had been added to its StatsD test, because that method is only declared here on phase-7. This branch's own copy of the file was unchanged from the merge base, so the default merge would have silently deleted the calls from here too — where they are needed, because this branch gates polling behind onCollectionReady() in OTelCollectorImp::onTimer. Resolution keeps both sides: phase-6's two new include lines (Counter.h, Gauge.h) and phase-7's three onCollectionReady() calls plus their doxygen and inline explanations. The merged file is exactly phase-7's tip plus those two includes. TESTING.md auto-merged cleanly; both sides added text under Test 1 in different regions.