Application setup logic as separate extension methods

Author: Tsingis

src/Api/Program.cs

@@ -1,79 +1,32 @@
-using System.Globalization;
 using Api.Endpoints;
 using Api.Setup;
-using Azure.Identity;
-using Common;
-using Microsoft.ApplicationInsights.Extensibility;
 using Serilog;
-using Serilog.Exceptions;
-using Serilog.Formatting;
-using Serilog.Formatting.Compact;
-using Serilog.Formatting.Display;
 
 DotNetEnv.Env.TraversePath().Load();
 
-var config = new ConfigurationBuilder()
-    .SetBasePath(Directory.GetCurrentDirectory())
-    .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-    .AddEnvironmentVariables()
-    .Build();
-
-const string logFormat = "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level:u3}] {Message:lj}{NewLine}{Exception}";
-
-Log.Logger = new LoggerConfiguration()
-    .ReadFrom.Configuration(config)
-    .WriteTo.Console(outputTemplate: logFormat, formatProvider: CultureInfo.InvariantCulture)
-    .CreateBootstrapLogger();
-
 try
 {
+    Log.Logger = LoggingConfigurationExtensions.CreateBootstrapLogger();
+
     Log.Information("Starting up the application");
 
     var builder = WebApplication.CreateBuilder(args);
 
-    var keyVaultName = builder.Configuration.GetValue<string>(EnvVarKeys.KeyVaultName);
-    if (builder.Environment.IsProduction() && !string.IsNullOrEmpty(keyVaultName))
-    {
-        var keyVaultUri = new Uri($"https://{keyVaultName}.vault.azure.net/");
-        builder.Configuration.AddAzureKeyVault(keyVaultUri, new DefaultAzureCredential());
-    }
+    builder.Configuration.AddConfiguration(builder.Environment);
 
-    builder.Services.ConfigureServices(builder.Environment);
+    builder.Services.AddServices(builder.Environment);
 
     builder.Host.UseSerilog((ctx, services, loggerConfig) =>
-    {
-        ITextFormatter formatter = new MessageTemplateTextFormatter(outputTemplate: logFormat, formatProvider: CultureInfo.InvariantCulture);
-
-        if (EnvVarAccessors.UseJsonFormatting)
-        {
-            formatter = new CompactJsonFormatter();
-        }
-
-        loggerConfig
-            .ReadFrom.Configuration(ctx.Configuration)
-            .Enrich.FromLogContext()
-            .Enrich.WithExceptionDetails()
-            .WriteTo.Async(x => x.Console(formatter));
-
-        if (ctx.HostingEnvironment.IsProduction())
-        {
-            var tc = new TelemetryConfiguration
-            {
-                ConnectionString = ctx.Configuration["ApplicationInsights:ConnectionString"]
-            };
-            loggerConfig.WriteTo.ApplicationInsights(tc, TelemetryConverter.Traces);
-        }
-    },
+        loggerConfig.AddLoggingConfiguration(ctx.Configuration, builder.Environment),
         writeToProviders: false,
         preserveStaticLogger: false
     );
 
-
     var app = builder.Build();
 
     app.MapEndpoints();
 
-    app.ConfigureMiddleware(app.Environment, app.Configuration);
+    app.AddMiddleware(app.Environment, app.Configuration);
 
     await app.RunAsync().ConfigureAwait(false);
 }

src/Api/Setup/ConfigurationExtensions.cs

@@ -0,0 +1,25 @@
+using Azure.Identity;
+using Common;
+
+namespace Api.Setup;
+
+public static class ConfigurationExtensions
+{
+    public static void AddConfiguration(this ConfigurationManager configManager, IWebHostEnvironment environment)
+    {
+        var config = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+            .AddEnvironmentVariables()
+            .Build();
+
+        configManager.AddConfiguration(config);
+
+        var keyVaultName = configManager.GetValue<string>(EnvVarKeys.KeyVaultName);
+        if (environment.IsProduction() && !string.IsNullOrEmpty(keyVaultName))
+        {
+            var keyVaultUri = new Uri($"https://{keyVaultName}.vault.azure.net/");
+            configManager.AddAzureKeyVault(keyVaultUri, new DefaultAzureCredential());
+        }
+    }
+}

src/Api/Setup/LoggingConfigurationExtensions.cs

@@ -0,0 +1,51 @@
+using System.Globalization;
+using Common;
+using Microsoft.ApplicationInsights.Extensibility;
+using Serilog;
+using Serilog.Exceptions;
+using Serilog.Extensions.Hosting;
+using Serilog.Formatting;
+using Serilog.Formatting.Compact;
+using Serilog.Formatting.Display;
+
+namespace Api.Setup;
+
+public static class LoggingConfigurationExtensions
+{
+    const string LogFormat = "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level:u3}] {Message:lj}{NewLine}{Exception}";
+
+    public static ReloadableLogger CreateBootstrapLogger()
+    {
+        var logger = new LoggerConfiguration()
+            .MinimumLevel.Information()
+            .WriteTo.Console(outputTemplate: LogFormat, formatProvider: CultureInfo.InvariantCulture)
+            .CreateBootstrapLogger();
+
+        return logger;
+    }
+
+    public static void AddLoggingConfiguration(this LoggerConfiguration loggerConfig, IConfiguration config, IWebHostEnvironment environment)
+    {
+        ITextFormatter formatter = new MessageTemplateTextFormatter(outputTemplate: LogFormat, formatProvider: CultureInfo.InvariantCulture);
+
+        if (EnvVarAccessors.UseJsonFormatting)
+        {
+            formatter = new CompactJsonFormatter();
+        }
+
+        loggerConfig?
+            .ReadFrom.Configuration(config)
+            .Enrich.FromLogContext()
+            .Enrich.WithExceptionDetails()
+            .WriteTo.Async(x => x.Console(formatter));
+
+        if (environment.IsProduction())
+        {
+            using var tc = new TelemetryConfiguration
+            {
+                ConnectionString = config?["ApplicationInsights:ConnectionString"]
+            };
+            loggerConfig?.WriteTo.ApplicationInsights(tc, TelemetryConverter.Traces);
+        }
+    }
+}

src/Api/Setup/ApiMiddleware.cs renamed to src/Api/Setup/MiddlewareConfigurationExtensions.cs

@@ -3,9 +3,9 @@
 
 namespace Api.Setup;
 
-internal static class ApiMiddleware
+internal static class MiddlewareConfigurationExtensions
 {
-    public static void ConfigureMiddleware(this WebApplication app, IWebHostEnvironment environment, IConfiguration configuration)
+    public static void AddMiddleware(this WebApplication app, IWebHostEnvironment environment, IConfiguration configuration)
     {
         app.UseExceptionHandler();
 

src/Api/Setup/ApiServices.cs renamed to src/Api/Setup/ServiceConfigurationExtensions.cs

@@ -11,9 +11,9 @@
 
 namespace Api.Setup;
 
-internal static class ApiServices
+internal static class ServiceConfigurationExtensions
 {
-    public static void ConfigureServices(this IServiceCollection services, IWebHostEnvironment environment)
+    public static void AddServices(this IServiceCollection services, IWebHostEnvironment environment)
     {
         services.AddProblemDetails();
         services.AddExceptionHandler<GlobalExceptionHandler>();

tests/ArchitectureTests/ServiceRegistrationTests.cs

@@ -12,7 +12,7 @@ public class ServiceRegistrationTests
     public void ShouldHave_Scoped_MarketClient()
     {
         var builder = WebApplication.CreateBuilder();
-        builder.Services.ConfigureServices(builder.Environment);
+        builder.Services.AddServices(builder.Environment);
 
         var marketClient = builder.Services.SingleOrDefault(x => x.ServiceType == typeof(IMarketClient));
 
@@ -24,7 +24,7 @@ public void ShouldHave_Scoped_MarketClient()
     public void ShouldHave_Scoped_MarketService()
     {
         var builder = WebApplication.CreateBuilder();
-        builder.Services.ConfigureServices(builder.Environment);
+        builder.Services.AddServices(builder.Environment);
 
         var marketService = builder.Services.SingleOrDefault(x => x.ServiceType == typeof(IMarketService));