move structured logging into aspire (#1745)

* move structured logging into aspire * don't write output outside of test host
DuendeSoftware · Feb 4, 2025 · 68ef1f8 · 68ef1f8
1 parent 9d70b0b
commit 68ef1f8
Show file tree

Hide file tree

Showing 35 changed files with 156 additions and 336 deletions.
diff --git a/bff/samples/Apis/Api.DPoP/Api.DPoP.csproj b/bff/samples/Apis/Api.DPoP/Api.DPoP.csproj
@@ -7,7 +7,6 @@
     <ItemGroup>
         <PackageReference Include="Duende.IdentityModel" />
         <PackageReference Include="Duende.AspNetCore.Authentication.JwtBearer" />
-        <PackageReference Include="Serilog.AspNetCore" />
     </ItemGroup>
 
 	<ItemGroup>

diff --git a/bff/samples/Apis/Api.DPoP/Extensions.cs b/bff/samples/Apis/Api.DPoP/Extensions.cs
@@ -5,7 +5,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Tokens;
-using Serilog;
 
 namespace Api.DPoP;
 
@@ -68,7 +67,7 @@ public static WebApplication ConfigurePipeline(this WebApplication app)
         //     ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost,
         // });
 
-        app.UseSerilogRequestLogging();
+        app.UseHttpLogging();
 
         if (app.Environment.IsDevelopment())
         {

diff --git a/bff/samples/Apis/Api.DPoP/Program.cs b/bff/samples/Apis/Api.DPoP/Program.cs
@@ -2,44 +2,14 @@
 using Api.DPoP;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Hosting;
-using Serilog;
-using Serilog.Events;
 
 Console.Title = "DPoP Api";
 
-Log.Logger = new LoggerConfiguration()
-    .WriteTo.Console()
-    .CreateBootstrapLogger();
+var builder = WebApplication.CreateBuilder(args);
+builder.AddServiceDefaults();
 
-Log.Information("Starting up");
+var app = builder
+    .ConfigureServices()
+    .ConfigurePipeline();
 
-try
-{
-    var builder = WebApplication.CreateBuilder(args);
-    builder.AddServiceDefaults();
-
-    builder.Host.UseSerilog((ctx, lc) => lc
-        .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}")
-        .Enrich.FromLogContext()
-        .MinimumLevel.Debug()
-        .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-        .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
-        .MinimumLevel.Override("System", LogEventLevel.Warning)
-        .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
-        .ReadFrom.Configuration(ctx.Configuration));
-
-    var app = builder
-        .ConfigureServices()
-        .ConfigurePipeline();
-
-    app.Run();
-}
-catch (Exception ex)
-{
-    Log.Fatal(ex, "Unhandled exception");
-}
-finally
-{
-    Log.Information("Shut down complete");
-    Log.CloseAndFlush();
-}
+app.Run();
diff --git a/bff/samples/Apis/Api.Isolated/Api.Isolated.csproj b/bff/samples/Apis/Api.Isolated/Api.Isolated.csproj
@@ -7,7 +7,6 @@
     <ItemGroup>
         <PackageReference Include="Duende.IdentityModel" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
-        <PackageReference Include="Serilog.AspNetCore" />
     </ItemGroup>
 
 	<ItemGroup>

diff --git a/bff/samples/Apis/Api.Isolated/Extensions.cs b/bff/samples/Apis/Api.Isolated/Extensions.cs
@@ -6,7 +6,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Tokens;
-using Serilog;
 
 namespace Api.Isolated
 {
@@ -56,7 +55,7 @@ public static WebApplication ConfigurePipeline(this WebApplication app)
                 ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost,
             });
 
-            app.UseSerilogRequestLogging();
+            app.UseHttpLogging();
 
             if (app.Environment.IsDevelopment())
             {

diff --git a/bff/samples/Apis/Api.Isolated/Program.cs b/bff/samples/Apis/Api.Isolated/Program.cs
@@ -2,44 +2,14 @@
 using Api.Isolated;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Hosting;
-using Serilog;
-using Serilog.Events;
 
 Console.Title = "Isolated Api";
 
-Log.Logger = new LoggerConfiguration()
-    .WriteTo.Console()
-    .CreateBootstrapLogger();
+var builder = WebApplication.CreateBuilder(args);
+builder.AddServiceDefaults();
 
-Log.Information("Starting up");
+var app = builder
+    .ConfigureServices()
+    .ConfigurePipeline();
 
-try
-{
-    var builder = WebApplication.CreateBuilder(args);
-    builder.AddServiceDefaults();
-
-    builder.Host.UseSerilog((ctx, lc) => lc
-        .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}")
-        .Enrich.FromLogContext()
-        .MinimumLevel.Debug()
-        .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-        .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
-        .MinimumLevel.Override("System", LogEventLevel.Warning)
-        .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
-        .ReadFrom.Configuration(ctx.Configuration));
-
-    var app = builder
-        .ConfigureServices()
-        .ConfigurePipeline();
-
-    app.Run();
-}
-catch (Exception ex)
-{
-    Log.Fatal(ex, "Unhandled exception");
-}
-finally
-{
-    Log.Information("Shut down complete");
-    Log.CloseAndFlush();
-}
+app.Run();
diff --git a/bff/samples/Apis/Api/Api.csproj b/bff/samples/Apis/Api/Api.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
 	    <TargetFrameworks>net9.0</TargetFrameworks>
@@ -7,7 +7,6 @@
     <ItemGroup>
         <PackageReference Include="Duende.IdentityModel" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
-        <PackageReference Include="Serilog.AspNetCore" />
     </ItemGroup>
 
 	<ItemGroup>

diff --git a/bff/samples/Apis/Api/Extensions.cs b/bff/samples/Apis/Api/Extensions.cs
@@ -6,7 +6,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Tokens;
-using Serilog;
 
 namespace Api;
 
@@ -57,7 +56,7 @@ public static WebApplication ConfigurePipeline(this WebApplication app)
             ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost,
         });
 
-        app.UseSerilogRequestLogging();
+        app.UseHttpLogging();
 
         if (app.Environment.IsDevelopment())
         {

diff --git a/bff/samples/Apis/Api/Program.cs b/bff/samples/Apis/Api/Program.cs
@@ -1,45 +1,12 @@
-using System;
 using Api;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Hosting;
-using Serilog;
-using Serilog.Events;
+var builder = WebApplication.CreateBuilder(args);
 
-Console.Title = "Api";
+builder.AddServiceDefaults();
 
-Log.Logger = new LoggerConfiguration()
-    .WriteTo.Console()
-    .CreateBootstrapLogger();
+var app = builder
+    .ConfigureServices()
+    .ConfigurePipeline();
 
-Log.Information("Starting up");
-
-try
-{
-    var builder = WebApplication.CreateBuilder(args);
-    builder.AddServiceDefaults();
-
-    builder.Host.UseSerilog((ctx, lc) => lc
-        .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}")
-        .Enrich.FromLogContext()
-        .MinimumLevel.Debug()
-        .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-        .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
-        .MinimumLevel.Override("System", LogEventLevel.Warning)
-        .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
-        .ReadFrom.Configuration(ctx.Configuration));
-
-    var app = builder
-        .ConfigureServices()
-        .ConfigurePipeline();
-
-    app.Run();
-}
-catch (Exception ex)
-{
-    Log.Fatal(ex, "Unhandled exception");
-}
-finally
-{
-    Log.Information("Shut down complete");
-    Log.CloseAndFlush();
-}
+app.Run();
diff --git a/bff/samples/Bff.DPoP/Bff.DPoP.csproj b/bff/samples/Bff.DPoP/Bff.DPoP.csproj
@@ -7,8 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />    
-        <PackageReference Include="Serilog.AspNetCore" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect"/>    
     </ItemGroup>
 
     <ItemGroup>

diff --git a/bff/samples/Bff.DPoP/Extensions.cs b/bff/samples/Bff.DPoP/Extensions.cs
@@ -12,10 +12,8 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;
-using Serilog;
 using Yarp.ReverseProxy.Configuration;
 
-
 namespace Bff.DPoP;
 
 internal static class Extensions
@@ -152,7 +150,7 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
 
     public static WebApplication ConfigurePipeline(this WebApplication app)
     {
-        app.UseSerilogRequestLogging();
+        app.UseHttpLogging();
         app.UseDeveloperExceptionPage();
 
         app.UseDefaultFiles();

diff --git a/bff/samples/Bff.DPoP/Program.cs b/bff/samples/Bff.DPoP/Program.cs
@@ -2,44 +2,14 @@
 using Bff.DPoP;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Hosting;
-using Serilog;
-using Serilog.Events;
 
 Console.Title = "BFF.DPoP";
 
-Log.Logger = new LoggerConfiguration()
-    .WriteTo.Console()
-    .CreateBootstrapLogger();
+var builder = WebApplication.CreateBuilder(args);
+builder.AddServiceDefaults();
 
-Log.Information("Starting up");
+var app = builder
+    .ConfigureServices()
+    .ConfigurePipeline();
 
-try
-{
-    var builder = WebApplication.CreateBuilder(args);
-    builder.AddServiceDefaults();
-
-    builder.Host.UseSerilog((ctx, lc) => lc
-        .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}")
-        .Enrich.FromLogContext()
-        .MinimumLevel.Debug()
-        .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-        .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
-        .MinimumLevel.Override("System", LogEventLevel.Warning)
-        .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
-        .ReadFrom.Configuration(ctx.Configuration));
-
-    var app = builder
-        .ConfigureServices()
-        .ConfigurePipeline();
-
-    app.Run();
-}
-catch (Exception ex)
-{
-    Log.Fatal(ex, "Unhandled exception");
-}
-finally
-{
-    Log.Information("Shut down complete");
-    Log.CloseAndFlush();
-}
+app.Run();
diff --git a/bff/samples/Bff.EF/Bff.EF.csproj b/bff/samples/Bff.EF/Bff.EF.csproj
@@ -9,7 +9,6 @@
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
-		<PackageReference Include="Serilog.AspNetCore" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/bff/samples/Bff.EF/Extensions.cs b/bff/samples/Bff.EF/Extensions.cs
@@ -6,14 +6,12 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Serilog;
 using UserSessionDb.Migrations.UserSessions;
 
 namespace Bff.EF
 {
     internal static class Extensions
     {
-
         public static WebApplication ConfigureServices(this WebApplicationBuilder builder)
         {
             var services = builder.Services;
@@ -79,7 +77,7 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
 
         public static WebApplication ConfigurePipeline(this WebApplication app)
         {
-            app.UseSerilogRequestLogging();
+            app.UseHttpLogging();
             app.UseDeveloperExceptionPage();
 
             app.UseDefaultFiles();