Restored ActivityListener in ActivityTraceListenerManager so stopped Activity objects are collected again.

Author: CodeBlanch

ClassLibraries/Macross.OpenTelemetry.Extensions/Code/ActivityTraceListenerManager.cs

@@ -25,6 +25,7 @@ public class ActivityTraceListenerManager : IDisposable
 		private readonly IDisposable _OptionsChangeToken;
 		private ActivityTraceListenerManagerOptions? _Options;
 		private Thread? _CleanupThread;
+		private ActivityListener? _ActivityListener;
 		private bool _HasInitialized;
 		private long _LastRequestedListenerDateTimeBinary;
 
@@ -120,10 +121,17 @@ protected virtual void Dispose(bool isDisposing)
 			{
 				_OptionsChangeToken.Dispose();
 				_StopHandle.Dispose();
+				_ActivityListener?.Dispose();
 				_ActivityTraceListenerSampler.ActivityTraceListenerManager = null;
 			}
 		}
 
+		private void OnActivityStopped(Activity activity)
+		{
+			if (_TraceListeners.TryGetValue(activity.TraceId, out TraceListener? listener))
+				listener.Add(activity);
+		}
+
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		private void EnsureInitialized()
 		{
@@ -141,6 +149,15 @@ private void EnsureInitialized()
 				};
 				_CleanupThread.Start();
 
+				// Watch out doing this in prod, it's expensive.
+				_ActivityListener = new ActivityListener
+				{
+					ShouldListenTo = source => true, // Listens to all sources.
+					Sample = (ref ActivityCreationOptions<ActivityContext> options) => ActivitySamplingResult.None, // Let OpenTelemetry handle the sampling.
+					ActivityStopped = OnActivityStopped
+				};
+				ActivitySource.AddActivityListener(_ActivityListener);
+
 				_ActivityTraceListenerSampler.ActivityTraceListenerManager = this;
 
 				_HasInitialized = true;
@@ -164,6 +181,8 @@ private void CleanupThreadBody()
 					{
 						_HasInitialized = false;
 						_ActivityTraceListenerSampler.ActivityTraceListenerManager = null;
+						_ActivityListener?.Dispose();
+						_ActivityListener = null;
 					}
 
 					_Options.ClosedAction?.Invoke();

ClassLibraries/Macross.OpenTelemetry.Extensions/Code/Macross.OpenTelemetry.Extensions.csproj

@@ -24,7 +24,7 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>beta4</VersionSuffix>
+    <VersionSuffix>beta5</VersionSuffix>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <PackageProjectUrl>https://github.com/Macross-Software/core/tree/develop/ClassLibraries/Macross.OpenTelemetry.Extensions</PackageProjectUrl>
   </PropertyGroup>

ClassLibraries/Macross.OpenTelemetry.Extensions/Code/Properties/AssemblyInfo.cs

@@ -10,4 +10,4 @@
 
 [assembly: InternalsVisibleTo("Macross.OpenTelemetry.Extensions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1a4dad5605af5f97a39e67571c3a03a6762442db77512795feb38f00db953d7ec222951dd58cd511610c902b73577beb10f1bc868b539a3d1593ae2037524dbb116e7f137a3bfc8d0c9ad7c2e6ea5bb68a86b5fed17516d6678fd9b899e371a14ea4daca38722b8ca030480c69a418b92f5704b1e2a925e213ef9039b2420e7")]
 
-[assembly: AssemblyVersion("1.0.0.21090")]
+[assembly: AssemblyVersion("1.0.0.21229")]

ClassLibraries/Macross.OpenTelemetry.Extensions/Test/ActivityTraceListenerManagerTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Linq;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -63,13 +64,17 @@ public void ActivityNotSampledWithoutRegistration()
 		[TestMethod]
 		public void ActivitySampledWithRegistration()
 		{
-			using (IDisposable registration = _ActivityTraceListenerManager.RegisterTraceListener(_ActivityContext.TraceId))
+			using (IActivityTraceListener registration = _ActivityTraceListenerManager.RegisterTraceListener(_ActivityContext.TraceId))
 			{
 				Activity? activity = _ActivitySource.StartActivity("Test", ActivityKind.Server, _ActivityContext);
 
 				Assert.IsNotNull(activity);
 				Assert.IsTrue(activity.IsAllDataRequested);
 				Assert.IsTrue(activity.Recorded);
+
+				activity.Stop();
+
+				Assert.IsTrue(registration.CompletedActivities.Contains(activity));
 			}
 
 			ActivityNotSampledWithoutRegistration();

ClassLibraries/Macross.OpenTelemetry.Extensions/Test/Properties/AssemblyInfo.cs

@@ -7,4 +7,4 @@
 
 [assembly: Guid("beb815de-41a4-4cfe-80eb-a5a1d64559c5")]
 
-[assembly: AssemblyVersion("0.0.0.21090")]
+[assembly: AssemblyVersion("0.0.0.21229")]