Fix serialization of Serilog.Sinks not including log.level (#512)

Mpdreamz · web-flow · commit 420132403778 · 2025-05-28T17:16:37.000+02:00
(cherry picked from commit ade536c)
diff --git a/.editorconfig b/.editorconfig
@@ -207,6 +207,7 @@ resharper_csharp_accessor_owner_body=expression_body
 
 resharper_redundant_case_label_highlighting=do_not_show
 resharper_redundant_argument_default_value_highlighting=do_not_show
+dotnet_diagnostic.xUnit1041.severity = none
 
 [*.{sh,bat,ps1}]
 trim_trailing_whitespace=true
diff --git a/examples/Elastic.Extensions.Logging.Example/Elastic.Extensions.Logging.Example.csproj b/examples/Elastic.Extensions.Logging.Example/Elastic.Extensions.Logging.Example.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
-    <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.4.3" />
+    <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.6.0" />
     <PackageReference Include="NEST" Version="7.8.1" />
   </ItemGroup>
 
diff --git a/examples/Elastic.Serilog.Sinks.Example/Elastic.Serilog.Sinks.Example.csproj b/examples/Elastic.Serilog.Sinks.Example/Elastic.Serilog.Sinks.Example.csproj
@@ -11,8 +11,8 @@
       <PackageReference Include="Elastic.Apm" Version="1.22.0" />
       <PackageReference Include="Serilog" Version="4.1.0" />
       <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-      <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.4.3" />
       <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.16.2" />
+      <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.6.0" />
       <PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
       <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     </ItemGroup>
diff --git a/examples/aspnetcore-with-extensions-logging/aspnetcore-with-extensions-logging.csproj b/examples/aspnetcore-with-extensions-logging/aspnetcore-with-extensions-logging.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.4.3" />
+    <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.6.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.16.2" />
   </ItemGroup>
 
diff --git a/examples/playground/playground.csproj b/examples/playground/playground.csproj
@@ -12,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.5.0" />
+      <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.6.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Elastic.CommonSchema.Serilog/LogEventConverter.cs b/src/Elastic.CommonSchema.Serilog/LogEventConverter.cs
@@ -7,13 +7,15 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text.Json.Serialization;
+using Elastic.CommonSchema.Serialization;
 using Serilog.Events;
 using static Elastic.CommonSchema.Serilog.SpecialProperties;
 
 namespace Elastic.CommonSchema.Serilog
 {
 	/// A specialized instance of <see cref="EcsDocument"/> that holds on to the original <see cref="LogEvent"/>
 	/// <para> This property won't be emitted to JSON but is used to report back to serilog failure pipelines</para>
+	[JsonConverter(typeof(EcsDocumentJsonConverterFactory))]
 	public class LogEventEcsDocument : EcsDocument
 	{
 		/// The original <see cref="LogEvent"/> for bookkeeping, not send over to Elasticsearch
diff --git a/src/Elastic.CommonSchema/Serialization/EcsDocumentJsonConverter.cs b/src/Elastic.CommonSchema/Serialization/EcsDocumentJsonConverter.cs
@@ -102,7 +102,5 @@ private static void WriteTimestamp(Utf8JsonWriter writer, BaseFieldSet value, Js
 	/// <summary> A JsonConverter for <see cref="EcsDocument"/> that supports the
 	/// https://github.com/elastic/ecs-logging specification
 	/// </summary>
-	public class EcsDocumentJsonConverter : EcsDocumentJsonConverter<EcsDocument>
-	{
-	}
+	public class EcsDocumentJsonConverter : EcsDocumentJsonConverter<EcsDocument>;
 }
diff --git a/tests-integration/Directory.Build.props b/tests-integration/Directory.Build.props
@@ -8,7 +8,8 @@
     
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\build\keys\keypair.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup> 
+    <NoWarn>xUnit1041</NoWarn>
+  </PropertyGroup>
   <ItemGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(ProjectName), '^(.*)Tests$'))">
 
     <PackageReference Include="JunitXml.TestLogger" Version="3.0.114" PrivateAssets="All" />
diff --git a/tests-integration/Elastic.CommonSchema.BenchmarkDotNetExporter.IntegrationTests/Elastic.CommonSchema.BenchmarkDotNetExporter.IntegrationTests.csproj b/tests-integration/Elastic.CommonSchema.BenchmarkDotNetExporter.IntegrationTests/Elastic.CommonSchema.BenchmarkDotNetExporter.IntegrationTests.csproj
@@ -12,6 +12,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.1"/>
     <PackageReference Include="BenchmarkDotNet.Annotations" Version="0.13.1"/>
+    <PackageReference Update="xunit" Version="2.9.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests-integration/Elastic.Extensions.Logging.IntegrationTests/Elastic.Extensions.Logging.IntegrationTests.csproj b/tests-integration/Elastic.Extensions.Logging.IntegrationTests/Elastic.Extensions.Logging.IntegrationTests.csproj
@@ -10,4 +10,8 @@
     <ProjectReference Include="..\Elasticsearch.IntegrationDefaults\Elasticsearch.IntegrationDefaults.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="xunit" Version="2.9.3" />
+  </ItemGroup>
+
 </Project>
diff --git a/tests-integration/Elastic.Ingest.Elasticsearch.CommonSchema.IntegrationTests/DataStreamIngestionTests.cs b/tests-integration/Elastic.Ingest.Elasticsearch.CommonSchema.IntegrationTests/DataStreamIngestionTests.cs
@@ -17,7 +17,9 @@ namespace Elastic.Ingest.Elasticsearch.CommonSchema.IntegrationTests;
 
 public class DataStreamIngestionTests : IntegrationTestBase
 {
+#pragma warning disable xUnit1041
 	public DataStreamIngestionTests(IngestionCluster cluster, ITestOutputHelper output) : base(cluster, output)
+#pragma warning restore xUnit1041
 	{
 	}
 
diff --git a/tests-integration/Elastic.Ingest.Elasticsearch.CommonSchema.IntegrationTests/Elastic.Ingest.Elasticsearch.CommonSchema.IntegrationTests.csproj b/tests-integration/Elastic.Ingest.Elasticsearch.CommonSchema.IntegrationTests/Elastic.Ingest.Elasticsearch.CommonSchema.IntegrationTests.csproj
@@ -13,4 +13,8 @@
     <ProjectReference Include="..\..\src\Elastic.Ingest.Elasticsearch.CommonSchema\Elastic.Ingest.Elasticsearch.CommonSchema.csproj" />
     <ProjectReference Include="..\Elasticsearch.IntegrationDefaults\Elasticsearch.IntegrationDefaults.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="xunit" Version="2.9.3" />
+  </ItemGroup>
 </Project>
diff --git a/tests-integration/Elastic.NLog.Targets.IntegrationTests/Elastic.NLog.Targets.IntegrationTests.csproj b/tests-integration/Elastic.NLog.Targets.IntegrationTests/Elastic.NLog.Targets.IntegrationTests.csproj
@@ -11,4 +11,8 @@
     <ProjectReference Include="..\Elasticsearch.IntegrationDefaults\Elasticsearch.IntegrationDefaults.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="xunit" Version="2.9.3" />
+  </ItemGroup>
+
 </Project>
diff --git a/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/Elastic.Serilog.Sinks.IntegrationTests.csproj b/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/Elastic.Serilog.Sinks.IntegrationTests.csproj
@@ -9,6 +9,7 @@
   
   <ItemGroup>
     <PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
+    <PackageReference Update="xunit" Version="2.9.3" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogOutputTests.cs b/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogOutputTests.cs
@@ -73,6 +73,9 @@ [I] public async Task AssertLogs()
 
 			var messages = search.Documents.Select(e => e.Message);
 			messages.Should().Contain("Hello Error");
+
+			search.Documents.First().Log.Should().NotBeNull();
+			search.Documents.First().Log!.Level.Should().NotBeNullOrEmpty();
 		}
 	}
 }
diff --git a/tests-integration/Elasticsearch.IntegrationDefaults/Elasticsearch.IntegrationDefaults.csproj b/tests-integration/Elasticsearch.IntegrationDefaults/Elasticsearch.IntegrationDefaults.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.16.2" />
-    <PackageReference Include="Elastic.Elasticsearch.Xunit" Version="0.5.0" />
+    <PackageReference Include="Elastic.Elasticsearch.Xunit" Version="0.6.0" />
     <PackageReference Include="Elastic.Ingest.Elasticsearch" Version="0.10.0" />
 
   </ItemGroup>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -8,6 +8,7 @@
 
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\build\keys\keypair.snk</AssemblyOriginatorKeyFile>
+    <NoWarn>xUnit1041</NoWarn>
   </PropertyGroup>
   <ItemGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(ProjectName), '^(.*)Tests$'))">
 
diff --git a/tests/Elastic.Apm.Disabled.Serilog.Tests/Elastic.Apm.Disabled.Serilog.Tests.csproj b/tests/Elastic.Apm.Disabled.Serilog.Tests/Elastic.Apm.Disabled.Serilog.Tests.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="Moq" Version="4.12.0"/>
     <PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.3"/>
     <PackageReference Include="Serilog.Sinks.InMemory" Version="0.5.0"/>
+    <PackageReference Update="xunit" Version="2.9.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Elastic.Apm.NLog.Tests/Elastic.Apm.NLog.Tests.csproj b/tests/Elastic.Apm.NLog.Tests/Elastic.Apm.NLog.Tests.csproj
@@ -9,6 +9,7 @@
     <PackageReference Include="Moq" Version="4.12.0" />
     <PackageReference Include="NLog" Version="4.7.15" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.7.5" />
+    <PackageReference Update="xunit" Version="2.9.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Elastic.Apm.SerilogEnricher.Tests/Elastic.Apm.SerilogEnricher.Tests.csproj b/tests/Elastic.Apm.SerilogEnricher.Tests/Elastic.Apm.SerilogEnricher.Tests.csproj
@@ -8,6 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.12.0" />
     <PackageReference Include="Serilog.Sinks.InMemory" Version="0.5.0" />
+    <PackageReference Update="xunit" Version="2.9.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Elastic.CommonSchema.Log4net.Tests/Elastic.CommonSchema.Log4net.Tests.csproj b/tests/Elastic.CommonSchema.Log4net.Tests/Elastic.CommonSchema.Log4net.Tests.csproj
@@ -10,4 +10,8 @@
     <ProjectReference Include="..\Elastic.CommonSchema.Tests\Elastic.CommonSchema.Tests.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="xunit" Version="2.9.3" />
+  </ItemGroup>
+
 </Project>
diff --git a/tests/Elastic.CommonSchema.NLog.Tests/Elastic.CommonSchema.NLog.Tests.csproj b/tests/Elastic.CommonSchema.NLog.Tests/Elastic.CommonSchema.NLog.Tests.csproj
@@ -11,6 +11,7 @@
         <PackageReference Include="NLog" Version="4.7.15" />
         <PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
         <PackageReference Include="Elastic.Apm" Version="1.22.0" />
+        <PackageReference Update="xunit" Version="2.9.3" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/tests/Elastic.CommonSchema.Serilog.Tests/Elastic.CommonSchema.Serilog.Tests.csproj b/tests/Elastic.CommonSchema.Serilog.Tests/Elastic.CommonSchema.Serilog.Tests.csproj
@@ -18,6 +18,7 @@
         <PackageReference Include="Serilog.Sinks.TestCorrelator" Version="3.2.0" />
         <PackageReference Include="Serilog.Sinks.XUnit" Version="2.0.4" />
         <PackageReference Include="Elastic.Apm" Version="1.22.0" />
+        <PackageReference Update="xunit" Version="2.9.3" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/tests/Elastic.CommonSchema.Tests/Elastic.CommonSchema.Tests.csproj b/tests/Elastic.CommonSchema.Tests/Elastic.CommonSchema.Tests.csproj
@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
-        <IsPackable>false</IsPackable>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
+  </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\..\src\Elastic.CommonSchema\Elastic.CommonSchema.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Elastic.CommonSchema\Elastic.CommonSchema.csproj"/>
+  </ItemGroup>
 
-    <ItemGroup>
-      <EmbeddedResource Include="Specs\spec.json" />
-      <None Include="Specs\spec_version.txt" />
-    </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Specs\spec.json"/>
+    <None Include="Specs\spec_version.txt"/>
+  </ItemGroup>
 
 </Project>
diff --git a/tests/Elastic.Serilog.Sinks.Tests/Elastic.Serilog.Sinks.Tests.csproj b/tests/Elastic.Serilog.Sinks.Tests/Elastic.Serilog.Sinks.Tests.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1"/>
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2"/>
+    <PackageReference Update="xunit" Version="2.9.3" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,5 @@ private static void WriteTimestamp(Utf8JsonWriter writer, BaseFieldSet value, Js`
`102`	`102`	`/// <summary> A JsonConverter for <see cref="EcsDocument"/> that supports the`
`103`	`103`	`/// https://github.com/elastic/ecs-logging specification`
`104`	`104`	`/// </summary>`
`105`		`- public class EcsDocumentJsonConverter : EcsDocumentJsonConverter<EcsDocument>`
`106`		`- {`
`107`		`- }`
	`105`	`+ public class EcsDocumentJsonConverter : EcsDocumentJsonConverter<EcsDocument>;`
`108`	`106`	`}`