Create LoggerBeginScopeWithAuditFrame class and use it to add logger.BeginScope calls for Chain AuditedMembers and AggregateHandler AggregateType audited members

Author: woksin

src/Persistence/Wolverine.Marten/AggregateHandlerAttribute.cs

@@ -11,6 +11,7 @@
 using Marten.Schema;
 using Wolverine.Attributes;
 using Wolverine.Configuration;
+using Wolverine.Logging;
 using Wolverine.Marten.Codegen;
 using Wolverine.Marten.Publishing;
 using Wolverine.Runtime.Handlers;
@@ -76,8 +77,6 @@ public override void Modify(IChain chain, GenerationRules rules, IContainer cont
         AggregateIdMember = DetermineAggregateIdMember(AggregateType, CommandType);
         VersionMember = DetermineVersionMember(CommandType);
 
-        
-
         var sessionCreator = MethodCall.For<OutboxedSessionFactory>(x => x.OpenSession(null!));
         chain.Middleware.Add(sessionCreator);
 
@@ -89,7 +88,10 @@ public override void Modify(IChain chain, GenerationRules rules, IContainer cont
             chain.Middleware.Add(new MissingAggregateCheckFrame(AggregateType, CommandType, AggregateIdMember,
                 loader.ReturnVariable!));
         }
-
+        
+        chain.Middleware.Add(new LoggerBeginScopeWithAuditFrame(
+            AuditedMember.GetAllFromType(AggregateType).ToList(),
+            new MemberAccessVariable(loader.ReturnVariable!, typeof(IEventStream<>).MakeGenericType(AggregateType).GetProperty("Aggregate")!)));
         // Use the active document session as an IQuerySession instead of creating a new one
         firstCall.TrySetArgument(new Variable(typeof(IQuerySession), sessionCreator.ReturnVariable!.Usage));
 

src/Wolverine/Logging/LoggerBeginScopeWithAuditFrame.cs

@@ -0,0 +1,49 @@
+using JasperFx.CodeGeneration;
+using JasperFx.CodeGeneration.Frames;
+using JasperFx.CodeGeneration.Model;
+using JasperFx.Core.Reflection;
+using Microsoft.Extensions.Logging;
+using Wolverine.Configuration;
+
+namespace Wolverine.Logging;
+
+internal class LoggerBeginScopeWithAuditFrame : SyncFrame
+{
+    private readonly IReadOnlyList<AuditedMember> _members;
+    private readonly Type? _inputType;
+    private Variable? _logger;
+    private Variable? _withAudit;
+
+    public LoggerBeginScopeWithAuditFrame(IChain chain)
+    {
+        _members = chain.AuditedMembers.AsReadOnly();
+        _inputType = chain.InputType()!;
+    }
+    public LoggerBeginScopeWithAuditFrame(IReadOnlyList<AuditedMember> members, Variable variable)
+    {
+        _members = members;
+        _withAudit = variable;
+    }
+
+    public override IEnumerable<Variable> FindVariables(IMethodVariables chain)
+    {
+        _logger = chain.FindVariable(typeof(ILogger));
+        yield return _logger;
+
+        if (_inputType is null) yield break;
+        _withAudit = chain.FindVariable(_inputType);
+        yield return _withAudit;
+    }
+
+    public override void GenerateCode(GeneratedMethod method, ISourceWriter writer)
+    {
+        if (_members.Count == 0) return;
+        writer.WriteComment("Adding audited members to log context");
+        writer.Write(
+            $"using var disposable_{Guid.NewGuid().ToString().Replace("-", "_")} = {_logger!.Usage}.{nameof(ILogger.BeginScope)}"
+            + $"(new {typeof(Dictionary<string, object>).FullNameInCode()}(){{{string.Join(", ", _members.Select(member => $"{{\"{member.MemberName}\", {_withAudit!.Usage}.{member.Member.Name}}}"))}}});");
+
+        Next?.GenerateCode(method, writer);
+    }
+
+}

src/Wolverine/Runtime/Handlers/HandlerChain.cs

@@ -303,7 +303,8 @@ internal virtual List<Frame> DetermineFrames(GenerationRules rules, IContainer c
 
         if (AuditedMembers.Any())
         {
-            Middleware.Insert(0, new AuditToActivityFrame(this));
+            Middleware.Insert(0, new LoggerBeginScopeWithAuditFrame(this));
+            Middleware.Insert(1, new AuditToActivityFrame(this));
         }
 
         Middleware.Insert(0, messageVariable.Creator!);