wip

Author: ramonsmits

src/ServiceControl.AcceptanceTests.RavenDB/StartupModeTests.cs

@@ -24,12 +24,11 @@ public async Task InitializeSettings()
         {
             var transportIntegration = new ConfigureEndpointLearningTransport();
 
-            settings = new Settings(
-                transportType: transportIntegration.TypeName,
-                forwardErrorMessages: false,
-                errorRetentionPeriod: TimeSpan.FromDays(1),
-                persisterType: "RavenDB")
+            settings = new Settings
             {
+                TransportType = transportIntegration.TypeName,
+                ErrorRetentionPeriod = TimeSpan.FromDays(1),
+                PersistenceType = "RavenDB",
                 TransportConnectionString = transportIntegration.ConnectionString,
                 AssemblyLoadContextResolver = static _ => AssemblyLoadContext.Default
             };
@@ -56,7 +55,7 @@ public async Task CanRunMaintenanceMode()
 
         [Test]
         public async Task CanRunImportFailedMessagesMode()
-            => await new TestableImportFailedErrorsCommand().Execute(new HostArguments(Array.Empty<string>()), settings);
+            => await new TestableImportFailedErrorsCommand().Execute(new HostArguments([], settings), settings);
 
         class TestableImportFailedErrorsCommand() : ImportFailedErrorsCommand()
         {

src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs

@@ -49,11 +49,19 @@ async Task InitializeServiceControl(ScenarioContext context)
         {
             var logPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
             Directory.CreateDirectory(logPath);
-            var loggingSettings = new LoggingSettings(Settings.SettingsRootNamespace, defaultLevel: LogLevel.Debug, logPath: logPath);
+            var loggingSettings = new LoggingSettings
+            {
+                LogLevel = LogLevel.Debug,
+                LogPath = logPath
+            };
             LoggerUtil.ActiveLoggers = Loggers.Test;
 
-            var settings = new Settings(transportToUse.TypeName, persistenceToUse.PersistenceType, loggingSettings, forwardErrorMessages: false, errorRetentionPeriod: TimeSpan.FromDays(10))
+            var settings = new Settings
             {
+                TransportType = transportToUse.TypeName,
+                PersistenceType = persistenceToUse.PersistenceType,
+                LoggingSettings = loggingSettings,
+                ErrorRetentionPeriod = TimeSpan.FromDays(10),
                 InstanceName = instanceName,
                 AllowMessageEditing = true,
                 ForwardErrorMessages = false,
@@ -104,7 +112,7 @@ async Task InitializeServiceControl(ScenarioContext context)
             using (new DiagnosticTimer($"Creating infrastructure for {instanceName}"))
             {
                 var setupCommand = new SetupCommand();
-                await setupCommand.Execute(new HostArguments([]), settings);
+                await setupCommand.Execute(new HostArguments([], settings), settings);
             }
 
             var configuration = new EndpointConfiguration(instanceName);

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

@@ -46,10 +46,12 @@ async Task InitializeServiceControl(ScenarioContext context)
             Directory.CreateDirectory(logPath);
 
 
-            var loggingSettings = new LoggingSettings(new LoggingOptions
+            var loggingSettings = new LoggingSettings
             {
-                // TODO:
-            }, defaultLevel: LogLevel.Debug, logPath: logPath);
+                LogLevel = LogLevel.Debug,
+                LogPath = logPath
+            };
+
             LoggerUtil.ActiveLoggers = Loggers.Test;
 
             var configuration = new ConfigurationBuilder()

src/ServiceControl.Audit/Program.cs

@@ -20,7 +20,7 @@
 
     var serviceControlAuditSection = bootstrapConfig.GetSection(Settings.SectionName);
 
-    var loggingSettings = new LoggingSettings(serviceControlAuditSection.Get<LoggingOptions>());
+    var loggingSettings = LoggingSettingsFactory.Create(serviceControlAuditSection);
     LoggingConfigurator.ConfigureLogging(loggingSettings);
     logger = LoggerUtil.CreateStaticLogger(typeof(Program));
 

src/ServiceControl.Infrastructure/LoggingSettings.cs

@@ -4,66 +4,61 @@ namespace ServiceControl.Infrastructure;
 using System.Collections.Generic;
 using System.IO;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
-public class LoggingSettings
+public static class LoggingOptionsToSettings
 {
-    public LoggingSettings(
-        LoggingOptions options,
-        LogLevel defaultLevel = LogLevel.Information,
-        string logPath = null
-    )
+    public static void Map(LoggingOptions src, LoggingSettings dst)
     {
         var activeLoggers = Loggers.None;
-        if (options.LoggingProviders.Contains("NLog"))
+        if (src.LoggingProviders.Contains("NLog"))
         {
             activeLoggers |= Loggers.NLog;
         }
-        if (options.LoggingProviders.Contains("Seq"))
+
+        if (src.LoggingProviders.Contains("Seq"))
         {
             activeLoggers |= Loggers.Seq;
-            if (!string.IsNullOrWhiteSpace(options.SeqAddress))
+            if (!string.IsNullOrWhiteSpace(src.SeqAddress))
             {
-                LoggerUtil.SeqAddress = options.SeqAddress;
+                LoggerUtil.SeqAddress = src.SeqAddress;
             }
         }
-        if (options.LoggingProviders.Contains("Otlp"))
+
+        if (src.LoggingProviders.Contains("Otlp"))
         {
             activeLoggers |= Loggers.Otlp;
         }
+
         //this defaults to NLog because historically that was the default, and we don't want to break existing installs that don't have the config key to define loggingProviders
         LoggerUtil.ActiveLoggers = activeLoggers == Loggers.None ? Loggers.NLog : activeLoggers;
 
-        LogLevel = InitializeLogLevel(options.LogLevel, defaultLevel);
-        LogPath = Environment.ExpandEnvironmentVariables(options.LogPath ?? DefaultLogLocation());
-    }
-
-    public LogLevel LogLevel { get; }
+        dst.LogLevel = InitializeLogLevel(src.LogLevel, dst.LogLevel);
+        dst.LogPath = Environment.ExpandEnvironmentVariables(src.LogPath ?? DefaultLogLocation());
 
-    public string LogPath { get; }
-
-    static LogLevel InitializeLogLevel(string levelText, LogLevel defaultLevel)
-    {
-        if (string.IsNullOrWhiteSpace(levelText))
+        static LogLevel InitializeLogLevel(string levelText, LogLevel defaultLevel)
         {
-            return defaultLevel;
-        }
+            if (string.IsNullOrWhiteSpace(levelText))
+            {
+                return defaultLevel;
+            }
 
-        return ParseLogLevel(levelText, defaultLevel);
+            return ParseLogLevel(levelText, defaultLevel);
+        }
     }
 
     // SC installer always populates LogPath in app.config on installation/change/upgrade so this will only be used when
     // debugging or if the entry is removed manually. In those circumstances default to the folder containing the exe
     static string DefaultLogLocation() => Path.Combine(AppContext.BaseDirectory, ".logs");
 
     // This is not a complete mapping of NLog levels, just the ones that are different.
-    static readonly Dictionary<string, LogLevel> NLogAliases =
-        new(StringComparer.OrdinalIgnoreCase)
-        {
-            ["info"] = LogLevel.Information,
-            ["warn"] = LogLevel.Warning,
-            ["fatal"] = LogLevel.Critical,
-            ["off"] = LogLevel.None
-        };
+    static readonly Dictionary<string, LogLevel> NLogAliases = new(StringComparer.OrdinalIgnoreCase)
+    {
+        ["info"] = LogLevel.Information,
+        ["warn"] = LogLevel.Warning,
+        ["fatal"] = LogLevel.Critical,
+        ["off"] = LogLevel.None
+    };
 
     static LogLevel ParseLogLevel(string value, LogLevel defaultLevel)
     {
@@ -83,10 +78,17 @@ static LogLevel ParseLogLevel(string value, LogLevel defaultLevel)
     }
 }
 
+
+public class LoggingSettings // TODO: Register
+{
+    public LogLevel LogLevel { get; set; } = LogLevel.Information;
+    public string LogPath { get; set; }
+}
+
 public record LoggingOptions
 {
     public string LogLevel { get; set; }
     public string LogPath { get; set; }
     public string LoggingProviders { get; set; }
-    public string SeqAddress {get; set;}
+    public string SeqAddress { get; set; }
 }

src/ServiceControl.Infrastructure/LoggingSettingsFactory.cs

@@ -0,0 +1,14 @@
+namespace ServiceControl.Infrastructure;
+
+using Microsoft.Extensions.Configuration;
+
+public static class LoggingSettingsFactory
+{
+    public static LoggingSettings Create(IConfiguration configuration)
+    {
+        var opt = configuration.Get<LoggingOptions>();
+        var dst = new LoggingSettings();
+        LoggingOptionsToSettings.Map(opt, dst);
+        return dst;
+    }
+}

src/ServiceControl.Monitoring/Program.cs

@@ -18,7 +18,7 @@
 
     var section = bootstrapConfig.GetSection(Settings.SectionName);
 
-    var loggingSettings = new LoggingSettings(section.Get<LoggingOptions>());
+    var loggingSettings = LoggingSettingsFactory.Create(bootstrapConfig);
     LoggingConfigurator.ConfigureLogging(loggingSettings);
     logger = LoggerUtil.CreateStaticLogger<Program>();
 

src/ServiceControl.Persistence.Tests.RavenDB/PersistenceTestsContext.cs

@@ -26,7 +26,7 @@ public async Task Setup(IHostApplicationBuilder hostBuilder)
 
         embeddedServer = await SharedEmbeddedServer.GetInstance();
 
-        PersistenceSettings = new RavenPersisterSettings
+        var settings = new RavenPersisterSettings
         {
             AuditRetentionPeriod = retentionPeriod,
             ErrorRetentionPeriod = retentionPeriod,
@@ -36,7 +36,9 @@ public async Task Setup(IHostApplicationBuilder hostBuilder)
             ThroughputDatabaseName = $"{databaseName}-throughput",
         };
 
-        var persistence = new RavenPersistenceConfiguration().Create(PersistenceSettings);
+        PersistenceSettings = settings;
+
+        var persistence = new RavenPersistence(settings);
 
         persistence.AddPersistence(hostBuilder.Services);
         persistence.AddInstaller(hostBuilder.Services);

src/ServiceControl.UnitTests/Infrastructure/Settings/SettingsTests.cs

@@ -12,7 +12,7 @@ public class SettingsTests
         public void Should_read_RemoteInstances_from_serialized_json()
         {
             var configValue = """[{"api_uri":"http://instance1"},{"api_uri":"http://instance2"}]""";
-            var remoteInstances = Settings.ParseRemoteInstances(configValue);
+            var remoteInstances = SettingsConfiguration.ParseRemoteInstances(configValue);
 
             Assert.That(
                 new[] { new RemoteInstanceSetting("http://instance1"), new RemoteInstanceSetting("http://instance2") },

src/ServiceControl/Hosting/Commands/ImportFailedErrorsCommand.cs

@@ -7,6 +7,7 @@
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Hosting;
     using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Options;
     using NServiceBus;
     using Operations;
     using Particular.ServiceControl;
@@ -16,11 +17,19 @@
 
     class ImportFailedErrorsCommand : AbstractCommand
     {
+        public class ForceDisableIngestion : IPostConfigureOptions<Settings> // TODO: Register
+        {
+            public void PostConfigure(string name, Settings options)
+            {
+                options.IngestErrorMessages = false;
+                options.RunRetryProcessor = false;
+                options.DisableHealthChecks = true;
+            }
+        }
+
         public override async Task Execute(HostArguments args, Settings settings)
         {
-            settings.IngestErrorMessages = false;
-            settings.RunRetryProcessor = false;
-            settings.DisableHealthChecks = true;
+            new ForceDisableIngestion().PostConfigure(null, settings); // TODO
 
             EndpointConfiguration endpointConfiguration = CreateEndpointConfiguration(settings);