Use AsyncLocal to find the correct ModuleLogger (#535)

* Use AsyncLocal to find the correct ModuleLogger

* Git pull

* Retry

Author: thomhurst

src/ModularPipelines.Build/GitHelpers.cs

@@ -63,6 +63,8 @@ await context.Git().Commands
     public static async Task CommitAndPush(IPipelineContext context, string? branchToPushTo, string message, string token,
         CancellationToken cancellationToken)
     {
+        await context.Git().Commands.Pull(token: cancellationToken);
+
         await context.Git().Commands.Add(new GitAddOptions
         {
             All = true,

src/ModularPipelines.Build/Modules/UpdateReleaseNotesModule.cs

@@ -108,6 +108,7 @@ private async Task<string> GetDependabotCommits()
         );
 
         return $"""
+                
                 ## Dependabot
 
                 {splitCommits}

src/ModularPipelines.Build/ReleaseNotes.md

@@ -1,4 +1 @@
-- Show exception (if one was thrown) within the GitHub markdown summary
-
-# Breaking
-- GitVersion.yml has been updated to v6. If using the `GitVersionInformation` model, some properties may have been added/removed/changed. 
+- Use `AsyncLocal` to find the correct `IModuleLogger` when using the `IModuleLoggerProvider` helper.

src/ModularPipelines/Engine/ModuleExecutor.cs

@@ -6,6 +6,7 @@
 using ModularPipelines.Attributes;
 using ModularPipelines.Exceptions;
 using ModularPipelines.Extensions;
+using ModularPipelines.Logging;
 using ModularPipelines.Models;
 using ModularPipelines.Modules;
 using ModularPipelines.Options;
@@ -150,7 +151,7 @@ private Task<ModuleBase> StartModule(ModuleBase module)
     {
         lock (_moduleDictionaryLock)
         {
-            return _moduleExecutionTasks.GetOrAdd(module, async @base =>
+            return _moduleExecutionTasks.GetOrAdd(module, @base => Task.Run(async () =>
             {
                 _logger.LogDebug("Starting Module {Module}", module.GetType().Name);
 
@@ -163,6 +164,8 @@ private Task<ModuleBase> StartModule(ModuleBase module)
 
                 try
                 {
+                    ModuleLogger.Values.Value = module.Context.Logger;
+                    
                     await _pipelineSetupExecutor.OnBeforeModuleStartAsync(module);
 
                     await module.StartInternal();
@@ -180,7 +183,7 @@ private Task<ModuleBase> StartModule(ModuleBase module)
                         await _moduleDisposer.DisposeAsync(module);
                     }
                 }
-            });
+            }));
         }
     }
 

src/ModularPipelines/Logging/ModuleLogger.cs

@@ -7,10 +7,12 @@ namespace ModularPipelines.Logging;
 
 internal abstract class ModuleLogger : IModuleLogger
 {
+    internal static readonly AsyncLocal<IModuleLogger> Values = new();
+
     protected static readonly object DisposeLock = new();
     protected static readonly object LogLock = new();
     protected Exception? _exception;
-
+    
     internal DateTime LastLogWritten { get; set; } = DateTime.MinValue;
 
     public abstract void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter);
@@ -34,7 +36,6 @@ internal class ModuleLogger<T> : ModuleLogger, IModuleLogger, ILogger<T>
 {
     private readonly ILogger<T> _defaultLogger;
     private readonly ISecretObfuscator _secretObfuscator;
-    private readonly ISecretProvider _secretProvider;
     private readonly IConsoleWriter _consoleWriter;
     private readonly ISmartCollapsableLoggingStringBlockProvider _collapsableLoggingStringBlockProvider;
 
@@ -46,13 +47,11 @@ internal class ModuleLogger<T> : ModuleLogger, IModuleLogger, ILogger<T>
     public ModuleLogger(ILogger<T> defaultLogger,
         IModuleLoggerContainer moduleLoggerContainer,
         ISecretObfuscator secretObfuscator,
-        ISecretProvider secretProvider,
         IConsoleWriter consoleWriter,
         ISmartCollapsableLoggingStringBlockProvider collapsableLoggingStringBlockProvider)
     {
         _defaultLogger = defaultLogger;
         _secretObfuscator = secretObfuscator;
-        _secretProvider = secretProvider;
         _consoleWriter = consoleWriter;
         _collapsableLoggingStringBlockProvider = collapsableLoggingStringBlockProvider;
         moduleLoggerContainer.AddLogger(this);

src/ModularPipelines/Logging/ModuleLoggerProvider.cs

@@ -30,6 +30,11 @@ public IModuleLogger GetLogger()
         {
             return _moduleLogger;
         }
+
+        if (ModuleLogger.Values.Value != null)
+        {
+            return _moduleLogger = ModuleLogger.Values.Value;
+        }
 
         var stackFrames = new StackTrace().GetFrames().ToList();
 

test/ModularPipelines.UnitTests/RetryTests.cs

@@ -6,6 +6,7 @@
 
 namespace ModularPipelines.UnitTests;
 
+[Retry(3)]
 public class RetryTests : TestBase
 {
     private class SuccessModule : Module