Merge remote-tracking branch 'origin/master' into Localization

Author: vmapetr

src/Agent.Listener/Agent.cs

@@ -216,6 +216,13 @@ public async Task<int> ExecuteCommand(CommandSettings command)
                 Trace.Info($"Set agent startup type - {startType}");
                 HostContext.StartupType = startType;
 
+                bool debugModeEnabled = command.GetDebugMode();
+                settings.DebugMode = debugModeEnabled;
+                store.SaveSettings(settings);
+                if (debugModeEnabled)
+                {
+                    Trace.Warning("Agent is running in debug mode, don't use it in production");
+                }
                 if (PlatformUtil.RunningOnWindows)
                 {
                     if (store.IsAutoLogonConfigured())

src/Agent.Listener/CommandLine/RunAgent.cs

@@ -18,5 +18,8 @@ public class RunAgent : BaseCommand
 
         [Option(Constants.Agent.CommandLine.Args.StartupType)]
         public string StartupType { get; set; }
+
+        [Option(Constants.Agent.CommandLine.Flags.DebugMode)]
+        public bool DebugMode { get; set; }
     }
 }

src/Agent.Listener/CommandSettings.cs

@@ -544,6 +544,11 @@ public bool GetRunOnce()
                    TestFlag(Run?.RunOnce, Constants.Agent.CommandLine.Flags.Once);
         }
 
+        public bool GetDebugMode()
+        {
+            return TestFlag(Run?.DebugMode, Constants.Agent.CommandLine.Flags.DebugMode);
+        }
+
         public bool GetDeploymentPool()
         {
             return TestFlag(Configure?.DeploymentPool, Constants.Agent.CommandLine.Flags.DeploymentPool);

src/Agent.Sdk/Knob/AgentKnobs.cs

@@ -199,6 +199,12 @@ public class AgentKnobs
             new EnvironmentKnobSource("VSTSAGENT_TRACE"),
             new BuiltInDefaultKnobSource(string.Empty));
 
+        public static readonly Knob DebugTask = new Knob(
+            nameof(DebugTask),
+            "If the agent executes a task which ID or name matches the value provided, it will run the task so that it will wait for debugger to attach",
+            new EnvironmentKnobSource("VSTSAGENT_DEBUG_TASK"),
+            new BuiltInDefaultKnobSource(string.Empty));
+
         public static readonly Knob DumpJobEventLogs = new Knob(
             nameof(DumpJobEventLogs),
             "If true, dump event viewer logs",

src/Agent.Worker/Handlers/NodeHandler.cs

@@ -224,6 +224,21 @@ public async Task RunAsync()
             var sigtermTimeout = TimeSpan.FromMilliseconds(AgentKnobs.ProccessSigtermTimeout.GetValue(ExecutionContext).AsInt());
             var useGracefulShutdown = AgentKnobs.UseGracefulProcessShutdown.GetValue(ExecutionContext).AsBoolean();
 
+            var configStore = HostContext.GetService<IConfigurationStore>();
+            var agentSettings = configStore.GetSettings();
+            if (agentSettings.DebugMode)
+            {
+                var debugTask = AgentKnobs.DebugTask.GetValue(ExecutionContext).AsString();
+                if (!string.IsNullOrEmpty(debugTask))
+                {
+                    if (string.Equals(Task?.Id.ToString("D"), debugTask, StringComparison.OrdinalIgnoreCase) || string.Equals(Task?.Name, debugTask, StringComparison.OrdinalIgnoreCase))
+                    {
+                        arguments = $"--inspect-brk {arguments}";
+                    }
+                }
+            }
+            
+
             try
             {
                 // Execute the process. Exit code 0 should always be returned.

src/Agent.Worker/JobRunner.cs

@@ -113,12 +113,13 @@ public async Task<TaskResult> RunAsync(Pipelines.AgentJobRequestMessage message,
 
                 //Start Resource Diagnostics if enabled in the job message 
                 jobContext.Variables.TryGetValue("system.debug", out var systemDebug);
+
                 resourceDiagnosticManager = HostContext.GetService<IResourceMetricsManager>();
+                resourceDiagnosticManager.SetContext(jobContext);
 
                 if (string.Equals(systemDebug, "true", StringComparison.OrdinalIgnoreCase))
                 {
-                    resourceDiagnosticManager.Setup(jobContext);
-                    _ = resourceDiagnosticManager.RunDebugResourceMonitor();
+                    _ = resourceDiagnosticManager.RunDebugResourceMonitorAsync();
                 }
 
                 agentShutdownRegistration = HostContext.AgentShutdownToken.Register(() =>
@@ -422,7 +423,6 @@ public async Task<TaskResult> RunAsync(Pipelines.AgentJobRequestMessage message,
                 legacyTaskConnection?.Dispose();
                 taskConnection?.Dispose();
                 jobConnection?.Dispose();
-                resourceDiagnosticManager?.Dispose();
 
                 await ShutdownQueue(throwOnFailure: false);
             }