Akka.Event: restore missing log data

build-system/azure-pipeline.template.yaml

@@ -55,10 +55,19 @@ jobs:
           contents: '**'
           targetFolder: $(Build.ArtifactStagingDirectory)
           continueOnError: boolean  # 'true' if future steps should run even if this step fails; defaults to 'false'
+
+      - task: CopyFiles@2
+        inputs:
+          SourceFolder: '$(Build.SourcesDirectory)'
+          Contents: '**/*.received.*'
+          TargetFolder: '$(Build.ArtifactStagingDirectory)/verify'
+        displayName: 'Copy .received. files to artifact staging directory'
+
       - task: PublishBuildArtifacts@1
         inputs:
           pathtoPublish: '$(Build.ArtifactStagingDirectory)'
           artifactName: ${{ parameters.artifactName }}
+
       - script: 'echo 1>&2'
         failOnStderr: true
         displayName: 'If above is partially succeeded, then fail'

build-system/pr-validation.yaml

@@ -80,10 +80,12 @@ jobs:
           contents: "*"
           targetFolder: $(Build.ArtifactStagingDirectory)
           continueOnError: boolean # 'true' if future steps should run even if this step fails; defaults to 'false'
+
       - task: PublishBuildArtifacts@1
         inputs:
           pathtoPublish: $(Build.ArtifactStagingDirectory)
           artifactName: "incrementalistOutput-$(Build.BuildId)"
+
       - script: "echo 1>&2"
         failOnStderr: true
         displayName: "If above is partially succeeded, then fail"

build.fsx

@@ -55,7 +55,7 @@ let runIncrementally = hasBuildParam "incremental"
 let incrementalistReport = output @@ "incrementalist.txt"
 
 // Configuration values for tests
-let testNetFrameworkVersion = "net471"
+let testNetFrameworkVersion = "net48"
 let testNetVersion = "net8.0"
 
 Target "Clean" (fun _ ->

src/Directory.Build.props

@@ -29,7 +29,7 @@
     <BenchmarkDotNetVersion>0.13.12</BenchmarkDotNetVersion>
     <NetTestVersion>net8.0</NetTestVersion>
     <FsharpVersion>6.0.5</FsharpVersion>
-    <NetFrameworkTestVersion>net471</NetFrameworkTestVersion>
+    <NetFrameworkTestVersion>net48</NetFrameworkTestVersion>
     <NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
     <NetLibVersion>net6.0</NetLibVersion>
     <FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>

src/contrib/serializers/Akka.Serialization.Hyperion.Tests/HyperionConfigTests.cs

@@ -204,7 +204,7 @@ public void Hyperion_serializer_should_read_cross_platform_package_name_override
                 Assert.NotEmpty(overrides);
                 var @override = overrides[0];
 
-#if NET471
+#if NET48
                 Assert.Equal("acc", @override("abc"));
                 Assert.Equal("bcd", @override("bcd"));
 #elif NETCOREAPP3_1

src/contrib/serializers/Akka.Serialization.Hyperion.Tests/HyperionSerializerSetupSpec.cs

@@ -225,7 +225,7 @@ public static IEnumerable<object[]> DangerousObjectFactory()
                 yield return new object[]{ Serialize(WindowsIdentity.GetAnonymous()), typeof(WindowsIdentity) };
                 yield return new object[]{ Serialize(new WindowsPrincipal(WindowsIdentity.GetAnonymous())), typeof(WindowsPrincipal)};
             }
-#if NET471
+#if NET48
             yield return new object[]{ Serialize(new Process()), typeof(Process)};
 #endif
             yield return new object[]{ Serialize(new ClaimsIdentity()), typeof(ClaimsIdentity)};

src/core/Akka.API.Tests/Akka.API.Tests.csproj

@@ -30,8 +30,8 @@
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
     <PackageReference Include="PublicApiGenerator" Version="9.3.0" />
-    <PackageReference Include="Verify.Xunit" Version="20.8.2" />
-    <PackageReference Include="Verify.DiffPlex" Version="2.2.1" />
+    <PackageReference Include="Verify.Xunit" Version="25.0.2" />
+    <PackageReference Include="Verify.DiffPlex" Version="3.0.0" />
   </ItemGroup>
 
 </Project>

src/core/Akka.API.Tests/CoreAPISpec.cs

@@ -5,9 +5,6 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-using System;
-using System.IO;
-using System.Reflection;
 using System.Threading.Tasks;
 using Akka.Actor;
 using Akka.Cluster;
@@ -28,7 +25,6 @@
 
 namespace Akka.API.Tests
 {
-    [UsesVerify]
     public class CoreAPISpec
     {
         static Task VerifyAssembly<T>()

src/core/Akka.API.Tests/LogFormatSpec.cs

@@ -0,0 +1,132 @@
+// -----------------------------------------------------------------------
+//  <copyright file="LogFormatSpec.cs" company="Akka.NET Project">
+//      Copyright (C) 2009-2024 Lightbend Inc. <http://www.lightbend.com>
+//      Copyright (C) 2013-2024 .NET Foundation <https://github.com/akkadotnet/akka.net>
+//  </copyright>
+// -----------------------------------------------------------------------
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Akka.Actor;
+using Akka.Actor.Setup;
+using Akka.Configuration;
+using Akka.Event;
+using VerifyXunit;
+using Xunit;
+
+namespace Akka.API.Tests;
+
+/// <summary>
+/// Regression test for https://github.com/akkadotnet/akka.net/issues/7255
+///
+/// Need to assert that the default log format is still working as expected.
+/// </summary>
+public sealed class DefaultLogFormatSpec : TestKit.Xunit2.TestKit
+{
+    public DefaultLogFormatSpec() : base(CustomLoggerSetup())
+    {
+        _logger = (CustomLogger)Sys.Settings.StdoutLogger;
+    }
+
+    private readonly CustomLogger _logger;
+
+    public class CustomLogger : StandardOutLogger
+    {
+        protected override void Log(object message)
+        {
+            base.Log(message); // log first, just so we can be sure it's hit STDOUT
+            if (message is LogEvent e)
+            {
+                _events.Add(e);
+            }
+
+        }
+
+        private readonly ConcurrentBag<LogEvent> _events = new();
+        public IReadOnlyCollection<LogEvent> Events => _events;
+    }
+
+    public static ActorSystemSetup CustomLoggerSetup()
+    {
+        var hocon = @$"
+            akka.loglevel = DEBUG
+            akka.stdout-logger-class = ""{typeof(CustomLogger).AssemblyQualifiedName}""";
+        var bootstrapSetup = BootstrapSetup.Create().WithConfig(ConfigurationFactory.ParseString(hocon));
+        return ActorSystemSetup.Create(bootstrapSetup);
+    }
+
+    public class OutputRedirector : IDisposable
+    {
+        private readonly TextWriter _originalOutput;
+        private readonly StreamWriter _writer;
+
+        public OutputRedirector(string filePath)
+        {
+            _originalOutput = Console.Out;
+            _writer = new StreamWriter(filePath) { AutoFlush = true };
+            Console.SetOut(_writer);
+        }
+
+        public void Dispose()
+        {
+            Console.SetOut(_originalOutput);
+            _writer.Dispose();
+        }
+    }
+
+    [Fact]
+    public async Task ShouldUseDefaultLogFormat()
+    {
+        // arrange
+        var filePath = Path.GetTempFileName();
+
+        // act
+        using (new OutputRedirector(filePath))
+        {
+            Sys.Log.Debug("This is a test {0} {1}", 1, "cheese");
+            Sys.Log.Info("This is a test {0}", 1);
+            Sys.Log.Warning("This is a test {0}", 1);
+            Sys.Log.Error("This is a test {0}", 1);
+
+            // force all logs to be received
+            await AwaitConditionAsync(() =>
+            {
+                return _logger.Events.Count(c => c.Message.ToString()!.Contains("This is a test")) == 4;
+            });
+        }
+
+        // assert
+        // ReSharper disable once MethodHasAsyncOverload
+        var text = File.ReadAllText(filePath);
+
+        // need to sanitize the thread id
+        text = SanitizeDateTime(text);
+        text = SanitizeThreadNumber(text);
+
+        await Verifier.Verify(text);
+    }
+
+    static string SanitizeThreadNumber(string log)
+    {
+        string pattern = @"(\[Thread )\d+(\])";
+        string replacement = "[Thread 0001]";
+        string result = Regex.Replace(log, pattern, replacement);
+        return result;
+    }
+
+    static string SanitizeDateTime(string logs, string replacement = "DateTime")
+    {
+        // Regular expression to match the datetime
+        string pattern = @"\[\d{2}/\d{2}/\d{4} \d{2}:\d{2}:\d{2}\.\d{3}Z\]";
+
+        // Replace all occurrences of the datetime with the constant value
+        string result = Regex.Replace(logs, pattern, $"[{replacement}]", RegexOptions.Multiline);
+
+        return result;
+    }
+}

src/core/Akka.API.Tests/ModuleInit.cs

@@ -14,6 +14,7 @@ public static class ModuleInit
     [ModuleInitializer]
     public static void Init()
     {
+        VerifyDiffPlex.Initialize();
         VerifierSettings.ScrubLinesContaining("[assembly: ReleaseDateAttribute(");
         Verifier.UseProjectRelativeDirectory("verify");
         VerifierSettings.UniqueForRuntime();

src/core/Akka.API.Tests/verify/DefaultLogFormatSpec.ShouldUseDefaultLogFormat.DotNet.verified.txt

@@ -0,0 +1,4 @@
+[DEBUG][DateTime][Thread 0001][ActorSystem(test)] This is a test 1 cheese
+[INFO][DateTime][Thread 0001][ActorSystem(test)] This is a test 1
+[WARNING][DateTime][Thread 0001][ActorSystem(test)] This is a test 1
+[ERROR][DateTime][Thread 0001][ActorSystem(test)] This is a test 1

src/core/Akka.API.Tests/verify/DefaultLogFormatSpec.ShouldUseDefaultLogFormat.Net.verified.txt

@@ -0,0 +1,4 @@
+[DEBUG][DateTime][Thread 0001][ActorSystem(test)] This is a test 1 cheese
+[INFO][DateTime][Thread 0001][ActorSystem(test)] This is a test 1
+[WARNING][DateTime][Thread 0001][ActorSystem(test)] This is a test 1
+[ERROR][DateTime][Thread 0001][ActorSystem(test)] This is a test 1

src/core/Akka.Docs.Tests/Streams/RestartDocTests.cs

@@ -16,6 +16,7 @@
 
 namespace DocsExamples.Streams
 {
+#if NETCOREAPP
     public class RestartDocTests : TestKit
     {
         private ActorMaterializer Materializer { get; }
@@ -65,4 +66,5 @@ public void Restart_stages_should_demonstrate_a_restart_with_backoff_source()
             #endregion
         }
     }
+#endif
 }

src/core/Akka.Remote.Tests/Transport/DotNettySslSupportSpec.cs

@@ -162,9 +162,7 @@ public DotNettySslSupportSpec(ITestOutputHelper output) : base(TestConfig(ValidC
         }
 
         private string Thumbprint { get; set; }
-
-
-#if !NET471
+
         [Fact]
         public async Task Secure_transport_should_be_possible_between_systems_sharing_the_same_certificate()
         {
@@ -181,7 +179,6 @@ await AwaitAssertAsync(async () =>
                 await probe.ExpectMsgAsync("hello", TimeSpan.FromSeconds(3));
             }, TimeSpan.FromSeconds(30), TimeSpan.FromMilliseconds(100));
         }
-#endif
 
         [LocalFact(SkipLocal = "Racy in Azure AzDo CI/CD")]
         public async Task Secure_transport_should_be_possible_between_systems_using_thumbprint()
@@ -222,7 +219,7 @@ await Assert.ThrowsAsync<RemoteTransportException>(async () =>
             });
         }
 
-        #if !NET471
+        #if !NET48 // has text formatting issues on .NET Framework
         [Fact]
         public async Task If_EnableSsl_configuration_is_true_but_not_valid_certificate_is_provided_than_ArgumentNullException_should_be_thrown()
         {

src/core/Akka/Event/LogFilter.cs

@@ -191,7 +191,7 @@ public virtual bool ShouldTryKeepMessage(LogEvent evt, out string expandedLogMes
         else
         {
             // allocate the message just once
-            var nullCheck = evt.Message.ToString();
+            var nullCheck = evt.ToString();
 
             if (nullCheck == null)
                 return false; // no message to filter
@@ -225,7 +225,7 @@ private EmptyLogFilterEvaluator() : base(Array.Empty<LogFilterBase>())
 
         public override bool ShouldTryKeepMessage(LogEvent evt, out string expandedLogMessage)
         {
-            expandedLogMessage = evt.Message.ToString()!;
+            expandedLogMessage = evt.ToString()!;
             return true;
         }
     }