Convert ServiceControl loggers to Microsoft.Extensions.Logging

src/Directory.Packages.props

@@ -63,6 +63,7 @@
     <PackageVersion Include="PublicApiGenerator" Version="11.4.6" />
     <PackageVersion Include="RavenDB.Embedded" Version="6.2.5" />
     <PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
+    <PackageVersion Include="Seq.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="ServiceControl.Contracts" Version="5.0.0" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
     <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
@@ -91,4 +92,4 @@
     <GlobalPackageReference Include="Microsoft.Build.CopyOnWrite" Version="1.0.334" />
     <GlobalPackageReference Include="Particular.Packaging" Version="4.2.2" />
   </ItemGroup>
-</Project>
+</Project>

src/ServiceControl.Audit.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs

@@ -98,7 +98,7 @@ async Task InitializeServiceControl(ScenarioContext context)
 
             using (new DiagnosticTimer($"Creating infrastructure for {instanceName}"))
             {
-                var setupCommand = new SetupCommand();
+                var setupCommand = new SetupCommand(LoggerUtil.CreateStaticLogger<SetupCommand>());
                 await setupCommand.Execute(new HostArguments([]), settings);
             }
 

src/ServiceControl.Audit.UnitTests/Infrastructure/When_instance_is_setup.cs

@@ -12,6 +12,7 @@
     using NServiceBus;
     using NServiceBus.Transport;
     using NUnit.Framework;
+    using ServiceControl.Infrastructure;
     using Transports;
 
     class When_instance_is_setup
@@ -41,7 +42,7 @@ public async Task Should_provision_queues()
                 AssemblyLoadContextResolver = static _ => AssemblyLoadContext.Default
             };
 
-            var setupCommand = new SetupCommand();
+            var setupCommand = new SetupCommand(LoggerUtil.CreateStaticLogger<SetupCommand>());
             await setupCommand.Execute(new HostArguments([]), settings);
 
             Assert.That(FakeTransport.QueuesCreated, Is.EquivalentTo(new[]

src/ServiceControl.Audit/Auditing/AuditIngestion.cs

@@ -8,8 +8,8 @@
     using Infrastructure.Settings;
     using Metrics;
     using Microsoft.Extensions.Hosting;
+    using Microsoft.Extensions.Logging;
     using NServiceBus;
-    using NServiceBus.Logging;
     using NServiceBus.Transport;
     using Persistence;
     using Persistence.UnitOfWork;
@@ -27,7 +27,8 @@ public AuditIngestion(
             AuditIngestor auditIngestor,
             IAuditIngestionUnitOfWorkFactory unitOfWorkFactory,
             IHostApplicationLifetime applicationLifetime,
-            IngestionMetrics metrics
+            IngestionMetrics metrics,
+            ILogger<AuditIngestion> logger
         )
         {
             inputEndpoint = settings.AuditQueue;
@@ -38,7 +39,7 @@ IngestionMetrics metrics
             this.settings = settings;
             this.applicationLifetime = applicationLifetime;
             this.metrics = metrics;
-
+            this.logger = logger;
             if (!transportSettings.MaxConcurrency.HasValue)
             {
                 throw new ArgumentException("MaxConcurrency is not set in TransportSettings");
@@ -54,7 +55,7 @@ IngestionMetrics metrics
                 FullMode = BoundedChannelFullMode.Wait
             });
 
-            errorHandlingPolicy = new AuditIngestionFaultPolicy(failedImportsStorage, settings.LoggingSettings, OnCriticalError, metrics);
+            errorHandlingPolicy = new AuditIngestionFaultPolicy(failedImportsStorage, settings.LoggingSettings, OnCriticalError, metrics, logger);
 
             watchdog = new Watchdog(
                 "audit message ingestion",
@@ -69,7 +70,7 @@ IngestionMetrics metrics
 
         Task OnCriticalError(string failure, Exception exception)
         {
-            logger.Fatal($"OnCriticalError. '{failure}'", exception);
+            logger.LogCritical(exception, "OnCriticalError. '{Failure}'", failure);
             return watchdog.OnFailure(failure);
         }
 
@@ -81,7 +82,7 @@ async Task EnsureStarted(CancellationToken cancellationToken)
 
                 var canIngest = unitOfWorkFactory.CanIngestMore();
 
-                logger.DebugFormat("Ensure started {0}", canIngest);
+                logger.LogDebug("Ensure started {CanIngest}", canIngest);
 
                 if (canIngest)
                 {
@@ -115,13 +116,13 @@ async Task SetUpAndStartInfrastructure(CancellationToken cancellationToken)
         {
             if (messageReceiver != null)
             {
-                logger.Debug("Infrastructure already Started");
+                logger.LogDebug("Infrastructure already Started");
                 return;
             }
 
             try
             {
-                logger.Info("Starting infrastructure");
+                logger.LogInformation("Starting infrastructure");
                 transportInfrastructure = await transportCustomization.CreateTransportInfrastructure(
                     inputEndpoint,
                     transportSettings,
@@ -136,11 +137,11 @@ async Task SetUpAndStartInfrastructure(CancellationToken cancellationToken)
                 await auditIngestor.VerifyCanReachForwardingAddress(cancellationToken);
                 await messageReceiver.StartReceive(cancellationToken);
 
-                logger.Info(LogMessages.StartedInfrastructure);
+                logger.LogInformation(LogMessages.StartedInfrastructure);
             }
             catch (Exception e)
             {
-                logger.Error("Failed to start infrastructure", e);
+                logger.LogError(e, "Failed to start infrastructure");
                 throw;
             }
         }
@@ -149,13 +150,13 @@ async Task StopAndTeardownInfrastructure(CancellationToken cancellationToken)
         {
             if (transportInfrastructure == null)
             {
-                logger.Debug("Infrastructure already Stopped");
+                logger.LogDebug("Infrastructure already Stopped");
                 return;
             }
 
             try
             {
-                logger.Info("Stopping infrastructure");
+                logger.LogInformation("Stopping infrastructure");
                 try
                 {
                     if (messageReceiver != null)
@@ -171,11 +172,11 @@ async Task StopAndTeardownInfrastructure(CancellationToken cancellationToken)
                 messageReceiver = null;
                 transportInfrastructure = null;
 
-                logger.Info(LogMessages.StoppedInfrastructure);
+                logger.LogInformation(LogMessages.StoppedInfrastructure);
             }
             catch (Exception e)
             {
-                logger.Error("Failed to stop infrastructure", e);
+                logger.LogError(e, "Failed to stop infrastructure");
                 throw;
             }
         }
@@ -254,11 +255,11 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
                         if (e is OperationCanceledException && stoppingToken.IsCancellationRequested)
                         {
-                            logger.Info("Batch cancelled", e);
+                            logger.LogInformation(e, "Batch cancelled");
                             break;
                         }
 
-                        logger.Info("Ingesting messages failed", e);
+                        logger.LogInformation(e, "Ingesting messages failed");
                     }
                     finally
                     {
@@ -291,7 +292,7 @@ public override async Task StopAsync(CancellationToken cancellationToken)
                     }
                     catch (OperationCanceledException e) when (cancellationToken.IsCancellationRequested)
                     {
-                        logger.Info("Shutdown cancelled", e);
+                        logger.LogInformation(e, "Shutdown cancelled");
                     }
                 }
             }
@@ -313,8 +314,7 @@ public override async Task StopAsync(CancellationToken cancellationToken)
         readonly Watchdog watchdog;
         readonly IHostApplicationLifetime applicationLifetime;
         readonly IngestionMetrics metrics;
-
-        static readonly ILog logger = LogManager.GetLogger<AuditIngestion>();
+        readonly ILogger<AuditIngestion> logger;
 
         internal static class LogMessages
         {

src/ServiceControl.Audit/Auditing/AuditIngestionFaultPolicy.cs

@@ -7,21 +7,27 @@
 using System.Runtime.Versioning;
 using System.Threading;
 using System.Threading.Tasks;
+using Configuration;
 using Infrastructure;
-using NServiceBus.Logging;
+using Metrics;
+using Microsoft.Extensions.Logging;
 using NServiceBus.Transport;
 using Persistence;
-using Configuration;
-using Metrics;
 using ServiceControl.Infrastructure;
 
 class AuditIngestionFaultPolicy
 {
-    public AuditIngestionFaultPolicy(IFailedAuditStorage failedAuditStorage, LoggingSettings settings, Func<string, Exception, Task> onCriticalError, IngestionMetrics metrics)
+    public AuditIngestionFaultPolicy(
+        IFailedAuditStorage failedAuditStorage,
+        LoggingSettings settings,
+        Func<string, Exception, Task> onCriticalError,
+        IngestionMetrics metrics,
+        ILogger logger)
     {
         failureCircuitBreaker = new ImportFailureCircuitBreaker(onCriticalError);
         this.failedAuditStorage = failedAuditStorage;
         this.metrics = metrics;
+        this.logger = logger;
 
         if (!AppEnvironment.RunningInContainer)
         {
@@ -75,20 +81,20 @@ async Task StoreFailedMessageDocument(ErrorContext errorContext, CancellationTok
 
     async Task DoLogging(Exception exception, FailedAuditImport failure, CancellationToken cancellationToken)
     {
-        log.Error("Failed importing error message", exception);
+        logger.LogError(exception, "Failed importing error message");
 
         // Write to storage
         await failedAuditStorage.SaveFailedAuditImport(failure);
 
         if (!AppEnvironment.RunningInContainer)
         {
             // Write to Log Path
-            var filePath = Path.Combine(logPath, failure.Id + ".txt");
+            var filePath = Path.Combine(logPath, $"{failure.Id}.txt");
             await File.WriteAllTextAsync(filePath, failure.ExceptionInfo, cancellationToken);
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                WriteToEventLog("A message import has failed. A log file has been written to " + filePath);
+                WriteToEventLog($"A message import has failed. A log file has been written to {filePath}");
             }
         }
     }
@@ -107,5 +113,5 @@ void WriteToEventLog(string message)
     readonly string logPath;
     readonly ImportFailureCircuitBreaker failureCircuitBreaker;
 
-    static readonly ILog log = LogManager.GetLogger<AuditIngestionFaultPolicy>();
+    readonly ILogger logger;
 }

src/ServiceControl.Audit/Auditing/AuditIngestor.cs

@@ -6,9 +6,9 @@
     using System.Threading;
     using System.Threading.Tasks;
     using Infrastructure.Settings;
+    using Microsoft.Extensions.Logging;
     using Monitoring;
     using NServiceBus;
-    using NServiceBus.Logging;
     using NServiceBus.Routing;
     using NServiceBus.Transport;
     using Persistence.UnitOfWork;
@@ -25,12 +25,13 @@ public AuditIngestor(
             IEnumerable<IEnrichImportedAuditMessages> auditEnrichers, // allows extending message enrichers with custom enrichers registered in the DI container
             IMessageSession messageSession,
             Lazy<IMessageDispatcher> messageDispatcher,
-            ITransportCustomization transportCustomization
+            ITransportCustomization transportCustomization,
+            ILogger<AuditIngestor> logger
         )
         {
             this.settings = settings;
             this.messageDispatcher = messageDispatcher;
-
+            this.logger = logger;
             var enrichers = new IEnrichImportedAuditMessages[] { new MessageTypeEnricher(), new EnrichWithTrackingIds(), new ProcessingStatisticsEnricher(), new DetectNewEndpointsFromAuditImportsEnricher(endpointInstanceMonitoring), new DetectSuccessfulRetriesEnricher(), new SagaRelationshipsEnricher() }.Concat(auditEnrichers).ToArray();
 
             logQueueAddress = transportCustomization.ToTransportQualifiedQueueName(settings.AuditLogQueue);
@@ -39,7 +40,8 @@ ITransportCustomization transportCustomization
                 unitOfWorkFactory,
                 enrichers,
                 messageSession,
-                messageDispatcher
+                messageDispatcher,
+                logger
             );
         }
 
@@ -61,7 +63,7 @@ public async Task Ingest(List<MessageContext> contexts, CancellationToken cancel
             }
             catch (Exception e)
             {
-                Log.Warn("Forwarding messages failed", e);
+                logger.LogWarning(e, "Forwarding messages failed");
 
                 // making sure to rethrow so that all messages get marked as failed
                 throw;
@@ -129,6 +131,6 @@ public async Task VerifyCanReachForwardingAddress(CancellationToken cancellation
         readonly Lazy<IMessageDispatcher> messageDispatcher;
         readonly string logQueueAddress;
 
-        static readonly ILog Log = LogManager.GetLogger<AuditIngestor>();
+        readonly ILogger logger;
     }
 }