Skip to content

Commit 8b332ae

Browse files
authored
Rework resource monitor (#4803)
* Rework resource monitor * Minor fixes * Add regions * Fix cpu utilization metrics * Update to ProcessInvoker * Minor fixes * Minor fixes * Resolve comments * Fix typo * Minor fix in syntax
1 parent 8027e72 commit 8b332ae

File tree

4 files changed

+394
-206
lines changed

4 files changed

+394
-206
lines changed

src/Agent.Worker/JobRunner.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,13 @@ public async Task<TaskResult> RunAsync(Pipelines.AgentJobRequestMessage message,
113113

114114
//Start Resource Diagnostics if enabled in the job message
115115
jobContext.Variables.TryGetValue("system.debug", out var systemDebug);
116+
116117
resourceDiagnosticManager = HostContext.GetService<IResourceMetricsManager>();
118+
resourceDiagnosticManager.SetContext(jobContext);
117119

118120
if (string.Equals(systemDebug, "true", StringComparison.OrdinalIgnoreCase))
119121
{
120-
resourceDiagnosticManager.Setup(jobContext);
121-
_ = resourceDiagnosticManager.RunDebugResourceMonitor();
122+
_ = resourceDiagnosticManager.RunDebugResourceMonitorAsync();
122123
}
123124

124125
agentShutdownRegistration = HostContext.AgentShutdownToken.Register(() =>
@@ -422,7 +423,6 @@ public async Task<TaskResult> RunAsync(Pipelines.AgentJobRequestMessage message,
422423
legacyTaskConnection?.Dispose();
423424
taskConnection?.Dispose();
424425
jobConnection?.Dispose();
425-
resourceDiagnosticManager?.Dispose();
426426

427427
await ShutdownQueue(throwOnFailure: false);
428428
}

0 commit comments

Comments
 (0)