diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f877e07dd..a90a36ea12 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/conanfile.py b/conanfile.py index 36b50e4b4e..951ce41135 100644 --- a/conanfile.py +++ b/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, diff --git a/src/libxrpl/telemetry/NullTelemetry.cpp b/src/libxrpl/telemetry/NullTelemetry.cpp index 05d10ebfe4..1585db941a 100644 --- a/src/libxrpl/telemetry/NullTelemetry.cpp +++ b/src/libxrpl/telemetry/NullTelemetry.cpp @@ -10,12 +10,16 @@ its own factory that can return the real TelemetryImpl. */ +#include #include -#include +#include +#include #ifdef XRPL_ENABLE_TELEMETRY #include + +#include #endif #include diff --git a/src/libxrpl/telemetry/SpanGuard.cpp b/src/libxrpl/telemetry/SpanGuard.cpp index 4384288195..357db4826c 100644 --- a/src/libxrpl/telemetry/SpanGuard.cpp +++ b/src/libxrpl/telemetry/SpanGuard.cpp @@ -29,14 +29,15 @@ #include #include +#include #include #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/libxrpl/telemetry/Telemetry.cpp b/src/libxrpl/telemetry/Telemetry.cpp index e1992f6592..e381b759be 100644 --- a/src/libxrpl/telemetry/Telemetry.cpp +++ b/src/libxrpl/telemetry/Telemetry.cpp @@ -18,11 +18,15 @@ #include #include +#include #include #include +#include #include #include +#include +#include #include #include #include @@ -33,8 +37,15 @@ #include #include #include +#include +#include +#include +#include +#include #include +#include +#include #include #include #include @@ -82,7 +93,7 @@ namespace resource = opentelemetry::sdk::resource; */ class FilteringSpanProcessor : public trace_sdk::SpanProcessor { - std::unique_ptr delegate_{}; + std::unique_ptr delegate_; public: explicit FilteringSpanProcessor(std::unique_ptr 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 sdkProvider_{}; + std::shared_ptr sdkProvider_; public: TelemetryImpl(Setup setup, beast::Journal journal) : setup_(std::move(setup)), journal_(journal) diff --git a/src/tests/libxrpl/telemetry/TelemetryConfig.cpp b/src/tests/libxrpl/telemetry/TelemetryConfig.cpp index 84bb3c991a..dc84bd937f 100644 --- a/src/tests/libxrpl/telemetry/TelemetryConfig.cpp +++ b/src/tests/libxrpl/telemetry/TelemetryConfig.cpp @@ -4,8 +4,6 @@ #include -#include - using namespace xrpl; TEST(TelemetryConfig, setup_defaults)