Merge branch 'pratik/otel-sync-diagnostics' into pratik/otel-sync-diagnostics-freshen-fix

Conflict in src/xrpld/app/misc/SHAMapStoreImp.h: both sides added
[[maybe_unused]] to the RotationPhase members, but this branch had already
replaced the char const* stage with an owned string and added cache_. Kept
this branch's three members, which carry the attribute and supersede the
incoming two.

src/libxrpl/telemetry/MetricsRegistry.cpp

@@ -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

src/xrpld/app/misc/SHAMapStoreImp.cpp

@@ -29,12 +29,10 @@
 #include <xrpl/server/State.h>
 #include <xrpl/shamap/SHAMapMissingNode.h>
 #include <xrpl/shamap/SHAMapTreeNode.h>
-#include <xrpl/telemetry/MetricMacros.h>
-#ifdef XRPL_ENABLE_TELEMETRY
-// The metric-name constants are named only as macro arguments, which the
-// macros drop when telemetry is compiled out.
+// MetricNames.h is unguarded because the rotation-phase label constants are
+// passed to RotationPhase as ordinary constructor arguments, in both builds.
+#include <xrpl/telemetry/MetricMacros.h>  // IWYU pragma: keep
 #include <xrpl/telemetry/MetricNames.h>
-#endif
 #include <xrpl/telemetry/SpanGuard.h>
 #include <xrpl/telemetry/SpanNames.h>
 

src/xrpld/rpc/detail/PathRequest.cpp

@@ -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>

src/xrpld/telemetry/AppMetricGauges.cpp

@@ -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>