From bd14ebe0c2f5ec3b879c4c863fe1715daa623d62 Mon Sep 17 00:00:00 2001 From: Zarina Tlupova <96023685+zarinatlupova@users.noreply.github.com> Date: Tue, 22 Apr 2025 17:16:46 +0300 Subject: [PATCH 1/3] Add traceparent to TRequestSettings --- .../cpp/include/ydb-cpp-sdk/client/types/request_settings.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/request_settings.h b/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/request_settings.h index e32bdd141129..e7dcaad97891 100644 --- a/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/request_settings.h +++ b/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/request_settings.h @@ -8,6 +8,7 @@ #include #include +#include namespace NYdb::inline Dev { @@ -20,6 +21,7 @@ struct TRequestSettings { FLUENT_SETTING(std::string, RequestType); FLUENT_SETTING(THeader, Header); FLUENT_SETTING(TDuration, ClientTimeout); + FLUENT_SETTING(std::string, TraceParent); TRequestSettings() = default; @@ -29,6 +31,7 @@ struct TRequestSettings { , RequestType_(other.RequestType_) , Header_(other.Header_) , ClientTimeout_(other.ClientTimeout_) + , TraceParent_(other.TraceParent) {} }; From 82c166140336494500a06196afc8294e133475c7 Mon Sep 17 00:00:00 2001 From: Zarina Tlupova <96023685+zarinatlupova@users.noreply.github.com> Date: Tue, 22 Apr 2025 17:21:39 +0300 Subject: [PATCH 2/3] Add traceparent to TRequestSettings --- .../client/impl/ydb_internal/rpc_request_settings/settings.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/rpc_request_settings/settings.h b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/rpc_request_settings/settings.h index 3db514498f9f..b9a76777035c 100644 --- a/ydb/public/sdk/cpp/src/client/impl/ydb_internal/rpc_request_settings/settings.h +++ b/ydb/public/sdk/cpp/src/client/impl/ydb_internal/rpc_request_settings/settings.h @@ -24,6 +24,11 @@ struct TRpcRequestSettings { rpcSettings.TraceId = settings.TraceId_; rpcSettings.RequestType = settings.RequestType_; rpcSettings.Header = settings.Header_; + + if (!settings.TraceParent_.empty()) { + rpcSettings.Header.emplace_back("traceparent", settings.TraceParent_); + } + rpcSettings.PreferredEndpoint = preferredEndpoint; rpcSettings.EndpointPolicy = endpointPolicy; rpcSettings.UseAuth = true; From b77bf1f9db19a1092dfa32c931d5f6aeb0c69534 Mon Sep 17 00:00:00 2001 From: Zarina Tlupova <96023685+zarinatlupova@users.noreply.github.com> Date: Wed, 23 Apr 2025 13:37:32 +0300 Subject: [PATCH 3/3] Add traceparent to TRequestSettings --- .../sdk/cpp/include/ydb-cpp-sdk/client/types/request_settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/request_settings.h b/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/request_settings.h index e7dcaad97891..9e5fa4966ceb 100644 --- a/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/request_settings.h +++ b/ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/types/request_settings.h @@ -31,7 +31,7 @@ struct TRequestSettings { , RequestType_(other.RequestType_) , Header_(other.Header_) , ClientTimeout_(other.ClientTimeout_) - , TraceParent_(other.TraceParent) + , TraceParent_(other.TraceParent_) {} };