Refactor

Author: andreasohlund

src/ServiceControl.Audit/HostApplicationBuilderExtensions.cs

@@ -22,22 +22,22 @@ namespace ServiceControl.Audit;
 using NServiceBus.Transport;
 using Persistence;
 using Transports;
-using ServiceControl.Infrastructure;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Resources;
 
 static class HostApplicationBuilderExtensions
 {
+    static string InstanceVersion = FileVersionInfo.GetVersionInfo(typeof(HostApplicationBuilderExtensions).Assembly.Location).ProductVersion;
+
     public static void AddServiceControlAudit(this IHostApplicationBuilder builder,
         Func<ICriticalErrorContext, CancellationToken, Task> onCriticalError,
         Settings settings,
         EndpointConfiguration configuration)
     {
-        var version = FileVersionInfo.GetVersionInfo(typeof(HostApplicationBuilderExtensions).Assembly.Location).ProductVersion;
         var persistenceConfiguration = PersistenceConfigurationFactory.LoadPersistenceConfiguration(settings);
         var persistenceSettings = persistenceConfiguration.BuildPersistenceSettings(settings);
 
-        RecordStartup(version, settings, configuration, persistenceConfiguration);
+        RecordStartup(settings, configuration, persistenceConfiguration);
 
         builder.Logging.ClearProviders();
         builder.Logging.AddNLog();
@@ -72,7 +72,31 @@ public static void AddServiceControlAudit(this IHostApplicationBuilder builder,
         NServiceBusFactory.Configure(settings, transportCustomization, transportSettings, onCriticalError, configuration);
         builder.UseNServiceBus(configuration);
 
-        services.AddSingleton<IngestionMetrics>();
+        builder.AddMetrics(settings);
+
+        // Configure after the NServiceBus hosted service to ensure NServiceBus is already started
+        if (settings.IngestAuditMessages)
+        {
+            services.AddHostedService<AuditIngestion>();
+        }
+
+        if (WindowsServiceHelpers.IsWindowsService())
+        {
+            // The if is added for clarity, internally AddWindowsService has a similar logic
+            builder.AddWindowsServiceWithRequestTimeout();
+        }
+    }
+
+    public static void AddServiceControlAuditInstallers(this IHostApplicationBuilder builder, Settings settings)
+    {
+        var persistenceConfiguration = PersistenceConfigurationFactory.LoadPersistenceConfiguration(settings);
+        var persistenceSettings = persistenceConfiguration.BuildPersistenceSettings(settings);
+        builder.Services.AddInstaller(persistenceSettings, persistenceConfiguration);
+    }
+
+    public static void AddMetrics(this IHostApplicationBuilder builder, Settings settings)
+    {
+        builder.Services.AddSingleton<IngestionMetrics>();
 
         if (!string.IsNullOrEmpty(settings.OtlpEndpointUrl))
         {
@@ -84,7 +108,7 @@ public static void AddServiceControlAudit(this IHostApplicationBuilder builder,
             builder.Services.AddOpenTelemetry()
                 .ConfigureResource(b => b.AddService(
                     serviceName: settings.InstanceName,
-                    serviceVersion: version,
+                    serviceVersion: InstanceVersion,
                     autoGenerateServiceInstanceId: true))
                 .WithMetrics(b =>
                 {
@@ -98,32 +122,13 @@ public static void AddServiceControlAudit(this IHostApplicationBuilder builder,
             var logger = LogManager.GetLogger(typeof(HostApplicationBuilderExtensions));
             logger.InfoFormat("OpenTelemetry metrics exporter enabled: {0}", settings.OtlpEndpointUrl);
         }
-
-        // Configure after the NServiceBus hosted service to ensure NServiceBus is already started
-        if (settings.IngestAuditMessages)
-        {
-            services.AddHostedService<AuditIngestion>();
-        }
-
-        if (WindowsServiceHelpers.IsWindowsService())
-        {
-            // The if is added for clarity, internally AddWindowsService has a similar logic
-            builder.AddWindowsServiceWithRequestTimeout();
-        }
-    }
-
-    public static void AddServiceControlAuditInstallers(this IHostApplicationBuilder builder, Settings settings)
-    {
-        var persistenceConfiguration = PersistenceConfigurationFactory.LoadPersistenceConfiguration(settings);
-        var persistenceSettings = persistenceConfiguration.BuildPersistenceSettings(settings);
-        builder.Services.AddInstaller(persistenceSettings, persistenceConfiguration);
     }
 
-    static void RecordStartup(string version, Settings settings, EndpointConfiguration endpointConfiguration, IPersistenceConfiguration persistenceConfiguration)
+    static void RecordStartup(Settings settings, EndpointConfiguration endpointConfiguration, IPersistenceConfiguration persistenceConfiguration)
     {
         var startupMessage = $@"
 -------------------------------------------------------------
-ServiceControl Audit Version:       {version}
+ServiceControl Audit Version:       {InstanceVersion}
 Audit Retention Period:             {settings.AuditRetentionPeriod}
 Forwarding Audit Messages:          {settings.ForwardAuditMessages}
 ServiceControl Logging Level:       {settings.LoggingSettings.LogLevel}