Use TraceID as S3 Write Prefix

2 files changed, 8 insertions, 2 deletions

diff --git a/ydb/core/kqp/executer_actor/kqp_executer_impl.h b/ydb/core/kqp/executer_actor/kqp_executer_impl.h
index 9211a8399ff..4dc36f49e47 100644
--- a/ydb/core/kqp/executer_actor/kqp_executer_impl.h
+++ b/ydb/core/kqp/executer_actor/kqp_executer_impl.h
@@ -801,6 +801,10 @@ protected:
             if (sinkName) {
                 auto structuredToken = NYql::CreateStructuredTokenParser(extSink.GetAuthInfo()).ToBuilder().ReplaceReferences(secureParams).ToJson();
                 task.Meta.SecureParams.emplace(sinkName, structuredToken);
+                if (UserRequestContext->TraceId) {
+                    task.Meta.TaskParams.emplace("fq.job_id", UserRequestContext->TraceId);
+                    // "fq.restart_count"
+                }
             }
 
             auto& output = task.Outputs[sink.GetOutputIndex()];
diff --git a/ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp b/ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp
index d3c53e31486..833da24ee9b 100644
--- a/ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp
+++ b/ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp
@@ -56,7 +56,9 @@ public:
         , LeaseDuration(leaseDuration)
         , QueryServiceConfig(queryServiceConfig)
         , Counters(counters)
-    {}
+    {
+        Request.SetTraceId(ExecutionId);
+    }
 
     static constexpr char ActorName[] = "KQP_RUN_SCRIPT_ACTOR";
 
@@ -479,7 +481,7 @@ private:
 
 private:
     const TString ExecutionId;
-    const NKikimrKqp::TEvQueryRequest Request;
+    NKikimrKqp::TEvQueryRequest Request;
     const TString Database;
     const ui64 LeaseGeneration;
     const TDuration LeaseDuration;