From 2979fbad9460c32bea9419595d8c3eacc8f4930d Mon Sep 17 00:00:00 2001 From: Tingluo Huang Date: Fri, 16 Aug 2024 15:17:13 -0400 Subject: [PATCH 1/2] Add pid to user-agent and session owner. (#3432) --- src/Runner.Common/HostContext.cs | 4 ++++ src/Runner.Listener/BrokerMessageListener.cs | 3 ++- src/Runner.Listener/MessageListener.cs | 3 ++- src/runnerversion | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Runner.Common/HostContext.cs b/src/Runner.Common/HostContext.cs index 78ea8ba4cbe..06b0cd5892a 100644 --- a/src/Runner.Common/HostContext.cs +++ b/src/Runner.Common/HostContext.cs @@ -244,6 +244,10 @@ public HostContext(string hostType, string logFile = null) _trace.Info($"Adding extra user agent '{extraUserAgentHeader}' to all HTTP requests."); _userAgents.Add(extraUserAgentHeader); } + + var currentProcess = Process.GetCurrentProcess(); + _userAgents.Add(new ProductInfoHeaderValue("Pid", currentProcess.Id.ToString())); + _userAgents.Add(new ProductInfoHeaderValue("CreationTime", Uri.EscapeDataString(DateTime.UtcNow.ToString("O")))); } public string GetDirectory(WellKnownDirectory directory) diff --git a/src/Runner.Listener/BrokerMessageListener.cs b/src/Runner.Listener/BrokerMessageListener.cs index 8f44fe84372..81ef5402a84 100644 --- a/src/Runner.Listener/BrokerMessageListener.cs +++ b/src/Runner.Listener/BrokerMessageListener.cs @@ -69,7 +69,8 @@ public async Task CreateSessionAsync(CancellationToken toke Version = BuildConstants.RunnerPackage.Version, OSDescription = RuntimeInformation.OSDescription, }; - string sessionName = $"{Environment.MachineName ?? "RUNNER"}"; + var currentProcess = Process.GetCurrentProcess(); + string sessionName = $"{Environment.MachineName ?? "RUNNER"} (PID: {currentProcess.Id})"; var taskAgentSession = new TaskAgentSession(sessionName, agent); string errorMessage = string.Empty; diff --git a/src/Runner.Listener/MessageListener.cs b/src/Runner.Listener/MessageListener.cs index 7b51423e6f5..6335667267e 100644 --- a/src/Runner.Listener/MessageListener.cs +++ b/src/Runner.Listener/MessageListener.cs @@ -88,7 +88,8 @@ public async Task CreateSessionAsync(CancellationToken toke Version = BuildConstants.RunnerPackage.Version, OSDescription = RuntimeInformation.OSDescription, }; - string sessionName = $"{Environment.MachineName ?? "RUNNER"}"; + var currentProcess = Process.GetCurrentProcess(); + string sessionName = $"{Environment.MachineName ?? "RUNNER"} (PID: {currentProcess.Id})"; var taskAgentSession = new TaskAgentSession(sessionName, agent); string errorMessage = string.Empty; diff --git a/src/runnerversion b/src/runnerversion index 8330b5bf1db..4c47f6f2f86 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.319.0 +2.319.1 From 202886d7c5ab544f004d7724cd830cd492f65966 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Mon, 19 Aug 2024 15:36:52 +0200 Subject: [PATCH 2/2] change it back --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index afa336f1ca8..de94bcc4b26 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Runner CD on: workflow_dispatch: - pull_request: + push: paths: - releaseVersion