Disallow setting Parent on the started Activity (#81394)

Fixes https://github.com/dotnet/runtime/issues/81371

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/Resources/Strings.resx b/src/libraries/System.Diagnostics.DiagnosticSource/src/Resources/Strings.resx
index f57c9d3a7b872353204cf034df71adebcaf6e8d2..93a345d4a979a2956448e5e6cf9d847392bd32e4 100644 (file)
--- a/src/libraries/System.Diagnostics.DiagnosticSource/src/Resources/Strings.resx
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/Resources/Strings.resx
@@ -129,6 +129,9 @@
   <data name="ActivityStartAlreadyStarted" xml:space="preserve">
     <value>"Can not start an Activity that was already started"</value>
   </data>
+  <data name="ActivitySetParentAlreadyStarted" xml:space="preserve">
+    <value>"Can not set parent on already started Activity"</value>
+  </data>
   <data name="EndTimeNotUtc" xml:space="preserve">
     <value>"EndTime is not UTC"</value>
   </data>

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs
index 581d710fba4ae79f9390df52eba3733efb0c78ab..68c3445244571397c4c2ee5c798b294ee91d653f 100644 (file)
--- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs
@@ -564,7 +564,12 @@ namespace System.Diagnostics
         /// <param name="parentId">The id of the parent operation.</param>
         public Activity SetParentId(string parentId)
         {
-            if (Parent != null)
+            if (_id != null || _spanId != null)
+            {
+                // Cannot set the parent on already started Activity.
+                NotifyError(new InvalidOperationException(SR.ActivitySetParentAlreadyStarted));
+            }
+            else if (Parent != null)
             {
                 NotifyError(new InvalidOperationException(SR.SetParentIdOnActivityWithParent));
             }
@@ -589,7 +594,12 @@ namespace System.Diagnostics
         /// </summary>
         public Activity SetParentId(ActivityTraceId traceId, ActivitySpanId spanId, ActivityTraceFlags activityTraceFlags = ActivityTraceFlags.None)
         {
-            if (Parent != null)
+            if (_id != null || _spanId != null)
+            {
+                // Cannot set the parent on already started Activity.
+                NotifyError(new InvalidOperationException(SR.ActivitySetParentAlreadyStarted));
+            }
+            else if (Parent != null)
             {
                 NotifyError(new InvalidOperationException(SR.SetParentIdOnActivityWithParent));
             }

diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs b/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs
index 066f17f4b4c4753699c966695bb24d866db7244d..ae3c138e369714abff815d3c9f6c46837aa26b3e 100644 (file)
--- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs
@@ -239,7 +239,23 @@ namespace System.Diagnostics.Tests
         [Fact]
         public void SetParentId()
         {
-            var parent = new Activity("parent");
+            using (var a = new Activity("foo"))
+            {
+                a.Start();
+                string parentId = a.ParentId;
+                a.SetParentId("00-6e76af18746bae4eadc3581338bbe8b1-2899ebfdbdce904b-00"); // Error does nothing
+                Assert.Equal(parentId, a.ParentId);
+            }
+
+            using (var a = new Activity("foo"))
+            {
+                a.Start();
+                string parentId = a.ParentId;
+                a.SetParentId(ActivityTraceId.CreateRandom(), ActivitySpanId.CreateRandom()); // Nothing will happen
+                Assert.Equal(parentId, a.ParentId);
+            }
+
+            using var parent = new Activity("parent");
             parent.SetParentId(null);  // Error does nothing
             Assert.Null(parent.ParentId);
 
@@ -255,7 +271,7 @@ namespace System.Diagnostics.Tests
             Assert.Equal(parent.ParentId, parent.RootId);
             parent.Start();
 
-            var child = new Activity("child");
+            using var child = new Activity("child");
             child.Start();
 
             Assert.Equal(parent.Id, child.ParentId);
@@ -730,7 +746,7 @@ namespace System.Diagnostics.Tests
         [Fact]
         public void IdFormat_W3CWhenTraceIdAndSpanIdProvided()
         {
-            Activity activity = new Activity("activity3");
+            using Activity activity = new Activity("activity3");
             ActivityTraceId activityTraceId = ActivityTraceId.CreateRandom();
             activity.SetParentId(activityTraceId, ActivitySpanId.CreateRandom());
             activity.Start();