Extend logging categories to TaskOrchestrationContextWrapper (WIP)

Co-authored-by: YunchuWang <[email protected]>

Author: Copilot

src/Worker/Grpc/DualCategoryLogger.cs …orker/Core/Logging/DualCategoryLogger.cssrc/Worker/Grpc/DualCategoryLogger.cs renamed to src/Worker/Core/Logging/DualCategoryLogger.cs src/Worker/Grpc/DualCategoryLogger.cs renamed to src/Worker/Core/Logging/DualCategoryLogger.cs

@@ -3,17 +3,18 @@
 
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.DurableTask.Worker.Grpc;
+namespace Microsoft.DurableTask.Worker;
 
 /// <summary>
 /// A logger wrapper that emits logs to both a primary (new) category and an optional legacy category.
 /// </summary>
 /// <remarks>
 /// This logger is used to maintain backward compatibility while transitioning to more specific logging categories.
 /// When legacy categories are enabled, log messages are written to both the new specific category
-/// (e.g., "Microsoft.DurableTask.Worker.Grpc") and the legacy broad category (e.g., "Microsoft.DurableTask").
+/// (e.g., "Microsoft.DurableTask.Worker.Grpc" or "Microsoft.DurableTask.Worker.Orchestration")
+/// and the legacy broad category (e.g., "Microsoft.DurableTask").
 /// </remarks>
-sealed class DualCategoryLogger : ILogger
+internal sealed class DualCategoryLogger : ILogger
 {
     readonly ILogger primaryLogger;
     readonly ILogger? legacyLogger;

src/Worker/Core/Shims/TaskOrchestrationContextWrapper.cs

@@ -63,7 +63,7 @@ public TaskOrchestrationContextWrapper(
         this.invocationContext = Check.NotNull(invocationContext);
         this.Properties = Check.NotNull(properties);
 
-        this.logger = this.CreateReplaySafeLogger("Microsoft.DurableTask");
+        this.logger = this.CreateReplaySafeLogger("Microsoft.DurableTask.Worker.Orchestration");
         this.deserializedInput = deserializedInput;
     }
 
@@ -541,4 +541,30 @@ string GetDefaultVersion()
 
         return string.Empty;
     }
+
+    /// <inheritdoc/>
+    public override ILogger CreateReplaySafeLogger(string categoryName)
+    {
+        // For orchestration logs, use dual-category logging if legacy categories are enabled
+        if (categoryName == "Microsoft.DurableTask.Worker.Orchestration" &&
+            this.invocationContext.Options.Logging.UseLegacyCategories)
+        {
+            ILogger primaryLogger = this.LoggerFactory.CreateLogger(categoryName);
+            ILogger legacyLogger = this.LoggerFactory.CreateLogger("Microsoft.DurableTask");
+            ILogger dualLogger = new DualCategoryLogger(primaryLogger, legacyLogger);
+
+            // Wrap the dual logger in a ReplaySafeLogger by calling the base implementation
+            // with a temporary category, then using reflection to replace the inner logger
+            var tempLogger = base.CreateReplaySafeLogger("temp");
+            var loggerField = tempLogger.GetType().GetField(
+                "logger",
+                System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+            loggerField?.SetValue(tempLogger, dualLogger);
+
+            return tempLogger;
+        }
+
+        // For all other categories, use the default behavior
+        return base.CreateReplaySafeLogger(categoryName);
+    }
 }

src/Worker/Core/Worker.csproj

@@ -8,6 +8,11 @@ The worker is responsible for processing durable task work items.</PackageDescri
     <EnableStyleCop>true</EnableStyleCop>
   </PropertyGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.DurableTask.Worker.Grpc" Key="$(StrongNamePublicKey)" />
+    <InternalsVisibleTo Include="Microsoft.DurableTask.Worker.Grpc.Tests" Key="$(StrongNamePublicKey)" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />