Merge branch 'dind-network-host-patch' into releases/upgrade-to-v2.319.1

dfinity · Aug 19, 2024 · ea50350 · ea50350
2 parents 36169f1 + 202886d
commit ea50350
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git 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
 

diff --git 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
@@ -69,7 +69,8 @@ public async Task<CreateSessionResult> 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
@@ -88,7 +88,8 @@ public async Task<CreateSessionResult> 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
@@ -1 +1 @@
-2.319.0
+2.319.1