KIKIMR-20533 Forward traceparent header to KV-tablet (#689)

* KIKIMR-20533 Forward traceparent header to KV-tablet * Introduced TWilsonGrpc::RequestActor
ydb-platform · Dec 25, 2023 · 4d7dc0b · 4d7dc0b
1 parent 6709bae
commit 4d7dc0b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/ydb/core/grpc_services/rpc_deferrable.h b/ydb/core/grpc_services/rpc_deferrable.h
@@ -6,11 +6,12 @@
 #include "cancelation/cancelation_event.h"
 #include "rpc_common/rpc_common.h"
 
-#include <ydb/core/tx/tx_proxy/proxy.h>
-#include <ydb/library/ydb_issue/issue_helpers.h>
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/core/protos/flat_tx_scheme.pb.h>
 #include <ydb/core/tx/schemeshard/schemeshard.h>
+#include <ydb/core/tx/tx_proxy/proxy.h>
+#include <ydb/library/wilson_ids/wilson.h>
+#include <ydb/library/ydb_issue/issue_helpers.h>
 #include <ydb/public/api/protos/ydb_status_codes.pb.h>
 #include <ydb/public/lib/operation_id/operation_id.h>
 
@@ -150,6 +151,8 @@ class TRpcOperationRequestActor : public TRpcRequestWithOperationParamsActor<TDe
 
     TRpcOperationRequestActor(IRequestOpCtx* request)
         : TBase(request)
+        , Span_(TWilsonGrpc::RequestActor, request->GetWilsonTraceId(),
+                "RequestProxy.RpcOperationRequestActor", NWilson::EFlags::AUTO_END)
     {}
 
     static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
@@ -280,6 +283,9 @@ class TRpcOperationRequestActor : public TRpcRequestWithOperationParamsActor<TDe
         auto as = TActivationContext::ActorSystem();
         PassSubscription(ev->Get(), Request_.get(), as);
     }
+
+protected:
+    NWilson::TSpan Span_;
 };
 
 } // namespace NGRpcService

diff --git a/ydb/core/grpc_services/rpc_keyvalue.cpp b/ydb/core/grpc_services/rpc_keyvalue.cpp
@@ -513,7 +513,7 @@ class TBaseKeyValueRequest {
         req->UserToken = UserToken;
         req->DatabaseName = self->Request_->GetDatabaseName().GetOrElse("");
         auto ev = new TEvTxProxySchemeCache::TEvNavigateKeySet(req.Release());
-        self->Send(MakeSchemeCacheID(), ev);
+        self->Send(MakeSchemeCacheID(), ev, 0, 0, self->Span_.GetTraceId());
     }
 
     bool OnNavigateKeySetResult(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr &ev, ui32 access) {
@@ -818,7 +818,7 @@ class TKeyValueRequestGrpc
         auto &rec = *this->GetProtoRequest();
         CopyProtobuf(rec, &req->Record);
         req->Record.set_tablet_id(KVTabletId);
-        NTabletPipe::SendData(this->SelfId(), KVPipeClient, req.release(), 0);
+        NTabletPipe::SendData(this->SelfId(), KVPipeClient, req.release(), 0, TBase::Span_.GetTraceId());
     }
 
     void Handle(typename TKVRequest::TResponse::TPtr &ev) {

diff --git a/ydb/library/wilson_ids/wilson.h b/ydb/library/wilson_ids/wilson.h
@@ -47,6 +47,7 @@ namespace NKikimr {
     struct TWilsonGrpc {
         enum {
             RequestProxy = 9,
+            RequestActor = 9,
         };
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,6 +47,7 @@ namespace NKikimr { @@
         struct TWilsonGrpc {
             enum {
                 RequestProxy = 9,
+                RequestActor = 9,
             };
         };
@@ Expand Down @@