Merge branch 'pratik/otel-phase10-workload-validation' into pratik/otel-sync-diagnostics

Conflict in src/xrpld/telemetry/AppMetricGauges.cpp: this branch had added
JobQueue.h beside Journal.h inside the telemetry guard, while the incoming
side moved Journal.h out of the guard so the constructor signature has a
direct include in both builds. Kept both changes: JobQueue.h stays guarded,
Journal.h appears once, unguarded.
This commit is contained in:
Pratik Mankawde
2026-09-17 13:46:21 +01:00
3 changed files with 11 additions and 2 deletions

View File

@@ -539,6 +539,10 @@ MetricsRegistry::stop()
#endif // XRPL_ENABLE_TELEMETRY
}
// This reads provider_ when telemetry is compiled in and touches no member
// when it is not, so clang-tidy asks for it to be static. Making it static
// would give the two builds different signatures.
// NOLINTBEGIN(readability-convert-member-functions-to-static)
bool
MetricsRegistry::hasPipeline() const noexcept
{
@@ -548,6 +552,7 @@ MetricsRegistry::hasPipeline() const noexcept
return false;
#endif
}
// NOLINTEND(readability-convert-member-functions-to-static)
// -----------------------------------------------------------------
// Synchronous instrument recording — RPC metrics

View File

@@ -39,7 +39,7 @@
#include <xrpl/resource/Consumer.h>
#include <xrpl/server/InfoSub.h>
#include <xrpl/server/LoadFeeTrack.h>
#include <xrpl/telemetry/MetricMacros.h>
#include <xrpl/telemetry/MetricMacros.h> // IWYU pragma: keep
#include <xrpl/telemetry/Redaction.h>
#include <xrpl/telemetry/SpanGuard.h>
#include <xrpl/tx/paths/RippleCalc.h>

View File

@@ -24,6 +24,11 @@
#include <xrpld/telemetry/AppMetricGauges.h>
// Both name types in the constructor signature, which is compiled in either
// way, so they belong outside the telemetry guard below.
#include <xrpl/beast/utility/Journal.h>
#include <xrpl/telemetry/MetricsRegistry.h>
#ifdef XRPL_ENABLE_TELEMETRY
// The app and overlay includes below are why
@@ -57,7 +62,6 @@
#include <xrpl/basics/CountedObject.h>
#include <xrpl/basics/Log.h>
#include <xrpl/basics/UptimeClock.h>
#include <xrpl/beast/utility/Journal.h>
#include <xrpl/core/JobQueue.h>
#include <xrpl/core/ServiceRegistry.h>
#include <xrpl/json/json_value.h>