refactor custom serilog extensions

src/ApiGateway/src/ApiGateway.csproj

@@ -5,12 +5,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3"/>
-    <PackageReference Include="Yarp.ReverseProxy" Version="1.0.0"/>
-    <PackageReference Include="Microsoft.Identity.Web" Version="1.22.3"/>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\BuildingBlocks\BuildingBlocks.csproj"/>
   </ItemGroup>

src/BuildingBlocks/BuildingBlocks.csproj

@@ -61,6 +61,7 @@
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
     <PackageReference Include="Serilog.Enrichers.Span" Version="2.2.0" />
+    <PackageReference Include="Serilog.Exceptions" Version="8.1.0" />
     <PackageReference Include="Serilog.Formatting.Elasticsearch" Version="8.4.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="8.4.1" />
@@ -91,6 +92,8 @@
     <PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="6.0.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0" />
+    <PackageReference Include="Yarp.ReverseProxy" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="1.22.3" />
     
     <PackageReference Include="Jaeger" Version="0.3.7" />
     <PackageReference Include="OpenTracing" Version="0.12.1" />

src/BuildingBlocks/Logging/Extensions.cs

@@ -1,9 +1,11 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Enrichers.Span;
 using Serilog.Events;
+using Serilog.Exceptions;
 using Serilog.Sinks.SpectreConsole;
 
 namespace BuildingBlocks.Logging;
@@ -12,19 +14,26 @@ public static class Extensions
 {
     public static WebApplicationBuilder AddCustomSerilog(this WebApplicationBuilder builder)
     {
-
         Log.Logger = new LoggerConfiguration()
             .WriteTo.Console()
             .CreateBootstrapLogger();
 
-            builder.Host.UseSerilog((ctx, lc) => lc
+        builder.Host.UseSerilog((context, loggerConfiguration) =>
-                .WriteTo.Console()
+        {
-                .WriteTo.SpectreConsole("{Timestamp:HH:mm:ss} [{Level:u4}] {Message:lj}{NewLine}{Exception}",
+            var loggOptions = context.Configuration.GetSection(nameof(LogOptions)).Get<LogOptions>();
-                    LogEventLevel.Error)
+
+            var logLevel = Enum.TryParse<LogEventLevel>(loggOptions.Level, true, out var level)
+                ? level
+                : LogEventLevel.Information;
+
+            loggerConfiguration.WriteTo.Console()
+                .WriteTo.SpectreConsole(loggOptions.LogTemplate, logLevel)
                 .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Error)
                 .Enrich.WithSpan()
+                .Enrich.WithExceptionDetails()
                 .Enrich.FromLogContext()
-                .ReadFrom.Configuration(ctx.Configuration));
+                .ReadFrom.Configuration(context.Configuration);
+        });
 
         return builder;
     }

src/BuildingBlocks/Logging/LoggerOptions.cs

@@ -0,0 +1,7 @@
+namespace BuildingBlocks.Logging;
+
+public class LogOptions
+{
+    public string Level { get; set; }
+    public string LogTemplate { get; set; }
+}

src/Services/Booking/src/Booking.Api/appsettings.json

@@ -2,14 +2,9 @@
   "AppOptions": {
     "Name": "Booking-Service"
   },
-  "Serilog": {
+  "LogOptions": {
-    "MinimumLevel": {
+    "Level": "Information",
-      "Default": "Information",
+    "LogTemplate": "{Timestamp:HH:mm:ss} [{Level:u4}] {Message:lj}{NewLine}{Exception}"
-      "Override": {
-        "Microsoft": "Warning",
-        "Microsoft.Hosting.Lifetime": "Information"
-      }
-    }
   },
   "ConnectionStrings": {
     "DefaultConnection": "Server=.\\sqlexpress;Database=BookingDB;Trusted_Connection=True;MultipleActiveResultSets=true"

src/Services/Flight/src/Flight.Api/appsettings.json

@@ -2,14 +2,9 @@
   "AppOptions": {
     "Name": "Flight-Service"
   },
-  "Serilog": {
+  "LogOptions": {
-    "MinimumLevel": {
+    "Level": "Information",
-      "Default": "Information",
+    "LogTemplate": "{Timestamp:HH:mm:ss} [{Level:u4}] {Message:lj}{NewLine}{Exception}"
-      "Override": {
-        "Microsoft": "Warning",
-        "Microsoft.Hosting.Lifetime": "Information"
-      }
-    }
   },
   "ConnectionStrings": {
     "DefaultConnection": "Server=.\\sqlexpress;Database=FlightDB;Trusted_Connection=True;MultipleActiveResultSets=true"

src/Services/Identity/src/Identity.Api/appsettings.json

@@ -11,14 +11,9 @@
     "UserName": "guest",
     "Password": "guest"
   },
-  "Serilog": {
+  "LogOptions": {
-    "MinimumLevel": {
+    "Level": "Information",
-      "Default": "Information",
+    "LogTemplate": "{Timestamp:HH:mm:ss} [{Level:u4}] {Message:lj}{NewLine}{Exception}"
-      "Override": {
-        "Microsoft": "Warning",
-        "Microsoft.Hosting.Lifetime": "Information"
-      }
-    }
   },
   "AllowedHosts": "*"
 }

src/Services/Passenger/src/Passenger.Api/appsettings.json

@@ -15,14 +15,9 @@
     "UserName": "guest",
     "Password": "guest"
   },
-  "Serilog": {
+  "LogOptions": {
-    "MinimumLevel": {
+    "Level": "Information",
-      "Default": "Information",
+    "LogTemplate": "{Timestamp:HH:mm:ss} [{Level:u4}] {Message:lj}{NewLine}{Exception}"
-      "Override": {
-        "Microsoft": "Warning",
-        "Microsoft.Hosting.Lifetime": "Information"
-      }
-    }
   },
   "AllowedHosts": "*"
 }