Merge pull request #185 from AlanLiu90/master

Fix unicode characters are escaped
Cysharp · Nov 20, 2024 · e2a1a56 · e2a1a56
2 parents 675d0ff + 223dc28
commit e2a1a56
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/ZLogger/Formatters/SystemTextJsonZLoggerFormatter.cs b/src/ZLogger/Formatters/SystemTextJsonZLoggerFormatter.cs
@@ -132,7 +132,15 @@ public class SystemTextJsonZLoggerFormatter : IZLoggerFormatter
         public void FormatLogEntry(IBufferWriter<byte> writer, IZLoggerEntry entry)
         {
             jsonWriter?.Reset(writer);
-            jsonWriter ??= new Utf8JsonWriter(writer);
+            jsonWriter ??= new Utf8JsonWriter(writer, new JsonWriterOptions()
+            {
+                Indented = JsonSerializerOptions.WriteIndented,
+                Encoder = JsonSerializerOptions.Encoder,
+                SkipValidation = true,
+#if NET7_0_OR_GREATER
+                MaxDepth = JsonSerializerOptions.MaxDepth
+#endif
+            });
 
             jsonWriter.WriteStartObject();
 

diff --git a/tests/ZLogger.Tests/JsonFormatTest.cs b/tests/ZLogger.Tests/JsonFormatTest.cs
@@ -52,6 +52,8 @@ public void FormatLogEntry_CustomMetadata()
 
             doc.GetProperty("Hash").GetString().Should().Be(sourceCodeHash);
             doc.GetProperty("LogLevel").GetString().Should().Be("Debug");
+
+            json.Should().NotContainAny("\\u");
         }
 
         [Fact]
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,8 @@ public void FormatLogEntry_CustomMetadata() @@
                 doc.GetProperty("Hash").GetString().Should().Be(sourceCodeHash);
                 doc.GetProperty("LogLevel").GetString().Should().Be("Debug");
+                json.Should().NotContainAny("\\u");
             }
             [Fact]
@@ Expand Down @@