cleaning up XunitLogger instances

Aaronontheweb · Jul 17, 2024 · f009298 · f009298
1 parent ddd5c1f
commit f009298
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 131 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,7 @@
-## [1.5.25] / 17 June 2024
+## [1.5.26] / 17 July 2024
 
-* [Update Akka.NET to 1.5.25](https://github.com/akkadotnet/akka.net/releases/tag/1.5.25), which resolves a critical bug: [Akka.Logging: v1.5.21 appears to have truncated log source, timestamps, etc from all log messages ](https://github.com/akkadotnet/akka.net/issues/7255)
+* [Update Akka.NET to 1.5.26](https://github.com/akkadotnet/akka.net/releases/tag/1.5.26)
+* Added scopes to all Microsoft.Extensions.Logging output, for better semantic logging support.
 
 ## [1.5.24] / 10 June 2024
 

diff --git a/src/Akka.Hosting.TestKit/Internals/XUnitLogger.cs b/src/Akka.Hosting.TestKit/Internals/XUnitLogger.cs
@@ -7,6 +7,21 @@ namespace Akka.Hosting.TestKit.Internals
     public class XUnitLogger: ILogger
     {
         private const string NullFormatted = "[null]";
+
+        internal sealed class NullScope : IDisposable
+        {
+            public static NullScope Instance { get; } = new NullScope();
+
+            private NullScope()
+            {
+            }
+
+            /// <inheritdoc />
+            public void Dispose()
+            {
+            }
+        }
+
 
         private readonly string _category;
         private readonly ITestOutputHelper _helper;
@@ -60,7 +75,7 @@ public bool IsEnabled(LogLevel logLevel)
 
         public IDisposable BeginScope<TState>(TState state) where TState : notnull
         {
-            throw new NotImplementedException();
+            return NullScope.Instance;
         }
 
         private static bool TryFormatMessage<TState>(

diff --git a/src/Akka.Hosting.Tests/Akka.Hosting.Tests.csproj b/src/Akka.Hosting.Tests/Akka.Hosting.Tests.csproj
@@ -31,4 +31,10 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Akka.Hosting.TestKit">
+      <HintPath>bin\Debug\net6.0\Akka.Hosting.TestKit.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>
diff --git a/src/Akka.Hosting.Tests/ExtensionsSpecs.cs b/src/Akka.Hosting.Tests/ExtensionsSpecs.cs
@@ -8,8 +8,7 @@
 using System.Threading.Tasks;
 using Akka.Actor;
 using Akka.Configuration;
-using Akka.Event;
-using Akka.TestKit.Xunit2.Internals;
+using Akka.Hosting.TestKit.Internals;
 using FluentAssertions;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

diff --git a/src/Akka.Hosting.Tests/Logging/LogMessageFormatterSpec.cs b/src/Akka.Hosting.Tests/Logging/LogMessageFormatterSpec.cs
@@ -12,6 +12,7 @@
 using Akka.Actor;
 using Akka.Configuration;
 using Akka.Event;
+using Akka.Hosting.TestKit.Internals;
 using FluentAssertions;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

diff --git a/src/Akka.Hosting.Tests/XUnitLogger.cs b/src/Akka.Hosting.Tests/XUnitLogger.cs
diff --git a/src/Akka.Hosting.Tests/XUnitLoggerProvider.cs b/src/Akka.Hosting.Tests/XUnitLoggerProvider.cs
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,8 +2,9 @@
     <PropertyGroup>
         <Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
         <Authors>Akka.NET Team</Authors>
-        <VersionPrefix>1.5.19</VersionPrefix>
-        <PackageReleaseNotes>• [Update Akka.NET to 1.5.19](https://github.com/akkadotnet/akka.net/releases/tag/1.5.19)</PackageReleaseNotes>
+        <VersionPrefix>1.5.26</VersionPrefix>
+        <PackageReleaseNotes>• [Update Akka.NET to 1.5.26](https://github.com/akkadotnet/akka.net/releases/tag/1.5.26)
+• Added scopes to all Microsoft.Extensions.Logging output%2C for better semantic logging support.</PackageReleaseNotes>
         <PackageIcon>akkalogo.png</PackageIcon>
         <PackageProjectUrl>
             https://github.com/akkadotnet/Akka.Hosting