fb

Author: YunchuWang

samples/ScheduleWebApp/Orchestrations/CacheClearingOrchestrator.cs

@@ -15,7 +15,7 @@ public override async Task<string> RunAsync(TaskOrchestrationContext context, st
         {
             logger.LogInformation("Starting CacheClearingOrchestration for schedule ID: {ScheduleId}", scheduleId);
 
-            CallActivityOptions options = new TaskOptions().WithTags(new Dictionary<string, string>
+            CallActivityOptions options = new CallActivityOptions(tags: new Dictionary<string, string>
             {
                 { "scheduleId", scheduleId }
             });

src/Abstractions/TaskOptions.cs

@@ -19,11 +19,27 @@ public TaskOptions(TaskRetryOptions? retry = null)
         this.Retry = retry;
     }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TaskOptions"/> class.
+    /// </summary>
+    /// <param name="retry">The task retry options.</param>
+    /// <param name="tags">The tags to associate with the task.</param>
+    public TaskOptions(TaskRetryOptions? retry = null, IDictionary<string, string>? tags = null)
+    {
+        this.Retry = retry;
+        this.Tags = tags;
+    }
+
     /// <summary>
     /// Gets the task retry options.
     /// </summary>
     public TaskRetryOptions? Retry { get; init; }
 
+    /// <summary>
+    /// Gets the tags to associate with the task.
+    /// </summary>
+    public IDictionary<string, string>? Tags { get; init; }
+
     /// <summary>
     /// Returns a new <see cref="TaskOptions" /> from the provided <see cref="RetryPolicy" />.
     /// </summary>
@@ -52,13 +68,6 @@ public TaskOptions(TaskRetryOptions? retry = null)
     /// <param name="instanceId">The instance ID to use.</param>
     /// <returns>A new <see cref="SubOrchestrationOptions" />.</returns>
     public SubOrchestrationOptions WithInstanceId(string instanceId) => new(this, instanceId);
-
-    /// <summary>
-    /// Returns a new <see cref="CallActivityOptions" /> with the provided tags.
-    /// </summary>
-    /// <param name="tags">The tags to associate with the activity.</param>
-    /// <returns>A new <see cref="CallActivityOptions" />.</returns>
-    public CallActivityOptions WithTags(IDictionary<string, string> tags) => new(this, tags);
 }
 
 /// <summary>
@@ -128,12 +137,8 @@ public record CallActivityOptions : TaskOptions
     /// <param name="retry">The task retry options.</param>
     /// <param name="tags">The tags to associate with the activity.</param>
     public CallActivityOptions(TaskRetryOptions? retry = null, IDictionary<string, string>? tags = null)
-        : base(retry)
+        : base(retry, tags)
     {
-        if (tags != null)
-        {
-            this.Tags = tags;
-        }
     }
 
     /// <summary>
@@ -142,20 +147,7 @@ public CallActivityOptions(TaskRetryOptions? retry = null, IDictionary<string, s
     /// <param name="options">The task options to wrap.</param>
     /// <param name="tags">The tags to associate with the activity.</param>
     public CallActivityOptions(TaskOptions options, IDictionary<string, string>? tags = null)
-        : base(options)
+        : base(options.Retry, tags ?? options.Tags)
     {
-        if (tags != null)
-        {
-            this.Tags = tags;
-        }
-        else if (options is CallActivityOptions derived)
-        {
-            this.Tags = derived.Tags;
-        }
     }
-
-    /// <summary>
-    /// Gets the tags to associate with the activity instance.
-    /// </summary>
-    public IDictionary<string, string> Tags { get; init; } = ImmutableDictionary.Create<string, string>();
 }