Address comments

Author: torosent

src/Abstractions/TaskOptions.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Collections.Immutable;
+
 namespace Microsoft.DurableTask;
 
 /// <summary>
@@ -105,39 +107,5 @@ public record StartOrchestrationOptions(string? InstanceId = null, DateTimeOffse
     /// <summary>
     /// Gets the tags to associate with the orchestration instance. Tags are key-value pairs that can be used.
     /// </summary>
-    public IEnumerable<KeyValuePair<string, string>> Tags { get; private set; } = System.Collections.Immutable.ImmutableDictionary.Create<string, string>();
-
-    /// <summary>
-    /// Returns a new <see cref="StartOrchestrationOptions"/> with the provided tags added to the existing tags.
-    /// </summary>
-    /// <param name="tags">The tags to add.</param>
-    public void AddTags(IEnumerable<KeyValuePair<string, string>> tags)
-    {
-        var currentTags = this.Tags as System.Collections.Immutable.ImmutableDictionary<string, string>
-            ?? System.Collections.Immutable.ImmutableDictionary.Create<string, string>();
-        this.Tags = currentTags.AddRange(tags);
-    }
-
-    /// <summary>
-    /// Returns a new <see cref="StartOrchestrationOptions"/> with the provided tag added to the existing tags.
-    /// </summary>
-    /// <param name="key">The tag key.</param>
-    /// <param name="value">The tag value.</param>
-    public void AddTag(string key, string value)
-    {
-        if (string.IsNullOrEmpty(key))
-        {
-            throw new ArgumentException("Tag key cannot be null or empty.", nameof(key));
-        }
-
-        if (string.IsNullOrEmpty(value))
-        {
-            throw new ArgumentException("Tag value cannot be null or empty.", nameof(value));
-        }
-
-        var currentTags = this.Tags as System.Collections.Immutable.ImmutableDictionary<string, string>
-            ?? System.Collections.Immutable.ImmutableDictionary.Create<string, string>();
-
-        this.Tags = currentTags.Add(key, value);
-    }
+    public IReadOnlyDictionary<string, string> Tags { get; init; } = ImmutableDictionary.Create<string, string>();
 }

src/Client/Core/OrchestrationMetadata.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 
@@ -82,7 +83,7 @@ public OrchestrationMetadata(string name, string instanceId)
     /// <summary>
     /// Gets the tags associated with the orchestration instance.
     /// </summary>
-    public IReadOnlyDictionary<string, string> Tags { get; init; }
+    public IReadOnlyDictionary<string, string> Tags { get; init; } = ImmutableDictionary.Create<string, string>();
 
     /// <summary>
     /// Gets the failure details, if any, for the orchestration instance.

src/Worker/Grpc/GrpcDurableTaskWorker.Processor.cs

@@ -112,7 +112,6 @@ async ValueTask<OrchestrationRuntimeState> BuildRuntimeStateAsync(
             ProtoUtils.EntityConversionState? entityConversionState,
             CancellationToken cancellation)
         {
-
             Func<P.HistoryEvent, HistoryEvent> converter = entityConversionState is null
                 ? ProtoUtils.ConvertHistoryEvent
                 : entityConversionState.ConvertFromProto;

test/Client/OrchestrationServiceClientShim.Tests/ShimDurableTaskClientTests.cs

@@ -316,10 +316,12 @@ public async Task ScheduleNewOrchestrationInstance_IdProvided_TagsProvided()
         StartOrchestrationOptions options = new()
         {
             InstanceId = "test-id",
+            Tags = new Dictionary<string, string>
+            {
+                { "tag1", "value1" },
+                { "tag2", "value2" }
+            }
         };
-        options.AddTag("key", "value");
-        options.AddTag("key2", "value2");
-
         await this.RunScheduleNewOrchestrationInstanceAsync("test", "input", options);
     }
 

test/Grpc.IntegrationTests/OrchestrationPatterns.cs

@@ -46,9 +46,14 @@ public async Task ScheduleOrchesrationWithTags()
         });
 
         // Schedule a new orchestration instance with tags
-        var options = new StartOrchestrationOptions();
-        options.AddTag("tag1", "value1");
-        options.AddTag("tag2", "value2");
+        StartOrchestrationOptions options = new()
+        {
+            Tags = new Dictionary<string, string>
+            {
+                { "tag1", "value1" },
+                { "tag2", "value2" }
+            }
+        };
         string instanceId = await server.Client.ScheduleNewOrchestrationInstanceAsync(orchestratorName, options);
 
         OrchestrationMetadata metadata = await server.Client.WaitForInstanceCompletionAsync(