2 files changed, 15 insertions, 17 deletions
diff --git a/library/cpp/yt/error/error_code.cpp b/library/cpp/yt/error/error_code.cpp
index d82d03214d4..ef9ce0f33c1 100644
--- a/library/cpp/yt/error/error_code.cpp
+++ b/library/cpp/yt/error/error_code.cpp
@@ -62,11 +62,10 @@ void TErrorCodeRegistry::RegisterErrorCode(int code, const TErrorCodeInfo& error
         if (code == 119) {
             return;
         }
-        YT_LOG_FATAL(
-            "Duplicate error code (Code: %v, StoredCodeInfo: %v, NewCodeInfo: %v)",
-            code,
-            CodeToInfo_[code],
-            errorCodeInfo);
+        YT_TLOG_FATAL("Duplicate error code")
+            .With("Code", code)
+            .With("StoredCodeInfo", CodeToInfo_[code])
+            .With("NewCodeInfo", errorCodeInfo);
     }
 }
 
@@ -91,11 +90,11 @@ void TErrorCodeRegistry::RegisterErrorCodeRange(int from, int to, std::string na
 
     TErrorCodeRangeInfo newRange{from, to, std::move(namespaceName), std::move(formatter)};
     for (const auto& range : ErrorCodeRanges_) {
-        YT_LOG_FATAL_IF(
+        YT_TLOG_FATAL_IF(
             range.Intersects(newRange),
-            "Intersecting error code ranges registered (FirstRange: %v, SecondRange: %v)",
-            range,
-            newRange);
+            "Intersecting error code ranges registered")
+            .With("FirstRange", range)
+            .With("SecondRange", newRange);
     }
     ErrorCodeRanges_.push_back(std::move(newRange));
     CheckCodesAgainstRanges();
@@ -105,14 +104,13 @@ void TErrorCodeRegistry::CheckCodesAgainstRanges() const
 {
     for (const auto& [code, info] : CodeToInfo_) {
         for (const auto& range : ErrorCodeRanges_) {
-            YT_LOG_FATAL_IF(
+            YT_TLOG_FATAL_IF(
                 range.Contains(code),
-                "Error code range contains another registered code "
-                "(Range: %v, Code: %v, RangeCodeInfo: %v, StandaloneCodeInfo: %v)",
-                range,
-                code,
-                range.Get(code),
-                info);
+                "Error code range contains another registered code")
+                .With("Range", range)
+                .With("Code", code)
+                .With("RangeCodeInfo", range.Get(code))
+                .With("StandaloneCodeInfo", info);
         }
     }
 }
diff --git a/library/cpp/yt/logging/backends/stream/unittests/stream_log_manager_ut.cpp b/library/cpp/yt/logging/backends/stream/unittests/stream_log_manager_ut.cpp
index cb3e244e3b9..95b2ade9b65 100644
--- a/library/cpp/yt/logging/backends/stream/unittests/stream_log_manager_ut.cpp
+++ b/library/cpp/yt/logging/backends/stream/unittests/stream_log_manager_ut.cpp
@@ -20,7 +20,7 @@ TEST(TStreamLogManagerTest, Simple)
         TStringOutput output(str);
         auto logManager = CreateStreamLogManager(&output);
         TLogger Logger(logManager.get(), "Test");
-        YT_LOG_INFO("Hello world");
+        YT_TLOG_INFO("Hello world");
     }
 
     TVector<TStringBuf> tokens;