Add feature flag guard for ACTIONS_ORCHESTRATION_ID

Copilot · TingluoHuang · Copilot · commit d63009faa319 · 2026-01-06T18:09:24.000Z
- Add SetOrchestrationIdEnvForNodeActions feature flag constant
- Wrap ACTIONS_ORCHESTRATION_ID env var setting with feature flag check
- Follows same pattern as ACTIONS_CACHE_SERVICE_V2

Co-authored-by: TingluoHuang &lt;1750815+TingluoHuang@users.noreply.github.com&gt;
diff --git a/src/Runner.Common/Constants.cs b/src/Runner.Common/Constants.cs
@@ -172,6 +172,7 @@ public static class Features
                 public static readonly string SnapshotPreflightHostedRunnerCheck = "actions_snapshot_preflight_hosted_runner_check";
                 public static readonly string SnapshotPreflightImageGenPoolCheck = "actions_snapshot_preflight_image_gen_pool_check";
                 public static readonly string CompareWorkflowParser = "actions_runner_compare_workflow_parser";
+                public static readonly string SetOrchestrationIdEnvForNodeActions = "actions_set_orchestration_id_env_for_node_actions";
             }
 
             // Node version migration related constants
diff --git a/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs b/src/Runner.Worker/Handlers/NodeScriptActionHandler.cs
@@ -77,9 +77,12 @@ public async Task RunAsync(ActionRunStage stage)
                 Environment["ACTIONS_CACHE_SERVICE_V2"] = bool.TrueString;
             }
 
-            if (ExecutionContext.Global.Variables.TryGetValue(Constants.Variables.System.OrchestrationId, out var orchestrationId) && !string.IsNullOrEmpty(orchestrationId))
+            if (ExecutionContext.Global.Variables.GetBoolean(Constants.Runner.Features.SetOrchestrationIdEnvForNodeActions) ?? false)
             {
-                Environment["ACTIONS_ORCHESTRATION_ID"] = orchestrationId;
+                if (ExecutionContext.Global.Variables.TryGetValue(Constants.Variables.System.OrchestrationId, out var orchestrationId) && !string.IsNullOrEmpty(orchestrationId))
+                {
+                    Environment["ACTIONS_ORCHESTRATION_ID"] = orchestrationId;
+                }
             }
 
             // Resolve the target script.

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,7 @@ public static class Features`
`172`	`172`	`public static readonly string SnapshotPreflightHostedRunnerCheck = "actions_snapshot_preflight_hosted_runner_check";`
`173`	`173`	`public static readonly string SnapshotPreflightImageGenPoolCheck = "actions_snapshot_preflight_image_gen_pool_check";`
`174`	`174`	`public static readonly string CompareWorkflowParser = "actions_runner_compare_workflow_parser";`
	`175`	`+ public static readonly string SetOrchestrationIdEnvForNodeActions = "actions_set_orchestration_id_env_for_node_actions";`
`175`	`176`	`}`
`176`	`177`
`177`	`178`	`// Node version migration related constants`
Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,12 @@ public async Task RunAsync(ActionRunStage stage)`
`77`	`77`	`Environment["ACTIONS_CACHE_SERVICE_V2"] = bool.TrueString;`
`78`	`78`	`}`
`79`	`79`
`80`		`- if (ExecutionContext.Global.Variables.TryGetValue(Constants.Variables.System.OrchestrationId, out var orchestrationId) && !string.IsNullOrEmpty(orchestrationId))`
	`80`	`+ if (ExecutionContext.Global.Variables.GetBoolean(Constants.Runner.Features.SetOrchestrationIdEnvForNodeActions) ?? false)`
`81`	`81`	`{`
`82`		`- Environment["ACTIONS_ORCHESTRATION_ID"] = orchestrationId;`
	`82`	`+ if (ExecutionContext.Global.Variables.TryGetValue(Constants.Variables.System.OrchestrationId, out var orchestrationId) && !string.IsNullOrEmpty(orchestrationId))`
	`83`	`+ {`
	`84`	`+ Environment["ACTIONS_ORCHESTRATION_ID"] = orchestrationId;`
	`85`	`+ }`
`83`	`86`	`}`
`84`	`87`
`85`	`88`	`// Resolve the target script.`