Merge pull request #112 from serilog-contrib/dev

add trace and span id support

Author: pwelter34

.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "01:00"   
+  open-pull-requests-limit: 10
+
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "02:00"
+  open-pull-requests-limit: 10

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

README.md

@@ -160,6 +160,9 @@ public static class Program
 
 ### Change Log
 
+9.1.0
+  * Add: Built-in trace and span id support
+
 9.0.0
   * Breaking: Due to issue with creating provides from configuration
     * `IDocumentFactory.Create` add AzureTableStorageSinkOptions and IKeyGenerator arguments

samples/SampleConsoleApplication/SampleConsoleApplication.csproj

@@ -23,8 +23,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
-    <PackageReference Include="Serilog.sinks.Console" Version="4.1.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
+    <PackageReference Include="Serilog.sinks.Console" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

serilog-sinks-azuretablestorage.sln

@@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Artifacts", "Artifacts", "{
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		.github\workflows\build.yml = .github\workflows\build.yml
-		CHANGES.md = CHANGES.md
 		README.md = README.md
 	EndProjectSection
 EndProject
@@ -19,7 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{18BA
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebApplication", "samples\SampleWebApplication\SampleWebApplication.csproj", "{420A3E41-C520-420D-95E6-24CF86BF7477}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleConsoleApplication", "samples\SampleConsoleApplication\SampleConsoleApplication.csproj", "{2F82E3DC-7071-41AD-A1E9-9CB70CF27CDA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleConsoleApplication", "samples\SampleConsoleApplication\SampleConsoleApplication.csproj", "{2F82E3DC-7071-41AD-A1E9-9CB70CF27CDA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Serilog.Sinks.AzureTableStorage/Serilog.Sinks.AzureTableStorage.csproj

@@ -42,9 +42,9 @@
 
   <ItemGroup>
     <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
-    <PackageReference Include="Serilog" Version="3.0.1" />
+    <PackageReference Include="Serilog" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="3.1.0" />
-    <PackageReference Include="Azure.Data.Tables" Version="12.8.0" />
+    <PackageReference Include="Azure.Data.Tables" Version="12.8.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 </Project>

src/Serilog.Sinks.AzureTableStorage/Sinks/AzureTableStorage/DefaultDocumentFactory.cs

@@ -47,6 +47,11 @@ public virtual TableEntity Create(LogEvent logEvent, AzureTableStorageSinkOption
         tableEntity["MessageTemplate"] = logEvent.MessageTemplate.Text;
         tableEntity["RenderedMessage"] = logEvent.RenderMessage(options.FormatProvider);
 
+        if (logEvent.TraceId != null)
+            tableEntity["TraceId"] = logEvent.TraceId.Value.ToHexString();
+
+        if (logEvent.SpanId != null)
+            tableEntity["SpanId"] = logEvent.SpanId.Value.ToHexString();
 
         if (logEvent.Exception != null)
             tableEntity["Exception"] = logEvent.Exception.ToString();

test/Serilog.Sinks.AzureTableStorage.Tests/Serilog.Sinks.AzureTableStorage.Tests.csproj

@@ -13,12 +13,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit" Version="2.6.1" />
   </ItemGroup>
 
 </Project>