Change to use ActivitySource

FoundatioFx · Apr 12, 2021 · 65cbca0 · 65cbca0
1 parent 182bbf6
commit 65cbca0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 74 deletions.
diff --git a/src/Foundatio.TestHarness/Queue/QueueTestBase.cs b/src/Foundatio.TestHarness/Queue/QueueTestBase.cs
@@ -9,7 +9,6 @@
 using Foundatio.Queues;
 using Foundatio.Tests.Extensions;
 using Foundatio.Utility;
-using Foundatio.Diagnostics;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -90,7 +89,14 @@ public virtual async Task CanUseQueueOptionsAsync() {
                 return;
 
             try {
-                QueuesDiagnosticSource.ListenToProcessQueueEntry(o => _logger.LogInformation("OnStart"), o => _logger.LogInformation("OnStop"));
+                using var listener = new ActivityListener {
+                    ShouldListenTo = s => s.Name == "Foundatio",
+                    Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllData,
+                    ActivityStarted = activity => _logger.LogInformation("Start: " + activity.DisplayName),
+                    ActivityStopped = activity => _logger.LogInformation("Stop: " + activity.DisplayName)
+                };
+
+                ActivitySource.AddActivityListener(listener);
 
                 await queue.DeleteQueueAsync();
                 await AssertEmptyQueueAsync(queue);

diff --git a/src/Foundatio/Queues/QueueBase.cs b/src/Foundatio/Queues/QueueBase.cs
@@ -1,10 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Foundatio.Diagnostics;
 using Foundatio.Serializer;
 using Foundatio.Utility;
 using Microsoft.Extensions.Logging;
@@ -123,16 +122,15 @@ protected virtual Task OnEnqueuedAsync(IQueueEntry<T> entry) {
         public AsyncEvent<DequeuedEventArgs<T>> Dequeued { get; } = new AsyncEvent<DequeuedEventArgs<T>>(true);
 
         protected virtual void StartProcessQueueEntryActivity(IQueueEntry<T> entry) {
-            if (!QueuesDiagnosticSource.Logger.IsEnabled("ProcessQueueEntry") || !QueuesDiagnosticSource.Logger.IsEnabled("ProcessQueueEntry", entry))
+            var activity = FoundatioDiagnostics.ActivitySource.StartActivity("ProcessQueueEntry", ActivityKind.Internal);
+            if (activity == null)
                 return;
 
-            var activity = new Activity("ProcessQueueEntry");
             activity.AddTag("Id", entry.Id);
             if (!String.IsNullOrEmpty(entry.CorrelationId))
                 activity.SetParentId(entry.CorrelationId);
 
             EnrichProcessQueueEntryActivity(activity, entry);
-            QueuesDiagnosticSource.Logger.StartActivity(activity, entry);
 
             entry.Properties["@Activity"] = activity;
         }
@@ -144,7 +142,7 @@ protected virtual void StopProcessQueueEntryActivity(IQueueEntry<T> entry) {
                 return;
 
             entry.Properties.Remove("@Activity");
-            QueuesDiagnosticSource.Logger.StopActivity(activity, entry);
+            activity.Stop();
         }
 
         protected virtual Task OnDequeuedAsync(IQueueEntry<T> entry) {

diff --git a/src/Foundatio/Utility/DiagnosticActivityListener.cs b/src/Foundatio/Utility/DiagnosticActivityListener.cs
diff --git a/src/Foundatio/Utility/DiagnosticActivitySubscriber.cs b/src/Foundatio/Utility/DiagnosticActivitySubscriber.cs
diff --git a/src/Foundatio/Utility/FoundatioDiagnosticSource.cs b/src/Foundatio/Utility/FoundatioDiagnosticSource.cs
diff --git a/src/Foundatio/Utility/FoundatioDiagnostics.cs b/src/Foundatio/Utility/FoundatioDiagnostics.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace Foundatio {
+    internal static class FoundatioDiagnostics {
+        private static readonly AssemblyName AssemblyName = typeof(FoundatioDiagnostics).Assembly.GetName();
+        internal static readonly ActivitySource ActivitySource = new(AssemblyName.Name, AssemblyName.Version.ToString());
+    }
+}