Add UA logging for vanilla jobs

Initial vanilla_job logging changes

8 files changed, 19 insertions, 7 deletions

diff --git a/ydb/library/yql/providers/dq/config/config.proto b/ydb/library/yql/providers/dq/config/config.proto
index 7a1090d818..4f993b7507 100644
--- a/ydb/library/yql/providers/dq/config/config.proto
+++ b/ydb/library/yql/providers/dq/config/config.proto
@@ -56,6 +56,11 @@ message TDqConfig {
         optional string Value = 2;
     }
 
+    message TFile {
+        optional string Name = 1;
+        optional string LocalPath = 2;
+    }
+
     message TPortoSettings {
         repeated TAttr Setting = 1;
     }
@@ -64,8 +69,10 @@ message TDqConfig {
         optional string ClusterName = 1 [default = "hume"];
         optional string User = 2;      // default -- current user name
         optional string TokenFile = 3; // default -- $HOME/.yt/token
-        optional string VanillaJob = 4;
-        optional string VanillaJobMd5 = 27; // autofilled
+        optional string VanillaJobLite = 4;
+        optional string VanillaJobLiteMd5 = 27; // autofilled (for Lite version only)
+        optional string VanillaJobCommand = 35;
+        repeated TFile VanillaJobFile = 36;
         optional uint32 MaxJobs = 5;
         optional string Prefix = 16;
         optional string UploadPrefix = 6; // deprecated option
@@ -74,7 +81,7 @@ message TDqConfig {
         optional string Token = 8; // for internal use only
         optional int64 MemoryLimit = 9;
         optional int64 CpuLimit = 29;
-        optional string VanillaJobLogFile = 10; // for tests only
+        repeated TAttr VaultEnv = 34;
         optional uint32 JobsPerOperation = 11;
         optional uint32 UploadReplicationFactor = 12;
         repeated string Owner = 13;
diff --git a/ydb/library/yql/providers/dq/provider/yql_dq_control.cpp b/ydb/library/yql/providers/dq/provider/yql_dq_control.cpp
index ee2aec976a..9b4e30c488 100644
--- a/ydb/library/yql/providers/dq/provider/yql_dq_control.cpp
+++ b/ydb/library/yql/providers/dq/provider/yql_dq_control.cpp
@@ -166,8 +166,8 @@ IDqControlFactoryPtr CreateDqControlFactory(const NProto::TDqConfig& config, con
         config.GetPort(),
         2,
         udfs,
-        config.GetYtBackends()[0].GetVanillaJob(),
-        config.GetYtBackends()[0].GetVanillaJobMd5(),
+        config.GetYtBackends()[0].GetVanillaJobLite(),
+        config.GetYtBackends()[0].GetVanillaJobLiteMd5(),
         indexedUdfFilter,
         config.GetControl().GetEnableStrip(),
         fileStorage
diff --git a/ydb/library/yql/providers/dq/provider/yql_dq_gateway.cpp b/ydb/library/yql/providers/dq/provider/yql_dq_gateway.cpp
index f3b063808d..2052fe8539 100644
--- a/ydb/library/yql/providers/dq/provider/yql_dq_gateway.cpp
+++ b/ydb/library/yql/providers/dq/provider/yql_dq_gateway.cpp
@@ -554,8 +554,8 @@ TIntrusivePtr<IDqGateway> CreateDqGateway(const TString& host, int port) {
 
 TIntrusivePtr<IDqGateway> CreateDqGateway(const NProto::TDqConfig& config) {
     return new TDqGateway("localhost", config.GetPort(),
-        config.GetYtBackends()[0].GetVanillaJob(),
-        config.GetYtBackends()[0].GetVanillaJobMd5(),
+        config.GetYtBackends()[0].GetVanillaJobLite(),
+        config.GetYtBackends()[0].GetVanillaJobLiteMd5(),
         TDuration::MilliSeconds(config.GetOpenSessionTimeoutMs()),
         TDuration::MilliSeconds(config.GetRequestTimeoutMs()));
 }
diff --git a/ydb/library/yql/utils/log/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/utils/log/CMakeLists.darwin-x86_64.txt
index 092b94e027..75e3e46302 100644
--- a/ydb/library/yql/utils/log/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/utils/log/CMakeLists.darwin-x86_64.txt
@@ -13,6 +13,7 @@ add_library(yql-utils-log)
 target_link_libraries(yql-utils-log PUBLIC
   contrib-libs-cxxsupp
   yutil
+  contrib-libs-protobuf
   library-cpp-logger
   cpp-logger-global
   cpp-deprecated-atomic
diff --git a/ydb/library/yql/utils/log/CMakeLists.linux-aarch64.txt b/ydb/library/yql/utils/log/CMakeLists.linux-aarch64.txt
index d836e88184..9b365675e4 100644
--- a/ydb/library/yql/utils/log/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/utils/log/CMakeLists.linux-aarch64.txt
@@ -14,6 +14,7 @@ target_link_libraries(yql-utils-log PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
+  contrib-libs-protobuf
   library-cpp-logger
   cpp-logger-global
   cpp-deprecated-atomic
diff --git a/ydb/library/yql/utils/log/CMakeLists.linux-x86_64.txt b/ydb/library/yql/utils/log/CMakeLists.linux-x86_64.txt
index d836e88184..9b365675e4 100644
--- a/ydb/library/yql/utils/log/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/utils/log/CMakeLists.linux-x86_64.txt
@@ -14,6 +14,7 @@ target_link_libraries(yql-utils-log PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
+  contrib-libs-protobuf
   library-cpp-logger
   cpp-logger-global
   cpp-deprecated-atomic
diff --git a/ydb/library/yql/utils/log/CMakeLists.windows-x86_64.txt b/ydb/library/yql/utils/log/CMakeLists.windows-x86_64.txt
index 092b94e027..75e3e46302 100644
--- a/ydb/library/yql/utils/log/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/utils/log/CMakeLists.windows-x86_64.txt
@@ -13,6 +13,7 @@ add_library(yql-utils-log)
 target_link_libraries(yql-utils-log PUBLIC
   contrib-libs-cxxsupp
   yutil
+  contrib-libs-protobuf
   library-cpp-logger
   cpp-logger-global
   cpp-deprecated-atomic
diff --git a/ydb/library/yql/utils/log/ya.make b/ydb/library/yql/utils/log/ya.make
index 43a7c28fa9..5e712af842 100644
--- a/ydb/library/yql/utils/log/ya.make
+++ b/ydb/library/yql/utils/log/ya.make
@@ -8,6 +8,7 @@ SRCS(
 )
 
 PEERDIR(
+    contrib/libs/protobuf
     library/cpp/logger
     library/cpp/logger/global
     library/cpp/deprecated/atomic