diff --git a/src/libxrpl/telemetry/Telemetry.cpp b/src/libxrpl/telemetry/Telemetry.cpp index 016d9bbf58..8d8f7dc74c 100644 --- a/src/libxrpl/telemetry/Telemetry.cpp +++ b/src/libxrpl/telemetry/Telemetry.cpp @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -30,6 +29,7 @@ #include #include #include +#include #include #include @@ -281,9 +281,9 @@ public: // Configure resource attributes auto resourceAttrs = resource::Resource::Create({ - {resource::SemanticConventions::kServiceName, setup_.serviceName}, - {resource::SemanticConventions::kServiceVersion, setup_.serviceVersion}, - {resource::SemanticConventions::kServiceInstanceId, setup_.serviceInstanceId}, + {opentelemetry::semconv::service::kServiceName, setup_.serviceName}, + {opentelemetry::semconv::service::kServiceVersion, setup_.serviceVersion}, + {opentelemetry::semconv::service::kServiceInstanceId, setup_.serviceInstanceId}, {"xrpl.network.id", static_cast(setup_.networkId)}, {"xrpl.network.type", setup_.networkType}, }); diff --git a/src/libxrpl/telemetry/TelemetryConfig.cpp b/src/libxrpl/telemetry/TelemetryConfig.cpp index 6d642ee177..28bd353685 100644 --- a/src/libxrpl/telemetry/TelemetryConfig.cpp +++ b/src/libxrpl/telemetry/TelemetryConfig.cpp @@ -49,33 +49,33 @@ setupTelemetry( { Telemetry::Setup setup; - setup.enabled = section.value_or("enabled", 0) != 0; - setup.serviceName = section.value_or("service_name", "xrpld"); + setup.enabled = section.valueOr("enabled", 0) != 0; + setup.serviceName = section.valueOr("service_name", "xrpld"); setup.serviceVersion = version; - setup.serviceInstanceId = section.value_or("service_instance_id", nodePublicKey); + setup.serviceInstanceId = section.valueOr("service_instance_id", nodePublicKey); setup.exporterEndpoint = - section.value_or("endpoint", "http://localhost:4318/v1/traces"); + section.valueOr("endpoint", "http://localhost:4318/v1/traces"); - setup.useTls = section.value_or("use_tls", 0) != 0; - setup.tlsCertPath = section.value_or("tls_ca_cert", ""); + setup.useTls = section.valueOr("use_tls", 0) != 0; + setup.tlsCertPath = section.valueOr("tls_ca_cert", ""); - setup.samplingRatio = section.value_or("sampling_ratio", 1.0); + setup.samplingRatio = section.valueOr("sampling_ratio", 1.0); setup.samplingRatio = std::clamp(setup.samplingRatio, 0.0, 1.0); - setup.batchSize = section.value_or("batch_size", 512u); + setup.batchSize = section.valueOr("batch_size", 512u); setup.batchDelay = - std::chrono::milliseconds{section.value_or("batch_delay_ms", 5000u)}; - setup.maxQueueSize = section.value_or("max_queue_size", 2048u); + std::chrono::milliseconds{section.valueOr("batch_delay_ms", 5000u)}; + setup.maxQueueSize = section.valueOr("max_queue_size", 2048u); setup.networkId = networkId; setup.networkType = networkTypeFromId(networkId); - setup.traceTransactions = section.value_or("trace_transactions", 1) != 0; - setup.traceConsensus = section.value_or("trace_consensus", 1) != 0; - setup.traceRpc = section.value_or("trace_rpc", 1) != 0; - setup.tracePeer = section.value_or("trace_peer", 0) != 0; - setup.traceLedger = section.value_or("trace_ledger", 1) != 0; + setup.traceTransactions = section.valueOr("trace_transactions", 1) != 0; + setup.traceConsensus = section.valueOr("trace_consensus", 1) != 0; + setup.traceRpc = section.valueOr("trace_rpc", 1) != 0; + setup.tracePeer = section.valueOr("trace_peer", 0) != 0; + setup.traceLedger = section.valueOr("trace_ledger", 1) != 0; return setup; }