From 61f8837c4081094e995f91845f288571509d65f0 Mon Sep 17 00:00:00 2001
From: Stanislav Perekrestov <sperekrestov@dmvdesk.com>
Date: Thu, 14 Mar 2024 17:11:20 +0100
Subject: [PATCH] propagates current trace and span ids. Closes #67

Serilog starting from v3.1.0 adds two new first-class properties to LogEvent: TraceId and SpanId. These are set automatically in Logger.Write() to the corresponding property values from System.Diagnostics.Activity.Current.
---
 .../GoogleCloudLoggingSink.cs                  | 18 ++++++++++++------
 .../Serilog.Sinks.GoogleCloudLogging.csproj    | 11 ++++++-----
 src/TestWeb/TestWeb.csproj                     |  8 ++++----
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/Serilog.Sinks.GoogleCloudLogging/GoogleCloudLoggingSink.cs b/src/Serilog.Sinks.GoogleCloudLogging/GoogleCloudLoggingSink.cs
index e7ab9ef..e5e2fad 100644
--- a/src/Serilog.Sinks.GoogleCloudLogging/GoogleCloudLoggingSink.cs
+++ b/src/Serilog.Sinks.GoogleCloudLogging/GoogleCloudLoggingSink.cs
@@ -104,6 +104,18 @@ private LogEntry CreateLogEntry(LogEvent evnt, StringWriter writer)
             HandleSpecialProperty(log, property.Key, property.Value);
         }
 
+        if (_sinkOptions.UseLogCorrelation)
+        {
+            if (evnt.TraceId.ToString() is { Length: > 0 } traceId)
+            {
+                log.Trace = $"projects/{_projectId}/traces/{traceId}";
+            }
+            if (evnt.SpanId?.ToString() is { Length: > 0 } spanId)
+            {
+                log.SpanId = spanId;
+            }
+        }
+
         if (_serviceContext != null)
             jsonPayload.Fields.Add("serviceContext", Value.ForStruct(_serviceContext));
 
@@ -119,12 +131,6 @@ private void HandleSpecialProperty(LogEntry log, string key, LogEventPropertyVal
 
         if (_sinkOptions.UseLogCorrelation)
         {
-            if (key.Equals("TraceId", StringComparison.OrdinalIgnoreCase))
-                log.Trace = $"projects/{_projectId}/traces/{GetString(value)}";
-
-            if (key.Equals("SpanId", StringComparison.OrdinalIgnoreCase))
-                log.SpanId = GetString(value);
-
             if (key.Equals("TraceSampled", StringComparison.OrdinalIgnoreCase))
                 log.TraceSampled = GetBoolean(value);
         }
diff --git a/src/Serilog.Sinks.GoogleCloudLogging/Serilog.Sinks.GoogleCloudLogging.csproj b/src/Serilog.Sinks.GoogleCloudLogging/Serilog.Sinks.GoogleCloudLogging.csproj
index c2e8fcc..ac7eb9b 100644
--- a/src/Serilog.Sinks.GoogleCloudLogging/Serilog.Sinks.GoogleCloudLogging.csproj
+++ b/src/Serilog.Sinks.GoogleCloudLogging/Serilog.Sinks.GoogleCloudLogging.csproj
@@ -18,7 +18,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <TargetFrameworks>net6.0;net5.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netstandard2.1</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -29,14 +29,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Cloud.Logging.V2" Version="4.0.0" />
+    <PackageReference Include="Google.Cloud.Logging.V2" Version="4.2.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.3.1" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="3.1.0" />
+    <PackageReference Condition="'$(TargetFramework)' == 'net6.0'" Include="System.Text.Encodings.Web" Version="6.0.0" />
+    <PackageReference Condition="'$(TargetFramework)' != 'net6.0'" Include="System.Text.Encodings.Web" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TestWeb/TestWeb.csproj b/src/TestWeb/TestWeb.csproj
index f6bee1d..e912a38 100644
--- a/src/TestWeb/TestWeb.csproj
+++ b/src/TestWeb/TestWeb.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>default</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>