Fix two problems in structured log (#46182)

3 files changed, 5 insertions, 4 deletions

diff --git a/ydb/core/client/server/msgbus_tabletreq.h b/ydb/core/client/server/msgbus_tabletreq.h
index 42d8857b90d..87470e33688 100644
--- a/ydb/core/client/server/msgbus_tabletreq.h
+++ b/ydb/core/client/server/msgbus_tabletreq.h
@@ -65,8 +65,7 @@ protected:
         YDB_LOG_ERROR_CTX_COMP(ctx, NKikimrServices::MSGBUS_REQUEST, "TabletRequest",
             {"tabletId", TabletId},
             {"status", status},
-            {"text", text},
-            {"endl", Endl});
+            {"text", text});
         return new TBusResponseStatus(status, text);
     }
 
diff --git a/ydb/library/actors/struct_log/create_message.h b/ydb/library/actors/struct_log/create_message.h
index 049ee3b95bd..1b80beef557 100644
--- a/ydb/library/actors/struct_log/create_message.h
+++ b/ydb/library/actors/struct_log/create_message.h
@@ -14,7 +14,7 @@ namespace NActors::NStructuredLog {
 // 3. YDB_LOG_UPDATE_MESSAGE doesn't return message, but it should be usable inside another macro parameters too.
 
 #define YDB_LOG_CREATE_MESSAGE(...)                                                                \
-    ([&]() -> TStructuredMessage {                                                                 \
+    ([&]() -> NActors::NStructuredLog::TStructuredMessage {                                        \
         NActors::NStructuredLog::TCreateMessageGuard ydblogGuard;                                  \
         std::initializer_list<NActors::NStructuredLog::TCreateMessageArg> ydblogArgs{__VA_ARGS__}; \
         Y_UNUSED(ydblogArgs);                                                                      \
diff --git a/ydb/library/actors/struct_log/create_message_impl.h b/ydb/library/actors/struct_log/create_message_impl.h
index 0b40ce6d45a..746e80b009b 100644
--- a/ydb/library/actors/struct_log/create_message_impl.h
+++ b/ydb/library/actors/struct_log/create_message_impl.h
@@ -186,7 +186,9 @@ public:
     // Native types support
     template <typename T, typename K = TKeyName>
     TCreateMessageArg(K&& name, const T& value) {
-        if constexpr (std::is_same<T, TStructuredMessage>::value) {
+        if constexpr (std::is_function<T>::value) {
+            static_assert(false, "It is not allowed to pass function into structured message");
+        } else if constexpr (std::is_same<T, TStructuredMessage>::value) {
             TCreateMessageGuard::GetBuildMessage().AppendSubMessage({std::move(name)}, value);
         } else if constexpr (THasToStructuredMessageMethod<std::decay_t<T>>::value) {
             auto message = value.ToStructuredMessage();