Refactor settings handling to use IOptions pattern and integrate ServiceControl-specific configurations.

Author: ramonsmits

src/ServiceControl.AcceptanceTests.RavenDB/Recoverability/MessageFailures/When_a_message_fails_to_import.cs

@@ -34,8 +34,8 @@ public async Task It_can_be_reimported()
 
             SetSettings = settings =>
             {
-                settings.ForwardErrorMessages = true;
-                settings.ErrorLogQueue = Conventions.EndpointNamingConvention(typeof(ErrorLogSpy));
+                settings.ServiceControl.ForwardErrorMessages = true;
+                settings.ServiceBus.ErrorLogQueue = Conventions.EndpointNamingConvention(typeof(ErrorLogSpy));
             };
 
             var runResult = await Define<MyContext>()

src/ServiceControl.AcceptanceTests.RavenDB/StartupModeTests.cs

@@ -26,11 +26,14 @@ public async Task InitializeSettings()
 
             settings = new Settings
             {
-                TransportType = transportIntegration.TypeName,
-                ErrorRetentionPeriod = TimeSpan.FromDays(1),
-                PersistenceType = "RavenDB",
-                TransportConnectionString = transportIntegration.ConnectionString,
-                AssemblyLoadContextResolver = static _ => AssemblyLoadContext.Default
+                ServiceControl =
+                {
+                    TransportType = transportIntegration.TypeName,
+                    ErrorRetentionPeriod = TimeSpan.FromDays(1),
+                    PersistenceType = "RavenDB",
+                    ConnectionString = transportIntegration.ConnectionString,
+                    AssemblyLoadContextResolver = static _ => AssemblyLoadContext.Default
+                }
             };
 
             configuration = new AcceptanceTestStorageConfiguration();
@@ -46,7 +49,8 @@ public async Task CanRunMaintenanceMode()
             // ideally we'd be using the MaintenanceModeCommand here but that indefinitely blocks due to the RunAsync
             // not terminating.
             var hostBuilder = Host.CreateApplicationBuilder();
-            hostBuilder.Services.AddPersistence(settings, maintenanceMode: true);
+            settings.ServiceControl.MaintenanceMode = true;
+            hostBuilder.Services.AddPersistence(hostBuilder.Configuration, settings); // TODO: Configuration needs to be initialized
 
             using var host = hostBuilder.Build();
             await host.StartAsync();
@@ -55,7 +59,7 @@ public async Task CanRunMaintenanceMode()
 
         [Test]
         public async Task CanRunImportFailedMessagesMode()
-            => await new TestableImportFailedErrorsCommand().Execute(new HostArguments([], settings), settings);
+            => await new TestableImportFailedErrorsCommand().Execute(new HostArguments([], maintenanceMode: false));
 
         class TestableImportFailedErrorsCommand() : ImportFailedErrorsCommand()
         {
@@ -64,7 +68,10 @@ protected override EndpointConfiguration CreateEndpointConfiguration(Settings se
                 var configuration = base.CreateEndpointConfiguration(settings);
 
                 //HINT: we want to exclude this assembly to prevent loading features that are part of the acceptance testing framework
-                var thisAssembly = new[] { typeof(StartupModeTests).Assembly.GetName().Name };
+                var thisAssembly = new[]
+                {
+                    typeof(StartupModeTests).Assembly.GetName().Name
+                };
 
                 configuration.AssemblyScanner().ExcludeAssemblies(thisAssembly);
 

src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_a_custom_check_fails.cs

@@ -44,7 +44,7 @@ public class MyContext : ScenarioContext;
 
         public class EndpointWithFailingCustomCheck : EndpointConfigurationBuilder
         {
-            public EndpointWithFailingCustomCheck() => EndpointSetup<DefaultServerWithoutAudit>(c => { c.ReportCustomChecksTo(Settings.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1)); });
+            public EndpointWithFailingCustomCheck() => EndpointSetup<DefaultServerWithoutAudit>(c => { c.ReportCustomChecksTo(PrimaryOptions.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1)); });
 
             class FailingCustomCheck() : CustomCheck("MyCustomCheckId", "MyCategory")
             {

src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_a_periodic_custom_check_fails.cs

@@ -124,7 +124,7 @@ protected override async Task OnStart(IMessageSession session, CancellationToken
 
         public class WithCustomCheck : EndpointConfigurationBuilder
         {
-            public WithCustomCheck() => EndpointSetup<DefaultServerWithoutAudit>(c => { c.ReportCustomChecksTo(Settings.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1)); });
+            public WithCustomCheck() => EndpointSetup<DefaultServerWithoutAudit>(c => { c.ReportCustomChecksTo(PrimaryOptions.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1)); });
 
             class FailingCustomCheck(MyContext context)
                 : NServiceBus.CustomChecks.CustomCheck("MyCustomCheckId", "MyCategory", TimeSpan.FromSeconds(5))

src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_critical_storage_threshold_reached.cs

@@ -20,8 +20,8 @@ public void SetupIngestion()
         {
             SetSettings = s =>
             {
-                s.TimeToRestartErrorIngestionAfterFailure = TimeSpan.FromSeconds(1);
-                s.DisableHealthChecks = false;
+                s.ServiceControl.TimeToRestartErrorIngestionAfterFailure = TimeSpan.FromSeconds(1);
+                s.ServiceControl.DisableHealthChecks = false;
             };
         }
 
@@ -97,7 +97,7 @@ public class Sender : EndpointConfigurationBuilder
             public Sender() =>
                 EndpointSetup<DefaultServerWithoutAudit>(c =>
                 {
-                    c.ReportCustomChecksTo(Settings.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1));
+                    c.ReportCustomChecksTo(PrimaryOptions.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1));
                     c.NoRetries();
                 });
 

src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_custom_check_events_are_triggered.cs

@@ -44,7 +44,7 @@ public class MyContext : ScenarioContext
 
         public class EndpointWithCustomCheck : EndpointConfigurationBuilder
         {
-            public EndpointWithCustomCheck() => EndpointSetup<DefaultServerWithoutAudit>(c => c.ReportCustomChecksTo(Settings.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1)));
+            public EndpointWithCustomCheck() => EndpointSetup<DefaultServerWithoutAudit>(c => c.ReportCustomChecksTo(PrimaryOptions.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1)));
 
             public class EventuallyFailingCustomCheck()
                 : CustomCheck("EventuallyFailingCustomCheck", "Testing", TimeSpan.FromSeconds(1))

src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_email_notifications_are_enabled.cs

@@ -28,8 +28,8 @@ public async Task Should_send_custom_check_status_change_emails()
 
             SetSettings = settings =>
             {
-                settings.NotificationsFilter = "MyCustomCheckId#Other custom check";
-                settings.EmailDropFolder = emailDropPath;
+                settings.ServiceControl.NotificationsFilter = "MyCustomCheckId#Other custom check";
+                settings.ServiceControl.EmailDropFolder = emailDropPath;
             };
 
             CustomizeHostBuilder = hostBuilder => hostBuilder.Services.AddHostedService<SetupNotificationSettings>();
@@ -87,7 +87,7 @@ public class MyContext : ScenarioContext
 
         public class EndpointWithFailingCustomCheck : EndpointConfigurationBuilder
         {
-            public EndpointWithFailingCustomCheck() => EndpointSetup<DefaultServerWithoutAudit>(c => { c.ReportCustomChecksTo(Settings.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1)); });
+            public EndpointWithFailingCustomCheck() => EndpointSetup<DefaultServerWithoutAudit>(c => { c.ReportCustomChecksTo(PrimaryOptions.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1)); });
 
             class FailingCustomCheck() : CustomCheck("MyCustomCheckId", "MyCategory")
             {

src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_reporting_custom_check_with_signalr.cs

@@ -93,7 +93,7 @@ protected override Task OnStart(IMessageSession session, CancellationToken cance
 
         class EndpointWithCustomCheck : EndpointConfigurationBuilder
         {
-            public EndpointWithCustomCheck() => EndpointSetup<DefaultServerWithoutAudit>(c => { c.ReportCustomChecksTo(Settings.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1)); });
+            public EndpointWithCustomCheck() => EndpointSetup<DefaultServerWithoutAudit>(c => { c.ReportCustomChecksTo(PrimaryOptions.DEFAULT_INSTANCE_NAME, TimeSpan.FromSeconds(1)); });
 
             public class EventuallyFailingCustomCheck()
                 : CustomCheck("EventuallyFailingCustomCheck", "Testing", TimeSpan.FromSeconds(1))

src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_a_custom_check_fails.cs

@@ -69,10 +69,10 @@ public ExternalProcessor() =>
                 EndpointSetup<DefaultServerWithoutAudit>(c =>
                 {
                     var routing = c.ConfigureRouting();
-                    routing.RouteToEndpoint(typeof(MessageFailed).Assembly, Settings.DEFAULT_INSTANCE_NAME);
+                    routing.RouteToEndpoint(typeof(MessageFailed).Assembly, PrimaryOptions.DEFAULT_INSTANCE_NAME);
                 }, publisherMetadata =>
                 {
-                    publisherMetadata.RegisterPublisherFor<CustomCheckFailed>(Settings.DEFAULT_INSTANCE_NAME);
+                    publisherMetadata.RegisterPublisherFor<CustomCheckFailed>(PrimaryOptions.DEFAULT_INSTANCE_NAME);
                 });
 
             public class CustomCheckFailedHandler(MyContext testContext) : IHandleMessages<CustomCheckFailed>

src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_a_custom_check_succeeds.cs

@@ -64,10 +64,10 @@ public ExternalProcessor() =>
                 EndpointSetup<DefaultServerWithoutAudit>(c =>
                 {
                     var routing = c.ConfigureRouting();
-                    routing.RouteToEndpoint(typeof(MessageFailed).Assembly, Settings.DEFAULT_INSTANCE_NAME);
+                    routing.RouteToEndpoint(typeof(MessageFailed).Assembly, PrimaryOptions.DEFAULT_INSTANCE_NAME);
                 }, publisherMetadata =>
                 {
-                    publisherMetadata.RegisterPublisherFor<CustomCheckSucceeded>(Settings.DEFAULT_INSTANCE_NAME);
+                    publisherMetadata.RegisterPublisherFor<CustomCheckSucceeded>(PrimaryOptions.DEFAULT_INSTANCE_NAME);
                 });
 
             public class CustomCheckSucceededHandler(MyContext testContext) : IHandleMessages<CustomCheckSucceeded>