Merge branch 'pratik/otel-phase5-docs-deployment' into pratik/otel-phase6-statsd

.github/scripts/levelization/results/ordering.txt

@@ -325,4 +325,5 @@ xrpld.shamap > xrpl.nodestore
 xrpld.shamap > xrpl.protocol
 xrpld.shamap > xrpl.shamap
 xrpld.telemetry > xrpl.basics
+xrpld.telemetry > xrpl.consensus
 xrpld.telemetry > xrpl.telemetry

cmake/XrplCore.cmake

@@ -204,22 +204,16 @@ target_link_libraries(
         xrpl.libxrpl.conditions
 )
 
-add_module(xrpl consensus)
-target_link_libraries(
-    xrpl.libxrpl.consensus
-    PUBLIC
-        xrpl.libxrpl.basics
-        xrpl.libxrpl.json
-        xrpl.libxrpl.protocol
-        xrpl.libxrpl.ledger
-)
-
 # Telemetry module — OpenTelemetry distributed tracing support.
 # Sources: include/xrpl/telemetry/ (headers), src/libxrpl/telemetry/ (impl).
 # When telemetry=ON, links the Conan-provided umbrella target
 # opentelemetry-cpp::opentelemetry-cpp (individual component targets like
 # ::api, ::sdk are not available in the Conan package).
 #
+# Declared before its consumers (consensus, tx) because add_module isolates
+# each module's headers: a module can only include xrpl/telemetry/ headers if
+# it links this target, and the target must already exist at that point.
+#
 # Links xrpl.libxrpl.protocol PRIVATELY for sha512Half (digest.h)
 add_module(xrpl telemetry)
 target_link_libraries(
@@ -234,6 +228,19 @@ if(telemetry)
     )
 endif()
 
+# Links xrpl.libxrpl.telemetry for the consensus tracing spans declared in
+# include/xrpl/consensus/ConsensusSpanNames.h.
+add_module(xrpl consensus)
+target_link_libraries(
+    xrpl.libxrpl.consensus
+    PUBLIC
+        xrpl.libxrpl.basics
+        xrpl.libxrpl.json
+        xrpl.libxrpl.protocol
+        xrpl.libxrpl.ledger
+        xrpl.libxrpl.telemetry
+)
+
 add_module(xrpl tx)
 target_link_libraries(
     xrpl.libxrpl.tx

include/xrpl/consensus/Consensus.h

@@ -1,10 +1,5 @@
 #pragma once
 
-#include <xrpld/consensus/ConsensusParms.h>
-#include <xrpld/consensus/ConsensusProposal.h>
-#include <xrpld/consensus/ConsensusSpanNames.h>
-#include <xrpld/consensus/ConsensusTypes.h>
-
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/basics/chrono.h>
@@ -13,6 +8,7 @@
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/consensus/ConsensusParms.h>
 #include <xrpl/consensus/ConsensusProposal.h>
+#include <xrpl/consensus/ConsensusSpanNames.h>
 #include <xrpl/consensus/ConsensusTypes.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/json/json_writer.h>

src/xrpld/app/consensus/RCLConsensus.cpp

@@ -16,9 +16,6 @@
 #include <xrpld/app/misc/TxQ.h>
 #include <xrpld/app/misc/ValidatorKeys.h>
 #include <xrpld/app/misc/ValidatorList.h>
-#include <xrpld/consensus/Consensus.h>
-#include <xrpld/consensus/ConsensusSpanNames.h>
-#include <xrpld/consensus/ConsensusTypes.h>
 #include <xrpld/overlay/Overlay.h>
 #include <xrpld/overlay/predicates.h>
 

src/xrpld/overlay/detail/PeerImp.cpp

@@ -8,7 +8,6 @@
 #include <xrpld/app/ledger/TransactionMaster.h>
 #include <xrpld/app/misc/Transaction.h>
 #include <xrpld/app/misc/ValidatorList.h>
-#include <xrpld/consensus/ConsensusSpanNames.h>
 #include <xrpld/overlay/Cluster.h>
 #include <xrpld/overlay/ClusterNode.h>
 #include <xrpld/overlay/Peer.h>

src/xrpld/telemetry/ConsensusReceiveTracing.h

@@ -37,8 +37,7 @@
  *  validationReceive) so they stay in sync with the rest of Phase 4.
  */
 
-#include <xrpld/consensus/ConsensusSpanNames.h>
-
+#include <xrpl/consensus/ConsensusSpanNames.h>
 #include <xrpl/proto/xrpl.pb.h>
 #include <xrpl/telemetry/SpanGuard.h>
 #include <xrpl/telemetry/SpanNames.h>