Logging improvements

Author: niemyjski

src/Foundatio.TestHarness/Messaging/MessageBusTestBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -49,13 +49,15 @@ public virtual async Task CanUseMessageOptionsAsync()
             {
                 ShouldListenTo = s => s.Name == FoundatioDiagnostics.ActivitySource.Name,
                 Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllDataAndRecorded,
-                ActivityStarted = activity => _logger.LogInformation("Start: " + activity.DisplayName),
-                ActivityStopped = activity => _logger.LogInformation("Stop: " + activity.DisplayName)
+                ActivityStarted = activity => _logger.LogInformation("Start: {ActivityDisplayName}", activity.DisplayName),
+                ActivityStopped = activity => _logger.LogInformation("Stop: {ActivityDisplayName}", activity.DisplayName),
             };
 
             ActivitySource.AddActivityListener(listener);
 
             using var activity = FoundatioDiagnostics.ActivitySource.StartActivity("Parent");
+            Assert.NotNull(activity);
+            Assert.NotNull(Activity.Current);
             Assert.Equal(Activity.Current, activity);
 
             var countdown = new AsyncCountdownEvent(1);

src/Foundatio.TestHarness/Utility/InMemoryMetrics.cs

@@ -27,7 +27,10 @@ public class InMemoryMetrics : IDisposable
     private readonly AsyncAutoResetEvent _measurementEvent = new(false);
     private readonly ILogger _logger;
 
-    public InMemoryMetrics(string metricNameOrPrefix, ILogger logger, int maxMeasurementCountPerType = 100000) : this(n => n.StartsWith(metricNameOrPrefix), logger, maxMeasurementCountPerType) { }
+    public InMemoryMetrics(string metricNameOrPrefix, ILogger logger, int maxMeasurementCountPerType = 100000) : this(
+        n => n.StartsWith(metricNameOrPrefix), logger, maxMeasurementCountPerType)
+    {
+    }
 
     public InMemoryMetrics(Func<string, bool> shouldCollect, ILogger logger, int maxMeasurementCountPerType = 100000)
     {
@@ -102,6 +105,7 @@ public InMemoryMetrics(Func<string, bool> shouldCollect, ILogger logger, int max
 
     public void RecordObservableInstruments()
     {
+        _logger.LogTrace("Recording observable instruments");
         _meterListener.RecordObservableInstruments();
     }
 

src/Foundatio/Lock/ThrottlingLockProvider.cs

@@ -50,7 +50,7 @@ public async Task<ILock> AcquireAsync(string resource, TimeSpan? timeUntilExpire
             try
             {
                 _logger.LogTrace("Current time: {CurrentTime} throttle: {ThrottlingPeriod} key: {Key}", _timeProvider.GetUtcNow().ToString("mm:ss.fff"), _timeProvider.GetUtcNow().UtcDateTime.Floor(_throttlingPeriod).ToString("mm:ss.fff"), cacheKey);
-                var hitCount = await _cacheClient.GetAsync<long?>(cacheKey, 0).AnyContext();
+                long? hitCount = await _cacheClient.GetAsync<long?>(cacheKey, 0).AnyContext();
 
                 _logger.LogTrace("Current hit count: {HitCount} max: {MaxHitsPerPeriod}", hitCount, _maxHitsPerPeriod);
                 if (hitCount <= _maxHitsPerPeriod - 1)
@@ -64,11 +64,11 @@ public async Task<ILock> AcquireAsync(string resource, TimeSpan? timeUntilExpire
                         break;
                     }
 
-                    _logger.LogTrace("Max hits exceeded after increment for {Resource}.", resource);
+                    _logger.LogTrace("Max hits exceeded after increment for {Resource}", resource);
                 }
                 else
                 {
-                    _logger.LogTrace("Max hits exceeded for {Resource}.", resource);
+                    _logger.LogTrace("Max hits exceeded for {Resource}", resource);
                 }
 
                 if (cancellationToken.IsCancellationRequested)

src/Foundatio/Queues/InMemoryQueue.cs

@@ -352,7 +352,7 @@ protected override Task<IEnumerable<T>> GetDeadletterItemsImplAsync(Cancellation
 
     public override Task DeleteQueueAsync()
     {
-        _logger.LogTrace("Deleting queue: {QueueName}", _options.Name);
+        _logger.LogTrace("Deleting queue: {QueueName} ({QueueId})", _options.Name, QueueId);
 
         _queue.Clear();
         _deadletterQueue.Clear();