From a8d70c15f8e9b1639b3ad064f113c7a7b8ed11b1 Mon Sep 17 00:00:00 2001 From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> Date: Mon, 1 Jun 2026 15:08:10 +0100 Subject: [PATCH 1/4] clang-tidy issue Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> --- src/libxrpl/telemetry/SpanGuard.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxrpl/telemetry/SpanGuard.cpp b/src/libxrpl/telemetry/SpanGuard.cpp index c504b9f905..dc344ec923 100644 --- a/src/libxrpl/telemetry/SpanGuard.cpp +++ b/src/libxrpl/telemetry/SpanGuard.cpp @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include From 781e08a6a6c2202b3e10c4b5f17bbda53bebf7ec Mon Sep 17 00:00:00 2001 From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> Date: Mon, 1 Jun 2026 15:28:12 +0100 Subject: [PATCH 2/4] force static build of otel protobuf on windows Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> --- conan/profiles/default | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/conan/profiles/default b/conan/profiles/default index cde59f7f3b..fd977f3dcc 100644 --- a/conan/profiles/default +++ b/conan/profiles/default @@ -23,3 +23,15 @@ compiler.libcxx={{detect_api.detect_libcxx(compiler, version, compiler_exe)}} {% if compiler == "gcc" and compiler_version < 13 %} tools.build:cxxflags+=['-Wno-restrict'] {% endif %} +{% if os == "Windows" %} +# opentelemetry-cpp's recipe removes the `shared` option on Windows and never +# sets BUILD_SHARED_LIBS, so its upstream CMake defaults the protobuf-generated +# `opentelemetry_proto` target to a DLL (opentelemetry_proto.dll). The rest of +# the project links statically and nothing deploys that DLL next to the +# executables, so the telemetry unit test fails to start with +# STATUS_DLL_NOT_FOUND (0xC0000135). Force the dependency to build fully static +# so no runtime DLL is produced. The conf is folded into the package id so a +# fresh static binary is built instead of reusing a previously cached one. +opentelemetry-cpp/*:tools.cmake.cmaketoolchain:extra_variables={"BUILD_SHARED_LIBS": "OFF"} +opentelemetry-cpp/*:tools.info.package_id:confs+=["tools.cmake.cmaketoolchain:extra_variables"] +{% endif %} From 34a2afa704bb190bb4da855e501a5d83ddcd0d54 Mon Sep 17 00:00:00 2001 From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> Date: Mon, 1 Jun 2026 15:42:59 +0100 Subject: [PATCH 3/4] clang-tidy issue fix Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> --- src/libxrpl/telemetry/SpanGuard.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxrpl/telemetry/SpanGuard.cpp b/src/libxrpl/telemetry/SpanGuard.cpp index dc344ec923..358132fec8 100644 --- a/src/libxrpl/telemetry/SpanGuard.cpp +++ b/src/libxrpl/telemetry/SpanGuard.cpp @@ -52,6 +52,7 @@ #include #include #include +#include namespace xrpl::telemetry { From 967f0082c32f54613d3735424e52c8425b6c7730 Mon Sep 17 00:00:00 2001 From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> Date: Mon, 1 Jun 2026 15:59:16 +0100 Subject: [PATCH 4/4] minor compilation issue introduced by merge Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> --- src/xrpld/telemetry/TxTracing.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xrpld/telemetry/TxTracing.h b/src/xrpld/telemetry/TxTracing.h index 68b4903f88..fe47d4f068 100644 --- a/src/xrpld/telemetry/TxTracing.h +++ b/src/xrpld/telemetry/TxTracing.h @@ -36,7 +36,7 @@ txReceiveSpan(uint256 const& txID, [[maybe_unused]] protocol::TMTransaction cons TraceCategory::Transactions, tx_span::receive, txID.data(), - txID.bytes, + txID.kBytes, reinterpret_cast(tc.span_id().data()), tc.span_id().size(), tc.has_trace_flags() ? static_cast(tc.trace_flags()) @@ -45,7 +45,7 @@ txReceiveSpan(uint256 const& txID, [[maybe_unused]] protocol::TMTransaction cons } #endif return SpanGuard::hashSpan( - TraceCategory::Transactions, tx_span::receive, txID.data(), txID.bytes); + TraceCategory::Transactions, tx_span::receive, txID.data(), txID.kBytes); } /** Create a "tx.process" span for transaction processing in NetworkOPs. @@ -55,7 +55,7 @@ inline SpanGuard txProcessSpan(uint256 const& txID) { return SpanGuard::hashSpan( - TraceCategory::Transactions, tx_span::process, txID.data(), txID.bytes); + TraceCategory::Transactions, tx_span::process, txID.data(), txID.kBytes); } } // namespace xrpl::telemetry