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

CMakeLists.txt

@@ -122,7 +122,7 @@ endif()
 # so that SpanGuard factory methods produce real OTel spans.
 # When OFF (default), all tracing code compiles to no-ops with zero overhead.
 # Enable via: conan install -o telemetry=True, or cmake -Dtelemetry=ON.
-option(telemetry "Enable OpenTelemetry tracing" OFF)
+option(telemetry "Enable OpenTelemetry tracing" ON)
 if(telemetry)
     find_package(opentelemetry-cpp CONFIG REQUIRED)
     add_compile_definitions(XRPL_ENABLE_TELEMETRY)

OpenTelemetryPlan/secure-OTel.md

@@ -16,10 +16,6 @@ The most effective way to prevent spoofing from external sources is to treat you
 
 **NGINX Example (Stripping Headers):**
 
-Code output
-
-File generated successfully.
-
 ```nginx
 server {
     listen 80;

conanfile.py

@@ -54,7 +54,7 @@ class Xrpl(ConanFile):
         "rocksdb": True,
         "shared": False,
         "static": True,
-        "telemetry": False,
+        "telemetry": True,
         "tests": False,
         "unity": False,
         "xrpld": False,

src/libxrpl/telemetry/NullTelemetry.cpp

@@ -10,10 +10,9 @@
     its own factory that can return the real TelemetryImpl.
 */
 
+#include <xrpl/beast/utility/Journal.h>
 #include <xrpl/telemetry/Telemetry.h>
 
-#include <string_view>
-
 #ifdef XRPL_ENABLE_TELEMETRY
 #include <opentelemetry/trace/noop.h>
 #endif

src/libxrpl/telemetry/SpanGuard.cpp

@@ -29,14 +29,15 @@
 #include <xrpl/telemetry/TraceContextPropagator.h>
 
 #include <opentelemetry/common/attribute_value.h>
+#include <opentelemetry/context/context.h>
 #include <opentelemetry/context/runtime_context.h>
 #include <opentelemetry/nostd/shared_ptr.h>
 #include <opentelemetry/trace/context.h>
 #include <opentelemetry/trace/default_span.h>
-#include <opentelemetry/trace/provider.h>
 #include <opentelemetry/trace/scope.h>
 #include <opentelemetry/trace/span.h>
 #include <opentelemetry/trace/span_context.h>
+#include <opentelemetry/trace/span_metadata.h>
 #include <opentelemetry/trace/span_startoptions.h>
 #include <opentelemetry/trace/trace_flags.h>
 #include <opentelemetry/trace/trace_id.h>

src/libxrpl/telemetry/Telemetry.cpp

@@ -18,11 +18,15 @@
 #include <xrpl/telemetry/Telemetry.h>
 
 #include <xrpl/basics/Log.h>
+#include <xrpl/beast/utility/Journal.h>
 #include <xrpl/telemetry/DiscardFlag.h>
 #include <xrpl/telemetry/SpanNames.h>
 
+#include <opentelemetry/context/context.h>
 #include <opentelemetry/exporters/otlp/otlp_http_exporter_factory.h>
 #include <opentelemetry/exporters/otlp/otlp_http_exporter_options.h>
+#include <opentelemetry/nostd/shared_ptr.h>
+#include <opentelemetry/sdk/resource/resource.h>
 #include <opentelemetry/sdk/trace/batch_span_processor_factory.h>
 #include <opentelemetry/sdk/trace/batch_span_processor_options.h>
 #include <opentelemetry/sdk/trace/processor.h>
@@ -33,8 +37,15 @@
 #include <opentelemetry/semconv/incubating/service_attributes.h>
 #include <opentelemetry/trace/noop.h>
 #include <opentelemetry/trace/provider.h>
+#include <opentelemetry/trace/span.h>
+#include <opentelemetry/trace/span_metadata.h>
+#include <opentelemetry/trace/span_startoptions.h>
+#include <opentelemetry/trace/tracer.h>
+#include <opentelemetry/trace/tracer_provider.h>
 
 #include <chrono>
+#include <cstdint>
+#include <memory>
 #include <string>
 #include <string_view>
 #include <utility>
@@ -82,7 +93,7 @@ namespace resource = opentelemetry::sdk::resource;
 */
 class FilteringSpanProcessor : public trace_sdk::SpanProcessor
 {
-    std::unique_ptr<trace_sdk::SpanProcessor> delegate_{};
+    std::unique_ptr<trace_sdk::SpanProcessor> delegate_;
 
 public:
     explicit FilteringSpanProcessor(std::unique_ptr<trace_sdk::SpanProcessor> delegate)
@@ -246,7 +257,7 @@ class TelemetryImpl : public Telemetry
         Held as std::shared_ptr so we can call ForceFlush() on shutdown.
         Wrapped in a nostd::shared_ptr when registered as the global provider.
     */
-    std::shared_ptr<trace_sdk::TracerProvider> sdkProvider_{};
+    std::shared_ptr<trace_sdk::TracerProvider> sdkProvider_;
 
 public:
     TelemetryImpl(Setup setup, beast::Journal journal) : setup_(std::move(setup)), journal_(journal)

src/tests/libxrpl/telemetry/TelemetryConfig.cpp

@@ -4,8 +4,6 @@
 
 #include <gtest/gtest.h>
 
-#include <chrono>
-
 using namespace xrpl;
 
 TEST(TelemetryConfig, setup_defaults)

src/xrpld/app/consensus/RCLConsensus.cpp

@@ -84,6 +84,7 @@
 #include <set>
 #include <sstream>
 #include <string>
+#include <string_view>
 #include <type_traits>
 #include <utility>
 #include <vector>