Merge 4647315 into 7ff1c86

Author: shmel1k

ydb/core/driver_lib/run/run.cpp

@@ -1198,6 +1198,8 @@ void TKikimrRunner::InitializeLogSettings(const TKikimrRunConfig& runConfig)
     );
 
     LogSettings->ClusterName = logConfig.HasClusterName() ? logConfig.GetClusterName() : "";
+    LogSettings->TenantName = runConfig.TenantName;
+    LogSettings->NodeId = runConfig.NodeId;
 
     if (logConfig.GetFormat() == "full") {
         LogSettings->Format = NLog::TSettings::PLAIN_FULL_FORMAT;

ydb/core/log_backend/log_backend.cpp

@@ -15,7 +15,14 @@ TAutoPtr<TLogBackend> CreateLogBackendWithUnifiedAgent(
             const auto& uaClientConfig = logConfig.GetUAClientConfig();
             auto uaCounters = GetServiceCounters(counters, "utils")->GetSubgroup("subsystem", "ua_client");
             auto logName = uaClientConfig.GetLogName();
-            TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(uaClientConfig, uaCounters, logName);
+            TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(
+                uaClientConfig,
+                uaCounters,
+                logName,
+                runConfig.TenantName == "" ? "static" : "slot",
+                runConfig.TenantName,
+                runConfig.ClusterName
+            );
             logBackend = logBackend ? NActors::CreateCompositeLogBackend({logBackend, uaLogBackend}) : uaLogBackend;
         }
         if (logBackend) {
@@ -52,7 +59,14 @@ TAutoPtr<TLogBackend> CreateMeteringLogBackendWithUnifiedAgent(
         auto logName = meteringConfig.HasLogName()
             ? meteringConfig.GetLogName()
             : uaClientConfig.GetLogName();
-        TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(uaClientConfig, uaCounters, logName);
+        TAutoPtr<TLogBackend> uaLogBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(
+            uaClientConfig,
+            uaCounters,
+            logName,
+            runConfig.TenantName == "" ? "static" : "slot",
+            runConfig.TenantName,
+            runConfig.ClusterName
+        );
         logBackend = logBackend ? NActors::CreateCompositeLogBackend({logBackend, uaLogBackend}) : uaLogBackend;
     }
 
@@ -100,7 +114,14 @@ TAutoPtr<TLogBackend> CreateAuditLogUnifiedAgentBackend(
         auto logName = runConfig.AppConfig.GetAuditConfig().GetUnifiedAgentBackend().HasLogName()
             ? runConfig.AppConfig.GetAuditConfig().GetUnifiedAgentBackend().GetLogName()
             : uaClientConfig.GetLogName();
-        logBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(uaClientConfig, uaCounters, logName);
+        logBackend = TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(
+            uaClientConfig,
+            uaCounters,
+            logName,
+            runConfig.TenantName == "" ? "static" : "slot",
+            runConfig.TenantName,
+            runConfig.ClusterName
+        );
     }
 
     return logBackend;

ydb/core/log_backend/log_backend_build.cpp

@@ -15,7 +15,11 @@ TAutoPtr<TLogBackend> TLogBackendBuildHelper::CreateLogBackendFromLogConfig(cons
     return logBackend;
 }
 
-TAutoPtr<TLogBackend> TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(const NKikimrConfig::TUAClientConfig& uaClientConfig, NMonitoring::TDynamicCounterPtr uaCounters, const TString& logName) {
+TAutoPtr<TLogBackend> TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig(const NKikimrConfig::TUAClientConfig& uaClientConfig,
+                                                                                 NMonitoring::TDynamicCounterPtr uaCounters,
+                                                                                 const TString& logName, const TString& nodeType = "static",
+                                                                                 const TString& tenant = "",
+                                                                                 const TString& clusterName = "") {
     auto parameters = NUnifiedAgent::TClientParameters(uaClientConfig.GetUri())
         .SetCounters(uaCounters)
         .SetMaxInflightBytes(uaClientConfig.GetMaxInflightBytes());
@@ -44,6 +48,18 @@ TAutoPtr<TLogBackend> TLogBackendBuildHelper::CreateLogBackendFromUAClientConfig
         (*sessionParameters.Meta)["_log_name"] = logName;
     }
 
+    if (nodeType) {
+        (*sessionParameters.Meta)["node_type"] = nodeType;
+    }
+
+    if (tenant) {
+        (*sessionParameters.Meta)["database"] = tenant;
+    }
+
+    if (clusterName) {
+        (*sessionParameters.Meta)["cluster"] = clusterName;
+    }
+
     TAutoPtr<TLogBackend> uaLogBackend = MakeLogBackend(parameters, sessionParameters).Release();
     return uaLogBackend;
 }

ydb/core/log_backend/log_backend_build.h

@@ -16,6 +16,9 @@ class TLogBackendBuildHelper {
     static TAutoPtr<TLogBackend> CreateLogBackendFromUAClientConfig(
             const NKikimrConfig::TUAClientConfig& uaClientConfig,
             NMonitoring::TDynamicCounterPtr uaCounters,
-            const TString& logName);
+            const TString& logName,
+            const TString& nodeType,
+            const TString& tenant,
+            const TString& clusterName);
 };
 }

ydb/core/protos/config.proto

@@ -359,6 +359,7 @@ message TLogConfig {
     optional TUAClientConfig UAClientConfig = 13;
     optional uint64 TimeThresholdMs = 14 [default = 1000];
     optional bool IgnoreUnknownComponents = 15 [default = true];
+    optional string TenantName = 16;
 }
 
 message TInterconnectConfig {

ydb/library/actors/core/log.cpp

@@ -492,6 +492,10 @@ namespace NActors {
                     .WriteString(Settings->ShortHostName)
                     .WriteKey("cluster")
                     .WriteString(Settings->ClusterName)
+                    .WriteKey("database")
+                    .WriteString(Settings->TenantName ? Settings->TenantName : "static")
+                    .WriteKey("node_id")
+                    .WriteInt(Settings->NodeId)
                     .WriteKey("priority")
                     .WriteString(PriorityToString(priority))
                     .WriteKey("npriority")

ydb/library/actors/core/log_settings.cpp

@@ -24,6 +24,7 @@ namespace NActors {
             , Format(PLAIN_FULL_FORMAT)
             , ShortHostName("")
             , ClusterName("")
+            , TenantName("")
         {
             Append(minVal, maxVal, func);
         }
@@ -47,6 +48,7 @@ namespace NActors {
             , Format(PLAIN_FULL_FORMAT)
             , ShortHostName("")
             , ClusterName("")
+            , TenantName("")
         {
         }
 

ydb/library/actors/core/log_settings.h

@@ -91,7 +91,9 @@ namespace NActors {
             ELogFormat Format;
             TString ShortHostName;
             TString ClusterName;
+            TString TenantName;
             TString MessagePrefix;
+            ui32 NodeId;
 
             // The best way to provide minVal, maxVal and func is to have
             // protobuf enumeration of components. In this case protoc