Force W3C activity ids on .NET 4.x

Author: nblumhardt

test/Serilog.Extensions.Logging.Benchmarks/Serilog.Extensions.Logging.Benchmarks.csproj

@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
-    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit" Version="2.5.1" />
     <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
   </ItemGroup>
 

test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.csproj

@@ -4,6 +4,10 @@
     <TargetFrameworks>net7.0;net472</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(TargetFramework) == 'net472' ">
+    <DefineConstants>$(DefineConstants);FORCE_W3C_ACTIVITY_ID</DefineConstants>
+  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.csproj" />
@@ -12,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
-    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit" Version="2.5.1" />
     <PackageReference Include="Shouldly" Version="4.1.0" />
     <PackageReference Include="PublicApiGenerator" Version="11.0.0" />
   </ItemGroup>

test/Serilog.Extensions.Logging.Tests/SerilogLoggerTests.cs

@@ -143,7 +143,7 @@ public void LogsCorrectMessage()
 
         Assert.Equal(3, sink.Writes.Count);
 
-        Assert.Equal(1, sink.Writes[0].Properties.Count);
+        Assert.Single(sink.Writes[0].Properties);
         Assert.Empty(sink.Writes[0].RenderMessage());
 
         Assert.Equal(2, sink.Writes[1].Properties.Count);
@@ -501,6 +501,11 @@ public void Emit(LogEvent logEvent)
     [Fact]
     public void TraceAndSpanIdsAreCaptured()
     {
+#if FORCE_W3C_ACTIVITY_ID
+        Activity.DefaultIdFormat = ActivityIdFormat.W3C;
+        Activity.ForceDefaultIdFormat = true;
+#endif
+
         using var listener = new ActivityListener();
         listener.ShouldListenTo = _ => true;
         listener.Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllData;