System.Diagnostics.Activity Perf Improvement Part 2

src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Activity.cs

@@ -255,9 +255,6 @@ public string? RootId
         /// </summary>
         public IEnumerable<KeyValuePair<string, object?>> TagObjects
         {
-#if ALLOW_PARTIALLY_TRUSTED_CALLERS
-        [System.Security.SecuritySafeCriticalAttribute]
-#endif
             get => _tags ?? s_emptyTagObjects;
         }
 
@@ -1272,9 +1269,10 @@ public void Add(T value)
                 }
             }
 
+            // Note: Some customers use this GetEnumerator dynamically to avoid allocations.
             public Enumerator<T> GetEnumerator() => new Enumerator<T>(_first);
-            IEnumerator<T> IEnumerable<T>.GetEnumerator() => new Enumerator<T>(_first);
-            IEnumerator IEnumerable.GetEnumerator() => new Enumerator<T>(_first);
+            IEnumerator<T> IEnumerable<T>.GetEnumerator() => GetEnumerator();
+            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
         }
 
         private class TagsLinkedList : IEnumerable<KeyValuePair<string, object?>>
@@ -1379,9 +1377,10 @@ public void Set(KeyValuePair<string, object?> value)
                 }
             }
 
+            // Note: Some customers use this GetEnumerator dynamically to avoid allocations.
             public Enumerator<KeyValuePair<string, object?>> GetEnumerator() => new Enumerator<KeyValuePair<string, object?>>(_first);
-            IEnumerator<KeyValuePair<string, object?>> IEnumerable<KeyValuePair<string, object?>>.GetEnumerator() => new Enumerator<KeyValuePair<string, object?>>(_first);
-            IEnumerator IEnumerable.GetEnumerator() => new Enumerator<KeyValuePair<string, object?>>(_first);
+            IEnumerator<KeyValuePair<string, object?>> IEnumerable<KeyValuePair<string, object?>>.GetEnumerator() => GetEnumerator();
+            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
             public IEnumerable<KeyValuePair<string, string?>> EnumerateStringValues()
             {
@@ -1399,6 +1398,11 @@ public void Set(KeyValuePair<string, object?> value)
             }
         }
 
+        /*
+         * Note:
+         *  Some customers use this Enumerator dynamically to avoid allocations.
+         *  See: https://github.com/dotnet/runtime/pull/40362
+         */
         private struct Enumerator<T> : IEnumerator<T>
         {
             private readonly LinkedListNode<T>? _head;

src/libraries/System.Diagnostics.DiagnosticSource/tests/ActivityTests.cs

@@ -1508,6 +1508,54 @@ public void TestInsertingFirstTag(string key, object value, bool add, int result
             Assert.Equal(resultCount, a.TagObjects.Count());
         }
 
+        [Fact]
+        public void StructEnumerator_TagsLinkedList()
+        {
+            /*
+             * This test verifies the presence of the struct Enumerator on TagsLinkedList used by customers dynamically to avoid allocations.
+             */
+            Activity a = new Activity("TestActivity");
+            a.AddTag("Tag1", true);
+
+            IEnumerable<KeyValuePair<string, object>> enumerable = a.TagObjects;
+
+            bool foundGetEnumerator = false;
+            foreach (MethodInfo method in enumerable.GetType().GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic))
+            {
+                if(method.Name == "GetEnumerator" && !method.ReturnType.IsInterface && method.ReturnType.IsValueType)
+                {
+                    foundGetEnumerator = true;
+                    break;
+                }
+            }
+
+            Assert.True(foundGetEnumerator);
+        }
+
+        [Fact]
+        public void StructEnumerator_GenericLinkedList()
+        {
+            /*
+             * This test verifies the presence of the struct Enumerator on LinkedList<T> used by customers dynamically to avoid allocations.
+             */
+            Activity a = new Activity("TestActivity");
+            a.AddEvent(new ActivityEvent());
+
+            IEnumerable<ActivityEvent> enumerable = a.Events;
+
+            bool foundGetEnumerator = false;
+            foreach (MethodInfo method in enumerable.GetType().GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic))
+            {
+                if (method.Name == "GetEnumerator" && !method.ReturnType.IsInterface && method.ReturnType.IsValueType)
+                {
+                    foundGetEnumerator = true;
+                    break;
+                }
+            }
+
+            Assert.True(foundGetEnumerator);
+        }
+
         public void Dispose()
         {
             Activity.Current = null;