Fix Getting default parent span Id with root Parent (#42483)

dotnet · Sep 19, 2020 · 2269b06 · 2269b06
1 parent 63c3dd1
commit 2269b06
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs
@@ -949,7 +949,12 @@ internal static Activity CreateAndStart(ActivitySource source, string name, Acti
             else if (parentContext != default)
             {
                 activity._traceId = parentContext.TraceId.ToString();
-                activity._parentSpanId = parentContext.SpanId.ToString();
+
+                if (parentContext.SpanId != default)
+                {
+                    activity._parentSpanId = parentContext.SpanId.ToString();
+                }
+
                 activity.ActivityTraceFlags = parentContext.TraceFlags;
                 activity._traceState = parentContext.TraceState;
             }

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivitySourceTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivitySourceTests.cs
@@ -556,8 +556,9 @@ public void TestTraceIdAutoGenerationWithNullParentId()
                 Assert.NotNull(activity);
                 Assert.NotEqual(default, ctx);
                 Assert.Equal(ctx.TraceId, activity.TraceId);
-                Assert.Equal(ctx.SpanId.ToHexString(), activity.ParentSpanId.ToHexString());
-                Assert.Equal(default(ActivitySpanId).ToHexString(), ctx.SpanId.ToHexString());
+                Assert.Equal(ctx.SpanId, activity.ParentSpanId);
+                Assert.Equal(default(ActivitySpanId), activity.ParentSpanId);
+                Assert.Equal(default(ActivitySpanId), ctx.SpanId);
             }).Dispose();
         }