Make sure that logger factory is there

Author: alexeyzimarev

src/Core/test/Eventuous.Tests.Persistence.Base/Fixtures/StoreFixtureBase.cs

@@ -2,8 +2,10 @@
 using Bogus;
 using DotNet.Testcontainers.Containers;
 using Eventuous.TestHelpers;
+using Eventuous.TestHelpers.TUnit.Logging;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using TUnit.Core.Interfaces;
 
 namespace Eventuous.Tests.Persistence.Base.Fixtures;
@@ -18,7 +20,7 @@ public abstract class StoreFixtureBase {
     public           TypeMapper      TypeMapper { get; }                        = new();
 }
 
-public abstract partial class StoreFixtureBase<TContainer> : StoreFixtureBase, IStartableFixture where TContainer : DockerContainer {
+public abstract partial class StoreFixtureBase<TContainer>(LogLevel logLevel) : StoreFixtureBase, IStartableFixture where TContainer : DockerContainer {
     public virtual async Task InitializeAsync() {
         Container = CreateContainer();
         await Container.StartAsync();
@@ -28,6 +30,7 @@ public virtual async Task InitializeAsync() {
         Serializer = new DefaultEventSerializer(TestPrimitives.DefaultOptions, TypeMapper);
         services.AddSingleton(Serializer);
         services.AddSingleton(TypeMapper);
+        services.AddLogging(b => ConfigureLogging(b.ForTests(logLevel)).SetMinimumLevel(logLevel));
         SetupServices(services);
 
         Provider   = services.BuildServiceProvider();
@@ -43,9 +46,11 @@ protected async Task Start() {
         var inits = Provider.GetServices<IHostedService>();
 
         foreach (var hostedService in inits) {
-            await hostedService.StartAsync(default);
+            await hostedService.StartAsync(CancellationToken.None);
         }
     }
+    
+    protected virtual ILoggingBuilder ConfigureLogging(ILoggingBuilder builder) => builder;
 
     public virtual async ValueTask DisposeAsync() {
         if (_disposed) return;
@@ -54,7 +59,7 @@ public virtual async ValueTask DisposeAsync() {
         var inits = Provider.GetServices<IHostedService>();
 
         foreach (var hostedService in inits) {
-            await hostedService.StopAsync(default);
+            await hostedService.StopAsync(CancellationToken.None);
         }
 
         await Provider.DisposeAsync();

src/Core/test/Eventuous.Tests.Subscriptions.Base/Fixtures/SubscriptionFixtureBase.cs

@@ -2,7 +2,6 @@
 using Eventuous.Subscriptions;
 using Eventuous.Subscriptions.Checkpoints;
 using Eventuous.Sut.Domain;
-using Eventuous.TestHelpers.TUnit.Logging;
 using Eventuous.Tests.Persistence.Base.Fixtures;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -19,11 +18,9 @@ public abstract class SubscriptionFixtureBase<TContainer, TSubscription, TSubscr
     where TSubscription : EventSubscription<TSubscriptionOptions>
     where TSubscriptionOptions : SubscriptionOptions {
     readonly bool     _autoStart;
-    readonly LogLevel _logLevel;
 
-    protected SubscriptionFixtureBase(bool autoStart = true, LogLevel logLevel = LogLevel.Information) {
+    protected SubscriptionFixtureBase(bool autoStart = true, LogLevel logLevel = LogLevel.Information) : base(logLevel) {
         _autoStart = autoStart;
-        _logLevel  = logLevel;
         TypeMapper.RegisterKnownEventTypes(typeof(BookingEvents.BookingImported).Assembly);
     }
 
@@ -58,7 +55,6 @@ protected override void SetupServices(IServiceCollection services) {
 
         var host = services.First(x => !x.IsKeyedService && x.ImplementationFactory?.GetType() == typeof(Func<IServiceProvider, SubscriptionHostedService>));
         services.Remove(host);
-        services.AddLogging(b => ConfigureLogging(b.ForTests(_logLevel)).SetMinimumLevel(_logLevel));
     }
 
     protected override void GetDependencies(IServiceProvider provider) {

src/Diagnostics/test/Eventuous.Tests.OpenTelemetry/Fixtures/MetricsSubscriptionFixtureBase.cs

@@ -5,6 +5,7 @@
 using Eventuous.Tests.Persistence.Base.Fixtures;
 using Eventuous.Tests.Subscriptions.Base;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 
 namespace Eventuous.Tests.OpenTelemetry.Fixtures;
 
@@ -30,7 +31,7 @@ public abstract class MetricsSubscriptionFixtureBase<TContainer, TProducer, TSub
     // ReSharper disable once StaticMemberInGenericType
     static readonly KeyValuePair<string, string> DefaultTag = new("test", "foo");
 
-    protected MetricsSubscriptionFixtureBase() {
+    protected MetricsSubscriptionFixtureBase() : base(LogLevel.Information) {
         TypeMapper.RegisterKnownEventTypes(typeof(TestEvent).Assembly);
     }
 

src/EventStore/test/Eventuous.Tests.EventStore/Fixtures/StoreFixture.cs

@@ -19,7 +19,11 @@ public class StoreFixture : StoreFixtureBase<EventStoreDbContainer> {
 
     static StoreFixture() => AppContext.SetSwitch("System.Net.SocketsHttpHandler.Http2FlowControl.DisableDynamicWindowSizing", true);
 
-    public StoreFixture() => ActivitySource.AddActivityListener(_listener);
+    public StoreFixture() : this(LogLevel.Information) { }
+
+    public StoreFixture(LogLevel logLevel) : base(logLevel) {
+        ActivitySource.AddActivityListener(_listener);
+    }
 
     protected override void SetupServices(IServiceCollection services) {
         services.AddEventStoreClient(Container.GetConnectionString());

src/EventStore/test/Eventuous.Tests.EventStore/Subscriptions/Fixtures/LegacySubscriptionFixture.cs

@@ -7,9 +7,9 @@
 
 namespace Eventuous.Tests.EventStore.Subscriptions.Fixtures;
 
-public abstract class LegacySubscriptionFixture<T>: IAsyncInitializer, IAsyncDisposable where T : class, IEventHandler {
+public abstract class LegacySubscriptionFixture<T> : IAsyncInitializer, IAsyncDisposable where T : class, IEventHandler {
     protected StreamName          Stream          { get; } = new($"test-{Guid.NewGuid():N}");
-    protected StoreFixture        StoreFixture    { get; } = new();
+    protected StoreFixture        StoreFixture    { get; }
     protected T                   Handler         { get; }
     protected EventStoreProducer  Producer        { get; private set; } = null!;
     protected ILogger             Log             { get; }
@@ -19,6 +19,7 @@ public abstract class LegacySubscriptionFixture<T>: IAsyncInitializer, IAsyncDis
     protected LegacySubscriptionFixture(T handler, StreamName? stream = null, LogLevel logLevel = LogLevel.Information) {
         if (stream is { } s) Stream = s;
 
+        StoreFixture  = new(logLevel);
         LoggerFactory = LoggingExtensions.GetLoggerFactory(logLevel);
         Handler       = handler;
         Log           = LoggerFactory.CreateLogger(GetType());

src/EventStore/test/Eventuous.Tests.EventStore/Subscriptions/Fixtures/PersistentSubscriptionFixture.cs

@@ -19,7 +19,7 @@ public class PersistentSubscriptionFixture<TSubscription, TOptions, THandler>(
     public    THandler           Handler      { get; }              = handler;
     public    EventStoreProducer Producer     { get; private set; } = null!;
     protected ILogger            Log          { get; set; }         = null!;
-    protected StoreFixture       Fixture      { get; }              = new();
+    protected StoreFixture       Fixture      { get; }              = new(logLevel);
     TSubscription                Subscription { get; set; }         = null!;
 
     public ValueTask Start() => Subscription.SubscribeWithLog(Log);

src/EventStore/test/Eventuous.Tests.EventStore/Subscriptions/StreamSubscriptionDeletedEventsTests.cs

@@ -16,7 +16,7 @@ public sealed class StreamSubscriptionDeletedEventsTests {
     readonly LoggingEventListener _listener;
 
     public StreamSubscriptionDeletedEventsTests() {
-        _fixture       = new();
+        _fixture       = new(LogLevel.Information);
         _loggerFactory = LoggingExtensions.GetLoggerFactory();
         _listener      = new(_loggerFactory);
         _fixture.TypeMapper.RegisterKnownEventTypes(typeof(BookingEvents.BookingImported).Assembly);

src/EventStore/test/Eventuous.Tests.EventStore/Subscriptions/StreamSubscriptionWithLinksTests.cs

@@ -16,7 +16,7 @@ public class StreamSubscriptionWithLinksTests : StoreFixture {
     readonly List<Checkpoint> _checkpoints = [];
     readonly string           _prefix      = $"{Faker.Commerce.ProductAdjective()}{Faker.Commerce.Product()}";
 
-    public StreamSubscriptionWithLinksTests() {
+    public StreamSubscriptionWithLinksTests() : base(LogLevel.Information) {
         AutoStart = false;
         TypeMapper.AddType<TestEvent>(TestEvent.TypeName);
     }

src/EventStore/test/Eventuous.Tests.EventStore/Subscriptions/SubscriptionIgnoredMessagesTests.cs

@@ -14,7 +14,7 @@ public class SubscriptionIgnoredMessagesTests : StoreFixture {
     ICheckpointStore    _checkpointStore = null!;
     TestEventHandler    _handler         = null!;
 
-    public SubscriptionIgnoredMessagesTests() {
+    public SubscriptionIgnoredMessagesTests() : base(LogLevel.Information) {
         AutoStart = false;
     }
 

src/Postgres/test/Eventuous.Tests.Postgres/Store/StoreFixture.cs

@@ -8,7 +8,7 @@
 namespace Eventuous.Tests.Postgres.Store;
 
 // ReSharper disable once PartialTypeWithSinglePart
-public partial class StoreFixture : StoreFixtureBase<PostgreSqlContainer> {
+public partial class StoreFixture() : StoreFixtureBase<PostgreSqlContainer>(LogLevel.Information) {
     protected NpgsqlDataSource DataSource { get; private set; } = null!;
 
     readonly string _schemaName = GetSchemaName();