Touchup logging

Author: Mpdreamz

src/Elastic.Documentation.ServiceDefaults/AppDefaultsExtensions.cs

@@ -46,14 +46,21 @@ public static TBuilder AddAppDefaults<TBuilder>(this TBuilder builder, ref strin
 				_ = s.AddSingleton(p.CreateVersionConfiguration());
 				configure?.Invoke(s, p);
 			});
+		_ = builder.Services.AddAppLogging(logLevel);
+
+		return builder.AddServiceDefaults();
+	}
+
+	public static TServiceCollection AddAppLogging<TServiceCollection>(this TServiceCollection services, LogLevel logLevel)
+		where TServiceCollection : IServiceCollection
+	{
 		services.TryAddEnumerable(ServiceDescriptor.Singleton<ConsoleFormatter, CondensedConsoleFormatter>());
 		_ = services.AddLogging(x => x
 			.ClearProviders()
 			.SetMinimumLevel(logLevel)
 			.AddConsole(c => c.FormatterName = "condensed")
 		);
-
-		return builder.AddServiceDefaults();
+		return services;
 	}
 
 	private static void ProcessCommandLineArguments(ref string[] args, ref LogLevel defaultLogLevel)

tests-integration/Elastic.Assembler.IntegrationTests/AssembleFixture.cs

@@ -4,7 +4,10 @@
 
 using Aspire.Hosting;
 using Aspire.Hosting.Testing;
+using Elastic.Documentation.ServiceDefaults;
 using FluentAssertions;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 [assembly: CaptureConsole, AssemblyFixture(typeof(Elastic.Assembler.IntegrationTests.AssembleFixture))]
 
@@ -19,6 +22,7 @@ public class AssembleFixture : IAsyncLifetime
 	public async ValueTask InitializeAsync()
 	{
 		var builder = await DistributedApplicationTestingBuilder.CreateAsync<Projects.Elastic_Documentation_Aspire>();
+		_ = builder.Services.AddAppLogging(LogLevel.Information);
 		DistributedApplication = await builder.BuildAsync();
 		await DistributedApplication.StartAsync();
 	}
@@ -34,7 +38,7 @@ public async ValueTask DisposeAsync()
 
 }
 
-public class DatabaseTestClass1(AssembleFixture fixture)
+public class DatabaseTestClass1(AssembleFixture fixture, ITestOutputHelper output)
 {
 	[Fact]
 	public async Task X()
@@ -43,6 +47,7 @@ public async Task X()
 			.WaitForResourceHealthyAsync("DocsBuilderServeStatic", cancellationToken: TestContext.Current.CancellationToken);
 		var client = fixture.DistributedApplication.CreateHttpClient("DocsBuilderServeStatic", "http");
 		var root = await client.GetStringAsync("/", TestContext.Current.CancellationToken);
+		output.WriteLine(root);
 		_ = root.Should().NotBeNullOrEmpty();
 	}