Activity tag support (code)

Author: YunchuWang

src/Abstractions/TaskOptions.cs

@@ -52,6 +52,13 @@ 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(IReadOnlyDictionary<string, string> tags) => new(this, tags);
 }
 
 /// <summary>
@@ -109,3 +116,46 @@ public record StartOrchestrationOptions(string? InstanceId = null, DateTimeOffse
     /// </summary>
     public IReadOnlyDictionary<string, string> Tags { get; init; } = ImmutableDictionary.Create<string, string>();
 }
+
+/// <summary>
+/// Options for calling activities from an orchestrator.
+/// </summary>
+public record CallActivityOptions : TaskOptions
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CallActivityOptions"/> class.
+    /// </summary>
+    /// <param name="retry">The task retry options.</param>
+    /// <param name="tags">The tags to associate with the activity.</param>
+    public CallActivityOptions(TaskRetryOptions? retry = null, IReadOnlyDictionary<string, string>? tags = null)
+        : base(retry)
+    {
+        if (tags != null)
+        {
+            this.Tags = tags;
+        }
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CallActivityOptions"/> class.
+    /// </summary>
+    /// <param name="options">The task options to wrap.</param>
+    /// <param name="tags">The tags to associate with the activity.</param>
+    public CallActivityOptions(TaskOptions options, IReadOnlyDictionary<string, string>? tags = null)
+        : base(options)
+    {
+        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 IReadOnlyDictionary<string, string> Tags { get; init; } = ImmutableDictionary.Create<string, string>();
+}

src/Shared/Grpc/ProtoUtils.cs

@@ -90,7 +90,9 @@ internal static HistoryEvent ConvertHistoryEvent(P.HistoryEvent proto, EntityCon
                     proto.EventId,
                     proto.TaskScheduled.Name,
                     proto.TaskScheduled.Version,
-                    proto.TaskScheduled.Input);
+                    proto.TaskScheduled.Input) {
+                        Tags = proto.TaskScheduled.Tags,
+                    };
                 break;
             case P.HistoryEvent.EventTypeOneofCase.TaskCompleted:
                 historyEvent = new TaskCompletedEvent(

src/Worker/Core/Shims/TaskOrchestrationContextWrapper.cs

@@ -138,26 +138,36 @@ public override async Task<T> CallActivityAsync<T>(
 
         try
         {
+            IReadOnlyDictionary<string, string>? tags = null;
+            if (options is CallActivityOptions callActivityOptions)
+            {
+                if (callActivityOptions.Tags is not null)
+                {
+                    tags = callActivityOptions.Tags;
+                }
+            }
+
             // TODO: Cancellation (https://github.com/microsoft/durabletask-dotnet/issues/7)
             if (options?.Retry?.Policy is RetryPolicy policy)
             {
                 return await this.innerContext.ScheduleWithRetry<T>(
                     name.Name,
                     name.Version,
                     policy.ToDurableTaskCoreRetryOptions(),
+                    tags,
                     input);
             }
             else if (options?.Retry?.Handler is AsyncRetryHandler handler)
             {
                 return await this.InvokeWithCustomRetryHandler(
-                    () => this.innerContext.ScheduleTask<T>(name.Name, name.Version, input),
+                    () => this.innerContext.ScheduleTask<T>(name.Name, name.Version, tags, input),
                     name.Name,
                     handler,
                     default);
             }
             else
             {
-                return await this.innerContext.ScheduleTask<T>(name.Name, name.Version, input);
+                return await this.innerContext.ScheduleTask<T>(name.Name, name.Version, tags, input);
             }
         }
         catch (global::DurableTask.Core.Exceptions.TaskFailedException e)