From 1be59699c8cd5f9d93012e54381ab6f557633c8f Mon Sep 17 00:00:00 2001
From: sebastianburckhardt <sburckha@microsoft.com>
Date: Wed, 6 Sep 2023 15:11:57 -0700
Subject: [PATCH] remove orchestration tags from entity action

---
 .../OperationFormat/StartNewOrchestrationOperationAction.cs  | 5 -----
 src/DurableTask.Core/TaskEntityDispatcher.cs                 | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/DurableTask.Core/Entities/OperationFormat/StartNewOrchestrationOperationAction.cs b/src/DurableTask.Core/Entities/OperationFormat/StartNewOrchestrationOperationAction.cs
index 925b8b791..c89c5b7bb 100644
--- a/src/DurableTask.Core/Entities/OperationFormat/StartNewOrchestrationOperationAction.cs
+++ b/src/DurableTask.Core/Entities/OperationFormat/StartNewOrchestrationOperationAction.cs
@@ -45,10 +45,5 @@ public class StartNewOrchestrationOperationAction : OperationAction
         /// The input of the sub-orchestration.
         /// </summary>
         public string? Input { get; set; }
-
-        /// <summary>
-        /// Tags to be applied to the sub-orchestration.
-        /// </summary>
-        public IDictionary<string, string>? Tags { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/DurableTask.Core/TaskEntityDispatcher.cs b/src/DurableTask.Core/TaskEntityDispatcher.cs
index 0e9f0990f..0b1837cb8 100644
--- a/src/DurableTask.Core/TaskEntityDispatcher.cs
+++ b/src/DurableTask.Core/TaskEntityDispatcher.cs
@@ -777,7 +777,9 @@ void ProcessSendStartMessage(WorkItemEffects effects, OrchestrationRuntimeState
             };
             var executionStartedEvent = new ExecutionStartedEvent(-1, action.Input)
             {
-                Tags = OrchestrationTags.MergeTags(action.Tags, runtimeState.Tags),
+                Tags = OrchestrationTags.MergeTags(
+                    runtimeState.Tags,
+                    new Dictionary<string, string>() { { OrchestrationTags.FireAndForget, "" } }),
                 OrchestrationInstance = destination,
                 ParentInstance = new ParentInstance
                 {