Including regular disposal due to upstream callers..

Author: soenneker

src/Serilog.Sinks.XUnit.Injectable/Abstract/IInjectableTestOutputSink.cs

@@ -11,7 +11,7 @@ namespace Serilog.Sinks.XUnit.Injectable.Abstract;
 /// A sink to direct Serilog output to the XUnit test output via dependency injection <para/>
 /// Use as a Singleton
 /// </summary>
-public interface IInjectableTestOutputSink : ILogEventSink, IAsyncDisposable
+public interface IInjectableTestOutputSink : ILogEventSink, IAsyncDisposable, IDisposable
 {
     /// <summary>
     ///     Call this as soon as you have a new instance of the testOutputHelper (usually at the beginning of a xUnit test

src/Serilog.Sinks.XUnit.Injectable/InjectableTestOutputSink.cs

@@ -3,9 +3,11 @@
 using Serilog.Sinks.XUnit.Injectable.Abstract;
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Channels;
 using System.Threading.Tasks;
+using Soenneker.Extensions.Task;
+using Soenneker.Extensions.ValueTask;
+using Soenneker.Utils.AtomicBool;
 using Soenneker.Utils.ReusableStringWriter;
 using Xunit;
 using Xunit.Sdk;
@@ -14,14 +16,14 @@
 namespace Serilog.Sinks.XUnit.Injectable;
 
 /// <inheritdoc cref="IInjectableTestOutputSink"/>
-public sealed class InjectableTestOutputSink : IInjectableTestOutputSink
+public sealed class InjectableTestOutputSink : IInjectableTestOutputSink, IAsyncDisposable, IDisposable
 {
     private const string _defaultTemplate = "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj}{Exception}";
 
     private readonly MessageTemplateTextFormatter _fmt;
 
     private readonly Channel<LogEvent> _ch = Channel.CreateUnbounded<LogEvent>(new UnboundedChannelOptions
-        {SingleReader = true, SingleWriter = false, AllowSynchronousContinuations = false});
+        { SingleReader = true, SingleWriter = false, AllowSynchronousContinuations = false });
 
     private readonly Task _readerTask;
 
@@ -34,32 +36,31 @@ public sealed class InjectableTestOutputSink : IInjectableTestOutputSink
     // Only the reader touches this; safe without locks.
     private readonly Queue<LogEvent> _pending = new();
 
-    private int _disposed;
+    private readonly AtomicBool _disposed = new();
 
     public InjectableTestOutputSink(string outputTemplate = _defaultTemplate, IFormatProvider? formatProvider = null)
     {
         _fmt = new MessageTemplateTextFormatter(outputTemplate, formatProvider);
-
         _readerTask = Task.Run(ReadLoop);
     }
 
     public void Inject(ITestOutputHelper helper, IMessageSink? sink = null)
     {
         ArgumentNullException.ThrowIfNull(helper);
-
         _helper = helper;
         _sink = sink;
     }
 
     public void Emit(LogEvent logEvent)
     {
-        if (Volatile.Read(ref _disposed) == 0)
+        if (_disposed.IsFalse)
             _ch.Writer.TryWrite(logEvent);
     }
 
     private async Task ReadLoop()
     {
-        await foreach (LogEvent evt in _ch.Reader.ReadAllAsync().ConfigureAwait(false))
+        await foreach (LogEvent evt in _ch.Reader.ReadAllAsync()
+                           .ConfigureAwait(false))
         {
             ITestOutputHelper? helper = _helper; // volatile read
 
@@ -69,7 +70,7 @@ private async Task ReadLoop()
                 continue;
             }
 
-            // first, flush any backlog that accumulated pre‑inject
+            // first, flush any backlog that accumulated pre-inject
             while (_pending.Count > 0)
             {
                 Write(_pending.Dequeue(), helper);
@@ -95,22 +96,42 @@ private void Write(LogEvent evt, ITestOutputHelper helper)
         {
             // Helper became invalid (test finished) – cache the event
             _helper = null;
-
             _pending.Enqueue(evt);
         }
     }
 
     public async ValueTask DisposeAsync()
     {
-        if (Interlocked.Exchange(ref _disposed, 1) != 0)
+        if (!_disposed.TrySetTrue())
             return;
 
         // 1) Tell the reader no more items are coming
         _ch.Writer.TryComplete();
 
         // 2) Let the reader finish formatting & flushing
-        await _readerTask.ConfigureAwait(false);
+        await _readerTask.NoSync();
+
+        await _sw.DisposeAsync()
+            .NoSync();
+    }
+
+    public void Dispose()
+    {
+        if (!_disposed.TrySetTrue())
+            return;
+
+        _ch.Writer.TryComplete();
+
+        try
+        {
+            _readerTask.GetAwaiter()
+                .GetResult();
+        }
+        catch
+        {
+            // swallow during teardown
+        }
 
-        await _sw.DisposeAsync().ConfigureAwait(false);
+        _sw.Dispose();
     }
 }

src/Serilog.Sinks.XUnit.Injectable/Serilog.Sinks.XUnit.Injectable.csproj

@@ -42,6 +42,9 @@
 
     <ItemGroup>
         <PackageReference Include="Serilog" Version="4.3.0" />
+        <PackageReference Include="Soenneker.Extensions.Task" Version="3.0.105" />
+        <PackageReference Include="Soenneker.Extensions.ValueTask" Version="3.0.95" />
+        <PackageReference Include="Soenneker.Utils.AtomicBool" Version="3.0.8" />
         <PackageReference Include="Soenneker.Utils.ReusableStringWriter" Version="3.0.5" />
         <PackageReference Include="xunit.v3.extensibility.core" Version="3.0.1" />
     </ItemGroup>

test/Sinks/BlockingCollectionInjectableTestOutputSink.cs

@@ -115,4 +115,10 @@ public async ValueTask DisposeAsync()
 
         _queue.Dispose();
     }
+
+    public void Dispose()
+    {
+        _queue.Dispose();
+        _consumerTask.Dispose();
+    }
 }

test/Sinks/ChannelInjectableTestOutputSink.cs

@@ -121,4 +121,11 @@ public async ValueTask DisposeAsync()
             await _sw.DisposeAsync().ConfigureAwait(false);
         }
     }
+
+    public void Dispose()
+    {
+        _readerTask.Dispose();
+        _cts.Dispose();
+        _sw.Dispose();
+    }
 }

test/Sinks/ConcurrentInjectableTestOutputSink.cs

@@ -95,4 +95,9 @@ public ValueTask DisposeAsync()
     {
         return ValueTask.CompletedTask;
     }
+
+    public void Dispose()
+    {
+        // TODO release managed resources here
+    }
 }

test/Sinks/OriginalInjectableTestOutputSink.cs

@@ -91,4 +91,9 @@ public ValueTask DisposeAsync()
     {
         return ValueTask.CompletedTask;
     }
+
+    public void Dispose()
+    {
+        // TODO release managed resources here
+    }
 }

test/Sinks/QueueInjectableTestOutputSink.cs

@@ -91,4 +91,9 @@ public ValueTask DisposeAsync()
     {
         return ValueTask.CompletedTask;
     }
+
+    public void Dispose()
+    {
+        // TODO release managed resources here
+    }
 }