fb

Author: YunchuWang

src/ScheduledTasks/Client/DefaultScheduledTaskClient.cs

@@ -10,9 +10,7 @@ namespace Microsoft.DurableTask.ScheduledTasks;
 /// <summary>
 /// Client for managing scheduled tasks in a Durable Task application.
 /// </summary>
-#pragma warning disable CA1711 // Identifiers should not have incorrect suffix
-public class DefaultScheduledTaskClient(DurableTaskClient durableTaskClient, ILogger logger) : ScheduledTaskClient
-#pragma warning restore CA1711 // Identifiers should not have incorrect suffix
+class DefaultScheduledTaskClient(DurableTaskClient durableTaskClient, ILogger logger) : ScheduledTaskClient
 {
     readonly DurableTaskClient durableTaskClient = Check.NotNull(durableTaskClient, nameof(durableTaskClient));
     readonly ILogger logger = Check.NotNull(logger, nameof(logger));

src/ScheduledTasks/Entity/Schedule.cs

@@ -286,9 +286,9 @@ void StartOrchestration(TaskEntityContext context, DateTimeOffset scheduledRunTi
             }
 
             this.logger.ScheduleOperationInfo(
-                this.State.ScheduleConfiguration!.ScheduleId,
+                this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty,
                 nameof(this.StartOrchestration),
-                $"Starting new orchestration with instance ID: {instanceId}");
+                $"Starting new orchestration named '{this.State.ScheduleConfiguration?.OrchestrationName ?? string.Empty}' with instance ID: {instanceId}");
 
             context.ScheduleNewOrchestration(
                 new TaskName(this.State.ScheduleConfiguration!.OrchestrationName),
@@ -298,7 +298,7 @@ void StartOrchestration(TaskEntityContext context, DateTimeOffset scheduledRunTi
         catch (Exception ex)
         {
             this.logger.ScheduleOperationError(
-                this.State.ScheduleConfiguration!.ScheduleId,
+                this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty,
                 nameof(this.StartOrchestration),
                 "Failed to start orchestration",
                 ex);

src/ScheduledTasks/Extension/DurableTaskClientBuilderExtensions.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.DurableTask.Client;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.DurableTask.ScheduledTasks;
 
@@ -19,13 +18,7 @@ public static class DurableTaskClientBuilderExtensions
     /// <returns>The original builder, for call chaining.</returns>
     public static IDurableTaskClientBuilder UseScheduledTasks(this IDurableTaskClientBuilder builder)
     {
-        builder.Services.AddTransient<ScheduledTaskClient>(sp =>
-        {
-            DurableTaskClient client = sp.GetRequiredService<DurableTaskClient>();
-            ILogger<DefaultScheduledTaskClient> logger = sp.GetRequiredService<ILogger<DefaultScheduledTaskClient>>();
-            return new DefaultScheduledTaskClient(client, logger);
-        });
-
+        builder.Services.AddSingleton<ScheduledTaskClient, DefaultScheduledTaskClient>();
         return builder;
     }
 }

…/DurableTaskSchedulerWorkerExtensions.cs …on/DurableTaskWorkerBuilderExtensions.cssrc/ScheduledTasks/Extension/DurableTaskSchedulerWorkerExtensions.cs renamed to src/ScheduledTasks/Extension/DurableTaskWorkerBuilderExtensions.cs src/ScheduledTasks/Extension/DurableTaskSchedulerWorkerExtensions.cs renamed to src/ScheduledTasks/Extension/DurableTaskWorkerBuilderExtensions.cs

@@ -8,7 +8,7 @@ namespace Microsoft.DurableTask.ScheduledTasks;
 /// <summary>
 /// Extension methods for configuring Durable Task workers to use the Azure Durable Task Scheduler service.
 /// </summary>
-public static class DurableTaskSchedulerWorkerExtensions
+public static class DurableTaskWorkerBuilderExtensions
 {
     /// <summary>
     /// Adds scheduled tasks support to the worker builder.

src/ScheduledTasks/Logging/Logs.Client.cs

@@ -13,24 +13,24 @@ static partial class Logs
     [LoggerMessage(EventId = 80, Level = LogLevel.Information, Message = "Creating schedule with options: {scheduleConfigCreateOptions}")]
     public static partial void ClientCreatingSchedule(this ILogger logger, ScheduleCreationOptions scheduleConfigCreateOptions);
 
-    [LoggerMessage(EventId = 82, Level = LogLevel.Information, Message = "Pausing schedule '{scheduleId}'")]
+    [LoggerMessage(EventId = 81, Level = LogLevel.Information, Message = "Pausing schedule '{scheduleId}'")]
     public static partial void ClientPausingSchedule(this ILogger logger, string scheduleId);
 
-    [LoggerMessage(EventId = 83, Level = LogLevel.Information, Message = "Resuming schedule '{scheduleId}'")]
+    [LoggerMessage(EventId = 82, Level = LogLevel.Information, Message = "Resuming schedule '{scheduleId}'")]
     public static partial void ClientResumingSchedule(this ILogger logger, string scheduleId);
 
-    [LoggerMessage(EventId = 84, Level = LogLevel.Information, Message = "Updating schedule '{scheduleId}'")]
+    [LoggerMessage(EventId = 83, Level = LogLevel.Information, Message = "Updating schedule '{scheduleId}'")]
     public static partial void ClientUpdatingSchedule(this ILogger logger, string scheduleId);
 
-    [LoggerMessage(EventId = 85, Level = LogLevel.Information, Message = "Deleting schedule '{scheduleId}'")]
+    [LoggerMessage(EventId = 84, Level = LogLevel.Information, Message = "Deleting schedule '{scheduleId}'")]
     public static partial void ClientDeletingSchedule(this ILogger logger, string scheduleId);
 
-    [LoggerMessage(EventId = 86, Level = LogLevel.Information, Message = "{message} (ScheduleId: {scheduleId})")]
+    [LoggerMessage(EventId = 85, Level = LogLevel.Information, Message = "{message} (ScheduleId: {scheduleId})")]
     public static partial void ClientInfo(this ILogger logger, string message, string scheduleId);
 
-    [LoggerMessage(EventId = 87, Level = LogLevel.Warning, Message = "{message} (ScheduleId: {scheduleId})")]
+    [LoggerMessage(EventId = 86, Level = LogLevel.Warning, Message = "{message} (ScheduleId: {scheduleId})")]
     public static partial void ClientWarning(this ILogger logger, string message, string scheduleId);
 
-    [LoggerMessage(EventId = 88, Level = LogLevel.Error, Message = "{message} (ScheduleId: {scheduleId})")]
+    [LoggerMessage(EventId = 87, Level = LogLevel.Error, Message = "{message} (ScheduleId: {scheduleId})")]
     public static partial void ClientError(this ILogger logger, string message, string scheduleId, Exception? exception = null);
 }