Make ActivityRecorder more threadsafe (#104888)

dotnet · Jul 15, 2024 · a20847d · a20847d
1 parent 06c8a3c
commit a20847d
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/src/libraries/Common/tests/System/Net/ActivityRecorder.cs b/src/libraries/Common/tests/System/Net/ActivityRecorder.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using Xunit;
 
 namespace System.Net.Test.Common
@@ -17,12 +18,16 @@ internal class ActivityRecorder : IDisposable
         private readonly ActivityListener _listener;
         private List<Activity> _finishedActivities = new();
 
+        private int _started;
+        private int _stopped;
+
+        public int Started => _started;
+        public int Stopped => _stopped;
+
         public Predicate<Activity> Filter { get; set; } = _ => true;
         public bool VerifyParent { get; set; } = true;
         public Activity ExpectedParent { get; set; }
 
-        public int Started { get; private set; }
-        public int Stopped { get; private set; }
         public Activity LastStartedActivity { get; private set; }
         public Activity LastFinishedActivity { get; private set; }
         public IEnumerable<Activity> FinishedActivities => _finishedActivities;
@@ -35,34 +40,41 @@ public ActivityRecorder(string activitySourceName, string activityName)
             {
                 ShouldListenTo = (activitySource) => activitySource.Name == _activitySourceName,
                 Sample = (ref ActivityCreationOptions<ActivityContext> options) => ActivitySamplingResult.AllData,
-                ActivityStarted = (activity) => {
+                ActivityStarted = (activity) =>
+                {
                     if (activity.OperationName == _activityName && Filter(activity))
                     {
                         if (VerifyParent)
                         {
                             Assert.Same(ExpectedParent, activity.Parent);
                         }
 
-                        Started++;
+                        Interlocked.Increment(ref _started);
+
                         LastStartedActivity = activity;
                     }
                 },
-                ActivityStopped = (activity) => {
+                ActivityStopped = (activity) =>
+                {
                     if (activity.OperationName == _activityName && Filter(activity))
                     {
                         if (VerifyParent)
                         {
                             Assert.Same(ExpectedParent, activity.Parent);
                         }
 
-                        Stopped++;
-                        LastFinishedActivity = activity;
-                        _finishedActivities.Add(activity);
+                        Interlocked.Increment(ref _stopped);
+
+                        lock (_finishedActivities)
+                        {
+                            LastFinishedActivity = activity;
+                            _finishedActivities.Add(activity);
+                        }
                     }
                 }
             };
 
-            ActivitySource.AddActivityListener(_listener);   
+            ActivitySource.AddActivityListener(_listener);
         }
 
         public void Dispose() => _listener.Dispose();