From 43eddb79f6c8b506dd6f567cf32e0b2945c41cab Mon Sep 17 00:00:00 2001 From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> Date: Fri, 26 Jun 2026 16:55:29 +0100 Subject: [PATCH 1/3] fix(telemetry): use local link-type constants in followsFrom linkedSpan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The followsFrom linkedSpan overload referenced attr::linkType / attr_val::followsFrom, which don't exist in SpanNames.h — the other two link sites already use the local kLinkTypeKey / kLinkTypeFollowsFrom constants. Unify the third site. Fixes arm64 build (-Werror). Co-Authored-By: Claude Opus 4.8 --- src/libxrpl/telemetry/SpanGuard.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libxrpl/telemetry/SpanGuard.cpp b/src/libxrpl/telemetry/SpanGuard.cpp index 7185792b2d..2e7dc742c7 100644 --- a/src/libxrpl/telemetry/SpanGuard.cpp +++ b/src/libxrpl/telemetry/SpanGuard.cpp @@ -317,8 +317,7 @@ SpanGuard::hashSpan( std::make_unique(tracer->StartSpan( std::string(name), {}, - {{linkSpan->GetContext(), - {{std::string(attr::linkType), std::string(attr_val::followsFrom)}}}}, + {{linkSpan->GetContext(), {{kLinkTypeKey, kLinkTypeFollowsFrom}}}}, opts))); } } From 508549f6579d5682491964627b97042ccddb7378 Mon Sep 17 00:00:00 2001 From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> Date: Fri, 26 Jun 2026 16:55:40 +0100 Subject: [PATCH 2/3] test(telemetry): rename setupTelemetry call to makeTelemetrySetup The free function was renamed makeTelemetrySetup but this unit test still called the old name, breaking the xrpl_tests build on arm64. Co-Authored-By: Claude Opus 4.8 --- src/tests/libxrpl/telemetry/TelemetryConfig.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/libxrpl/telemetry/TelemetryConfig.cpp b/src/tests/libxrpl/telemetry/TelemetryConfig.cpp index c8469bb44b..82b0fe70c6 100644 --- a/src/tests/libxrpl/telemetry/TelemetryConfig.cpp +++ b/src/tests/libxrpl/telemetry/TelemetryConfig.cpp @@ -32,7 +32,7 @@ TEST(TelemetryConfig, setup_defaults) TEST(TelemetryConfig, parse_empty_section) { Section const section; - auto setup = telemetry::setupTelemetry(section, "nHUtest123", "2.0.0", 0); + auto setup = telemetry::makeTelemetrySetup(section, "nHUtest123", "2.0.0", 0); EXPECT_FALSE(setup.enabled); EXPECT_EQ(setup.serviceName, "xrpld"); @@ -65,7 +65,7 @@ TEST(TelemetryConfig, parse_full_section) section.set("trace_peer", "1"); section.set("trace_ledger", "0"); - auto setup = telemetry::setupTelemetry(section, "nHUtest123", "2.0.0", 1); + auto setup = telemetry::makeTelemetrySetup(section, "nHUtest123", "2.0.0", 1); EXPECT_TRUE(setup.enabled); EXPECT_EQ(setup.serviceName, "my-rippled"); From 3c9179e59ddf80e1e2888ae04961b00f66442b54 Mon Sep 17 00:00:00 2001 From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> Date: Fri, 26 Jun 2026 17:04:33 +0100 Subject: [PATCH 3/3] test(telemetry): rename setupTelemetry calls to makeTelemetrySetup Phase 5 added 4 more unit-test cases calling the old setupTelemetry name. Align them with the renamed makeTelemetrySetup free function so xrpl_tests builds. Co-Authored-By: Claude Opus 4.8 --- src/tests/libxrpl/telemetry/TelemetryConfig.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/tests/libxrpl/telemetry/TelemetryConfig.cpp b/src/tests/libxrpl/telemetry/TelemetryConfig.cpp index 4d909db9b7..bfa0b85149 100644 --- a/src/tests/libxrpl/telemetry/TelemetryConfig.cpp +++ b/src/tests/libxrpl/telemetry/TelemetryConfig.cpp @@ -92,7 +92,7 @@ TEST(TelemetryConfig, mtls_cert_and_key_both_set) section.set("tls_client_cert", "/etc/ssl/client.pem"); section.set("tls_client_key", "/etc/ssl/client.key"); - auto setup = telemetry::setupTelemetry(section, "nHUtest123", "2.0.0", 0); + auto setup = telemetry::makeTelemetrySetup(section, "nHUtest123", "2.0.0", 0); EXPECT_EQ(setup.tlsClientCertPath, "/etc/ssl/client.pem"); EXPECT_EQ(setup.tlsClientKeyPath, "/etc/ssl/client.key"); } @@ -101,14 +101,16 @@ TEST(TelemetryConfig, mtls_cert_without_key_throws) { Section section; section.set("tls_client_cert", "/etc/ssl/client.pem"); - EXPECT_THROW(telemetry::setupTelemetry(section, "nHUtest123", "2.0.0", 0), std::runtime_error); + EXPECT_THROW( + telemetry::makeTelemetrySetup(section, "nHUtest123", "2.0.0", 0), std::runtime_error); } TEST(TelemetryConfig, mtls_key_without_cert_throws) { Section section; section.set("tls_client_key", "/etc/ssl/client.key"); - EXPECT_THROW(telemetry::setupTelemetry(section, "nHUtest123", "2.0.0", 0), std::runtime_error); + EXPECT_THROW( + telemetry::makeTelemetrySetup(section, "nHUtest123", "2.0.0", 0), std::runtime_error); } TEST(TelemetryConfig, mtls_neither_set_is_one_way_tls) @@ -117,7 +119,7 @@ TEST(TelemetryConfig, mtls_neither_set_is_one_way_tls) section.set("use_tls", "1"); section.set("tls_ca_cert", "/etc/ssl/ca.pem"); - auto setup = telemetry::setupTelemetry(section, "nHUtest123", "2.0.0", 0); + auto setup = telemetry::makeTelemetrySetup(section, "nHUtest123", "2.0.0", 0); EXPECT_TRUE(setup.tlsClientCertPath.empty()); EXPECT_TRUE(setup.tlsClientKeyPath.empty()); }