Version 5.2.2 (#139)

Author: snakefoot

appveyor.yml

@@ -14,6 +14,6 @@ artifacts:
 deploy:
 - provider: NuGet
   api_key:
-    secure: ACKSV1ixxNpO+2k8KvNDy6hd9QmR8lkQmKn773ZIIeVpG0ywYUhY4j8LcyykVR1a
+    secure: f6oWebyOFLpuuo2PMd6xgoxwMq+JvXVUmPyBme89zS7UF0zcvLYPSKN/p6B/KaMs
   on:
     branch: master

src/NLog.DiagnosticSource/LayoutRenderers/ActivityExtensions.cs

@@ -7,8 +7,8 @@ namespace NLog.LayoutRenderers
     /// </summary>
     internal static class ActivityExtensions
     {
-        private static readonly System.Diagnostics.ActivitySpanId EmptySpanId = default(System.Diagnostics.ActivitySpanId);
-        private static readonly System.Diagnostics.ActivityTraceId EmptyTraceId = default(System.Diagnostics.ActivityTraceId);
+        private static readonly string EmptySpanIdToHexString = default(System.Diagnostics.ActivitySpanId).ToHexString();
+        private static readonly string EmptyTraceIdToHexString = default(System.Diagnostics.ActivityTraceId).ToHexString();
 
         public static string GetSpanId(this Activity activity)
         {
@@ -33,18 +33,20 @@ public static string GetParentId(this Activity activity)
 
         private static string SpanIdToHexString(ActivitySpanId spanId)
         {
-            if (EmptySpanId.Equals(spanId))
+            var spanIdString = spanId.ToHexString();
+            if (ReferenceEquals(EmptySpanIdToHexString, spanIdString))
                 return string.Empty;
             else
-                return spanId.ToHexString();
+                return spanIdString;
         }
 
         private static string TraceIdToHexString(ActivityTraceId traceId)
         {
-            if (EmptyTraceId.Equals(traceId))
+            var traceIdString = traceId.ToHexString();
+            if (ReferenceEquals(EmptyTraceIdToHexString, traceIdString))
                 return string.Empty;
             else
-                return traceId.ToHexString();
+                return traceIdString;
         }
     }
 }

src/NLog.DiagnosticSource/NLog.DiagnosticSource.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net6.0;net462;netstandard2.0</TargetFrameworks>
     <RootNamespace>NLog</RootNamespace>
-    <VersionPrefix>5.2.1</VersionPrefix>
+    <VersionPrefix>5.2.2</VersionPrefix>
     <VersionSuffix></VersionSuffix>
 
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
@@ -25,7 +25,9 @@
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>
-- Added NET8 as target-platform
+- Added support for property Status (Ok / Error) (@banko6)
+- Added support for property StatusDescription (@banko6)
+- Translate default TraceId / SpanId to empty string (@snakefoot)
 
 See https://github.com/NLog/NLog.DiagnosticSource for documentation of ${activity} and DiagnosticListenerTarget
     </PackageReleaseNotes>

test/NLog.DiagnosticSource.Tests/ActivityTraceLayoutRendererTests.cs

@@ -50,6 +50,8 @@ public void TestAllPropertiesWhenActivityNull()
         [InlineData(ActivityTraceProperty.SourceName, true)]
         [InlineData(ActivityTraceProperty.SourceVersion, true)]
         [InlineData(ActivityTraceProperty.ActivityKind, true)]
+        [InlineData(ActivityTraceProperty.Status, true)]
+        [InlineData(ActivityTraceProperty.StatusDescription, true)]
         public void TestAllPropertiesWhenActivityEmpty(ActivityTraceProperty property, bool empty)
         {
             bool orgThrowExceptions = LogManager.ThrowExceptions;
@@ -99,6 +101,11 @@ public void TestAllPropertiesWhenActivityEmpty(ActivityTraceProperty property, b
         [InlineData(ActivityTraceProperty.ActivityKind, "d", "0")]
         [InlineData(ActivityTraceProperty.ActivityKind, "D", "0")]
         [InlineData(ActivityTraceProperty.ActivityKind, "X", "00000000")]
+        [InlineData(ActivityTraceProperty.Status, null, "")]
+        [InlineData(ActivityTraceProperty.Status, "d", "0")]
+        [InlineData(ActivityTraceProperty.Status, "D", "0")]
+        [InlineData(ActivityTraceProperty.Status, "X", "00000000")]
+        [InlineData(ActivityTraceProperty.StatusDescription, null, "")]
         public void TestAllPropertiesWhenActivityRunning(ActivityTraceProperty property, string format, string output)
         {
             bool orgThrowExceptions = LogManager.ThrowExceptions;

test/NLog.DiagnosticSource.Tests/NLog.DiagnosticSource.Tests.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>