added LogScope to all MSFT.EXT.Logger output

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
 

src/Akka.Hosting.API.Tests/verify/CoreApiSpec.ApproveTestKit.verified.txt

@@ -9,8 +9,7 @@ namespace Akka.Hosting.TestKit.Internals
     public class XUnitLogger : Microsoft.Extensions.Logging.ILogger
     {
         public XUnitLogger(string category, Xunit.Abstractions.ITestOutputHelper helper, Microsoft.Extensions.Logging.LogLevel logLevel) { }
-        public System.IDisposable BeginScope<TState>(TState state)
-            where TState :  notnull { }
+        public System.IDisposable BeginScope<TState>(TState state) { }
         public bool IsEnabled(Microsoft.Extensions.Logging.LogLevel logLevel) { }
         public void Log<TState>(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, TState state, System.Exception? exception, System.Func<TState, System.Exception?, string> formatter) { }
     }

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;
@@ -58,9 +73,9 @@ public bool IsEnabled(LogLevel logLevel)
             };
         }
 
-        public IDisposable BeginScope<TState>(TState state) where TState : notnull
+        public IDisposable BeginScope<TState>(TState state) 
         {
-            throw new NotImplementedException();
+            return NullScope.Instance;
         }
 
         private static bool TryFormatMessage<TState>(

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>

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;

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;

src/Akka.Hosting/Logging/LoggerFactoryLogger.cs

@@ -62,7 +62,11 @@ protected override bool Receive(object message)
 
         protected virtual void Log(LogEvent log, ActorPath path)
         {
-            _akkaLogger.Log<LogEvent>(GetLogLevel(log.LogLevel()), new EventId(), log, log.Cause, (@event, exception) => @event.ToString());
+            using (_akkaLogger.BeginScope("{AkkaLogSource} {AkkaLogClass}", log.LogSource, log.LogClass))
+            {
+                _akkaLogger.Log(GetLogLevel(log.LogLevel()), new EventId(), log, log.Cause, (@event, exception) => @event.ToString());    
+            }
+
         }
 
         private static LogLevel GetLogLevel(Event.LogLevel level)

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