Extract another method

microsoft · Jul 12, 2024 · 30c3288 · 30c3288
1 parent 19cab8f
commit 30c3288
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/Agent.Worker/JobExtension.cs b/src/Agent.Worker/JobExtension.cs
@@ -492,7 +492,6 @@ public async Task<List<IStep>> InitializeJob(IExecutionContext jobContext, Pipel
                             }
                         }
                     }
-
                     List<IStep> steps = new List<IStep>();
                     steps.AddRange(preJobSteps);
                     steps.AddRange(jobSteps);
@@ -509,7 +508,6 @@ public async Task<List<IStep>> InitializeJob(IExecutionContext jobContext, Pipel
                         // Set the VSTS_PROCESS_LOOKUP_ID env variable.
                         context.SetVariable(Constants.ProcessLookupId, _processLookupId, false, false);
                         context.Output("Start tracking orphan processes.");
-
                         // Take a snapshot of current running processes
                         Dictionary<int, Process> processes = SnapshotProcesses();
                         foreach (var proc in processes)
@@ -528,15 +526,7 @@ public async Task<List<IStep>> InitializeJob(IExecutionContext jobContext, Pipel
                     if (AgentKnobs.FailJobWhenAgentDies.GetValue(jobContext).AsBoolean() &&
                         HostContext.AgentShutdownToken.IsCancellationRequested)
                     {
-                        var telemetryData = new Dictionary<string, string>
-                        {
-                            { "JobId", context?.Variables?.System_JobId?.ToString() ?? string.Empty },
-                            { "JobResult", TaskResult.Failed.ToString() },
-                            { "TracePoint", "110" },
-                        };
-
-                        PublishTelemetry(jobContext, telemetryData, "AgentShutdown");
-
+                        PublishAgentShutdownTelemetry(jobContext, context);
                         Trace.Error($"Caught Agent Shutdown exception from JobExtension Initialization: {ex.Message}");
                         context.Error(ex);
                         context.Result = TaskResult.Failed;
@@ -566,6 +556,18 @@ public async Task<List<IStep>> InitializeJob(IExecutionContext jobContext, Pipel
             }
         }
 
+        private void PublishAgentShutdownTelemetry(IExecutionContext jobContext, IExecutionContext childContext)
+        {
+            var telemetryData = new Dictionary<string, string>
+            {
+                { "JobId", childContext?.Variables?.System_JobId?.ToString() ?? string.Empty },
+                { "JobResult", TaskResult.Failed.ToString() },
+                { "TracePoint", "110" },
+            };
+
+            PublishTelemetry(jobContext, telemetryData, "AgentShutdown");
+        }
+
         public async Task FinalizeJob(IExecutionContext jobContext)
         {
             Trace.Entering();