Update releaseVersion to 2.303.0

.editorconfig

@@ -0,0 +1,9 @@
+# https://editorconfig.org/
+
+[*]
+charset = utf-8 # Set default charset to utf-8
+insert_final_newline = true # ensure all files end with a single newline
+trim_trailing_whitespace = true # attempt to remove trailing whitespace on save
+
+[*.md]
+trim_trailing_whitespace = false # in markdown, "two trailing spaces" is unfortunately meaningful; it means `<br>`

docs/adrs/2494-runner-image-tags.md

@@ -1,65 +0,0 @@
-# ADR 2494: Runner Image Tags
-
-**Date**: 2023-03-17
-
-**Status**: Accepted<!-- |Accepted|Rejected|Superceded|Deprecated -->
-
-## Context
-
-Following the [adoption of actions-runner-controller by GitHub](https://github.com/actions/actions-runner-controller/discussions/2072) and the introduction of the new runner scale set autoscaling mode, we needed to provide a basic runner image that could be used off the shelf without much friction.
-
-The [current runner image](https://github.com/actions/runner/pkgs/container/actions-runner) is published to GHCR. Each release of this image is tagged with the runner version and the most recent release is also tagged with `latest`.
-
-While the use of `latest` is common practice, we recommend that users pin a specific version of the runner image for a predictable runtime and improved security posture. However, we still notice that a large number of end users are relying on the `latest` tag & raising issues when they encounter problems.
-
-Add to that, the community actions-runner-controller maintainers have issued a [deprecation notice](https://github.com/actions/actions-runner-controller/issues/2056) of the `latest` tag for the existing runner images (https://github.com/orgs/actions-runner-controller/packages).
-
-## Decision
-
-Proceed with Option 2, keeping the `latest` tag and adding the `NOTES.txt` file to our helm charts with the notice.
-
-### Option 1: Remove the `latest` tag
-
-By removing the `latest` tag, we have to proceed with either of these options:
-
-1. Remove the runner image reference in the `values.yaml` provided with the `gha-runner-scale-set` helm chart and mark these fields as required so that users have to explicitly specify a runner image and a specific tag. This will obviously introduce more  friction for users who want to start using actions-runner-controller for the first time.
-
-```yaml
-  spec:
-    containers:
-    - name: runner
-      image: ""
-      tag: ""
-      command: ["/home/runner/run.sh"]
-```
-
-1. Pin a specific runner image tag in the `values.yaml` provided with the `gha-runner-scale-set` helm chart. This will reduce friction for users who want to start using actions-runner-controller for the first time but will require us to update the `values.yaml` with every new runner release.
-
-```yaml
-  spec:
-    containers:
-    - name: runner
-      image: "ghcr.io/actions/actions-runner"
-      tag: "v2.300.0"
-      command: ["/home/runner/run.sh"]
-```
-
-### Option 2: Keep the `latest` tag
-
-Keeping the `latest` tag is also a reasonable option especially if we don't expect to make any breaking changes to the runner image. We could enhance this by adding a [NOTES.txt](https://helm.sh/docs/chart_template_guide/notes_files/) to the helm chart which will be displayed to the user after a successful helm install/upgrade. This will help users understand the implications of using the `latest` tag and how to pin a specific version of the runner image.
-
-The runner image release workflow will need to be updated so that the image is pushed to GHCR and tagged only when the runner rollout has reached all scale units.
-
-## Consequences
-
-Proceeding with **option 1** means:
-
-1. We will enhance the runtime predictability and security posture of our end users
-1. We will have to update the `values.yaml` with every new runner release (that can be automated)
-1. We will introduce friction for users who want to start using actions-runner-controller for the first time
-
-Proceeding with **option 2** means:
-
-1. We will have to continue to maintain the `latest` tag
-1. We will assume that end users will be able to handle the implications of using the `latest` tag
-1. Runner image release workflow needs to be updated 

docs/contribute.md

@@ -157,7 +157,7 @@ cat (Runner/Worker)_TIMESTAMP.log # view your log file
 ## Styling
 
 We use the .NET Foundation and CoreCLR style guidelines [located here](
-https://github.com/dotnet/runtime/blob/main/docs/coding-guidelines/coding-style.md)
+https://github.com/dotnet/corefx/blob/master/Documentation/coding-guidelines/coding-style.md)
 
 ### Format C# Code
 

images/Dockerfile

@@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/runtime-deps:6.0 as build
 
 ARG RUNNER_VERSION
 ARG RUNNER_ARCH="x64"
-ARG RUNNER_CONTAINER_HOOKS_VERSION=0.3.2
+ARG RUNNER_CONTAINER_HOOKS_VERSION=0.2.0
 ARG DOCKER_VERSION=20.10.23
 
 RUN apt update -y && apt install curl unzip -y

releaseNote.md

@@ -1,18 +1,17 @@
 ## Features
-- Runner changes for communication with Results service (#2510, #2531, #2535, #2516) 
-- Add `*.ghe.localhost` domains to hosted server check (#2536) 
-- Add `OrchestrationId` to user-agent for better telemetry correlation. (#2568) 
+- Support matrix context in output keys (#2477)
+- Add update certificates to `./run.sh` if `RUNNER_UPDATE_CA_CERTS` env is set (#2471)
+- Bypass all proxies for all hosts if `no_proxy='*'` is set (#2395)
+- Change runner image to make user/folder align with `ubuntu-latest` hosted runner. (#2469)
 
 ## Bugs
-- Fix JIT configurations on Windows (#2497) 
-- Guard against NullReference while creating HostContext (#2343) 
-- Handles broken symlink in `Which` (#2150, #2196) 
-- Adding curl retry for external tool downloads (#2552, #2557) 
-- Limit the time we wait for waiting websocket to connect. (#2554) 
+- Exit on runner version deprecation error (#2299)
+- Runner service exit after consecutive re-try exits (#2426)
 
 ## Misc
-- Bump container hooks version to 0.3.1 in runner image (#2496) 
-- Runner changes to communicate with vNext services (#2487, #2500, #2505, #2541, #2547) 
+- Replace deprecated command with environment file (#2429)
+- Make requests to `Run` service to renew job request (#2461)
+- Add job/step log upload to Result service (#2447, #2439)
 
 _Note: Actions Runner follows a progressive release policy, so the latest release might not be available to your enterprise, organization, or repository yet. 
 To confirm which version of the Actions Runner you should expect, please view the download instructions for your enterprise, organization, or repository. 

releaseVersion

@@ -1 +1 @@
-<Update to ./src/runnerversion when creating release>
+2.303.0

src/.editorconfig

@@ -1,5 +1,5 @@
 [*.cs]
-charset = utf-8-bom
+charset = utf-8
 insert_final_newline = true
 
 csharp_new_line_before_else = true

src/Misc/externals.sh

@@ -55,23 +55,12 @@ function acquireExternalTool() {
             # Download from source to the partial file.
             echo "Downloading $download_source"
             mkdir -p "$(dirname "$download_target")" || checkRC 'mkdir'
-
-            CURL_VERSION=$(curl --version | awk 'NR==1{print $2}')
-            echo "Curl version: $CURL_VERSION"
-
             # curl -f Fail silently (no output at all) on HTTP errors (H)
             #      -k Allow connections to SSL sites without certs (H)
             #      -S Show error. With -s, make curl show errors when they occur
             #      -L Follow redirects (H)
             #      -o FILE    Write to FILE instead of stdout
-            #      --retry 3   Retries transient errors 3 times (timeouts, 5xx)
-            if [[ "$(printf '%s\n' "7.71.0" "$CURL_VERSION" | sort -V | head -n1)" != "7.71.0" ]]; then
-                # Curl version is less than or equal to 7.71.0, skipping retry-all-errors flag
-                 curl -fkSL --retry 3 -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl'
-            else
-                # Curl version is greater than 7.71.0, running curl with --retry-all-errors flag
-                 curl -fkSL --retry 3 --retry-all-errors -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl'
-            fi
+            curl -fkSL -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl'
 
             # Move the partial file to the download target.
             mv "$partial_target" "$download_target" || checkRC 'mv'

src/Runner.Common/ActionCommand.cs

@@ -1,4 +1,4 @@
-using GitHub.Runner.Sdk;
+using GitHub.Runner.Sdk;
 using System;
 using System.Collections.Generic;
 

src/Runner.Common/ActionResult.cs

@@ -1,4 +1,4 @@
-namespace GitHub.Runner.Common
+namespace GitHub.Runner.Common
 {
     public enum ActionResult
     {

src/Runner.Common/BrokerServer.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Actions.RunService.WebApi;
-using GitHub.DistributedTask.Pipelines;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
-using Sdk.RSWebApi.Contracts;
-using Sdk.WebApi.WebApi.RawClient;
-
-namespace GitHub.Runner.Common
-{
-    [ServiceLocator(Default = typeof(BrokerServer))]
-    public interface IBrokerServer : IRunnerService
-    {
-        Task ConnectAsync(Uri serverUrl, VssCredentials credentials);
-
-        Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken token, TaskAgentStatus status, string version);
-    }
-
-    public sealed class BrokerServer : RunnerService, IBrokerServer
-    {
-        private bool _hasConnection;
-        private Uri _brokerUri;
-        private RawConnection _connection;
-        private BrokerHttpClient _brokerHttpClient;
-
-        public async Task ConnectAsync(Uri serverUri, VssCredentials credentials)
-        {
-            _brokerUri = serverUri;
-
-            _connection = VssUtil.CreateRawConnection(serverUri, credentials);
-            _brokerHttpClient = await _connection.GetClientAsync<BrokerHttpClient>();
-            _hasConnection = true;
-        }
-
-        private void CheckConnection()
-        {
-            if (!_hasConnection)
-            {
-                throw new InvalidOperationException($"SetConnection");
-            }
-        }
-
-        public Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken cancellationToken, TaskAgentStatus status, string version)
-        {
-            CheckConnection();
-            var jobMessage = RetryRequest<TaskAgentMessage>(
-                async () => await _brokerHttpClient.GetRunnerMessageAsync(version, status, cancellationToken), cancellationToken);
-
-            return jobMessage;
-        }
-    }
-}

src/Runner.Common/CommandLineParser.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using GitHub.DistributedTask.Logging;
 using GitHub.Runner.Sdk;

src/Runner.Common/ConfigurationStore.cs

@@ -1,4 +1,4 @@
-using GitHub.Runner.Sdk;
+using GitHub.Runner.Sdk;
 using System;
 using System.IO;
 using System.Linq;
@@ -50,12 +50,6 @@ namespace GitHub.Runner.Common
         [DataMember(EmitDefaultValue = false)]
         public string MonitorSocketAddress { get; set; }
 
-        [DataMember(EmitDefaultValue = false)]
-        public bool UseV2Flow { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public string ServerUrlV2 { get; set; }
-
         [IgnoreDataMember]
         public bool IsHostedServer
         {

src/Runner.Common/Constants.cs

@@ -132,7 +132,6 @@ namespace GitHub.Runner.Common
                     public static readonly string GenerateServiceConfig = "generateServiceConfig";
                     public static readonly string Help = "help";
                     public static readonly string Local = "local";
-                    public static readonly string NoDefaultLabels = "no-default-labels";
                     public static readonly string Replace = "replace";
                     public static readonly string DisableUpdate = "disableupdate";
                     public static readonly string Once = "once"; // Keep this around since customers still relies on it
@@ -262,8 +261,6 @@ namespace GitHub.Runner.Common
                 public static readonly string AccessToken = "system.accessToken";
                 public static readonly string Culture = "system.culture";
                 public static readonly string PhaseDisplayName = "system.phaseDisplayName";
-                public static readonly string JobRequestType = "system.jobRequestType";
-                public static readonly string OrchestrationId = "system.orchestrationId";
             }
         }
 

src/Runner.Common/ExtensionManager.cs

@@ -1,4 +1,4 @@
-using GitHub.Runner.Sdk;
+using GitHub.Runner.Sdk;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;

src/Runner.Common/HostContext.cs

@@ -220,7 +220,7 @@ namespace GitHub.Runner.Common
             var runnerFile = GetConfigFile(WellKnownConfigFile.Runner);
             if (File.Exists(runnerFile))
             {
-                var runnerSettings = IOUtil.LoadObject<RunnerSettings>(runnerFile, true);
+                var runnerSettings = IOUtil.LoadObject<RunnerSettings>(runnerFile);
                 _userAgents.Add(new ProductInfoHeaderValue("RunnerId", runnerSettings.AgentId.ToString(CultureInfo.InvariantCulture)));
                 _userAgents.Add(new ProductInfoHeaderValue("GroupId", runnerSettings.PoolId.ToString(CultureInfo.InvariantCulture)));
             }

src/Runner.Common/HostTraceListener.cs

@@ -1,4 +1,4 @@
-using GitHub.Runner.Sdk;
+using GitHub.Runner.Sdk;
 using System;
 using System.Diagnostics;
 using System.Globalization;

src/Runner.Common/HttpClientHandlerFactory.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net.Http;
 using GitHub.Runner.Sdk;
 

src/Runner.Common/JobNotification.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;

src/Runner.Common/JobServer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -11,10 +11,10 @@ using System.Threading.Tasks;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
-using GitHub.Services.OAuth;
-using GitHub.Services.Results.Client;
 using GitHub.Services.WebApi;
 using GitHub.Services.WebApi.Utilities.Internal;
+using GitHub.Services.Results.Client;
+using GitHub.Services.OAuth;
 
 namespace GitHub.Runner.Common
 {
@@ -24,11 +24,15 @@ namespace GitHub.Runner.Common
         Task ConnectAsync(VssConnection jobConnection);
 
         void InitializeWebsocketClient(ServiceEndpoint serviceEndpoint);
+        void InitializeResultsClient(Uri uri, string token);
 
         // logging and console
         Task<TaskLog> AppendLogContentAsync(Guid scopeIdentifier, string hubName, Guid planId, int logId, Stream uploadStream, CancellationToken cancellationToken);
         Task AppendTimelineRecordFeedAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, Guid timelineRecordId, Guid stepId, IList<string> lines, long? startLine, CancellationToken cancellationToken);
         Task<TaskAttachment> CreateAttachmentAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, Guid timelineRecordId, String type, String name, Stream uploadStream, CancellationToken cancellationToken);
+        Task CreateStepSummaryAsync(string planId, string jobId, Guid stepId, string file, CancellationToken cancellationToken);
+        Task CreateResultsStepLogAsync(string planId, string jobId, Guid stepId, string file, bool finalize, bool firstBlock, long lineCount, CancellationToken cancellationToken);
+        Task CreateResultsJobLogAsync(string planId, string jobId, string file, bool finalize, bool firstBlock, long lineCount, CancellationToken cancellationToken);
         Task<TaskLog> CreateLogAsync(Guid scopeIdentifier, string hubName, Guid planId, TaskLog log, CancellationToken cancellationToken);
         Task<Timeline> CreateTimelineAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, CancellationToken cancellationToken);
         Task<List<TimelineRecord>> UpdateTimelineRecordsAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, IEnumerable<TimelineRecord> records, CancellationToken cancellationToken);
@@ -42,6 +46,7 @@ namespace GitHub.Runner.Common
         private bool _hasConnection;
         private VssConnection _connection;
         private TaskHttpClient _taskClient;
+        private ResultsHttpClient _resultsClient;
         private ClientWebSocket _websocketClient;
 
         private ServiceEndpoint _serviceEndpoint;
@@ -145,6 +150,12 @@ namespace GitHub.Runner.Common
             InitializeWebsocketClient(TimeSpan.Zero);
         }
 
+        public void InitializeResultsClient(Uri uri, string token)
+        {
+            var httpMessageHandler = HostContext.CreateHttpClientHandler();
+            this._resultsClient = new ResultsHttpClient(uri, httpMessageHandler, token, disposeHandler: true);
+        }
+
         public ValueTask DisposeAsync()
         {
             CloseWebSocket(WebSocketCloseStatus.NormalClosure, CancellationToken.None);
@@ -199,15 +210,13 @@ namespace GitHub.Runner.Common
             {
                 Trace.Info($"Attempting to start websocket client with delay {delay}.");
                 await Task.Delay(delay);
-                using var connectTimeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
-                await this._websocketClient.ConnectAsync(new Uri(feedStreamUrl), connectTimeoutTokenSource.Token);
+                await this._websocketClient.ConnectAsync(new Uri(feedStreamUrl), default(CancellationToken));
                 Trace.Info($"Successfully started websocket client.");
             }
             catch (Exception ex)
             {
                 Trace.Info("Exception caught during websocket client connect, fallback of HTTP would be used now instead of websocket.");
                 Trace.Error(ex);
-                this._websocketClient = null;
             }
         }
 
@@ -254,7 +263,7 @@ namespace GitHub.Runner.Common
                 {
                     failedAttemptsToPostBatchedLinesByWebsocket++;
                     Trace.Info($"Caught exception during append web console line to websocket, let's fallback to sending via non-websocket call (total calls: {totalBatchedLinesAttemptedByWebsocket}, failed calls: {failedAttemptsToPostBatchedLinesByWebsocket}, websocket state: {this._websocketClient?.State}).");
-                    Trace.Verbose(ex.ToString());
+                    Trace.Error(ex);
                     if (totalBatchedLinesAttemptedByWebsocket > _minWebsocketBatchedLinesCountToConsider)
                     {
                         // let's consider failure percentage
@@ -309,6 +318,32 @@ namespace GitHub.Runner.Common
             return _taskClient.CreateAttachmentAsync(scopeIdentifier, hubName, planId, timelineId, timelineRecordId, type, name, uploadStream, cancellationToken: cancellationToken);
         }
 
+        public Task CreateStepSummaryAsync(string planId, string jobId, Guid stepId, string file, CancellationToken cancellationToken)
+        {
+            if (_resultsClient != null)
+            {
+                return _resultsClient.UploadStepSummaryAsync(planId, jobId, stepId, file, cancellationToken: cancellationToken);
+            }
+            throw new InvalidOperationException("Results client is not initialized.");
+        }
+
+        public Task CreateResultsStepLogAsync(string planId, string jobId, Guid stepId, string file, bool finalize, bool firstBlock, long lineCount, CancellationToken cancellationToken)
+        {
+            if (_resultsClient != null)
+            {
+                return _resultsClient.UploadResultsStepLogAsync(planId, jobId, stepId, file, finalize, firstBlock, lineCount, cancellationToken: cancellationToken);
+            }
+            throw new InvalidOperationException("Results client is not initialized.");
+        }
+
+        public Task CreateResultsJobLogAsync(string planId, string jobId, string file, bool finalize, bool firstBlock, long lineCount, CancellationToken cancellationToken)
+        {
+            if (_resultsClient != null)
+            {
+                return _resultsClient.UploadResultsJobLogAsync(planId, jobId, file, finalize, firstBlock, lineCount, cancellationToken: cancellationToken);
+            }
+            throw new InvalidOperationException("Results client is not initialized.");
+        }
 
         public Task<TaskLog> CreateLogAsync(Guid scopeIdentifier, string hubName, Guid planId, TaskLog log, CancellationToken cancellationToken)
         {

src/Runner.Common/JobServerQueue.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
@@ -17,7 +17,7 @@ namespace GitHub.Runner.Common
         TaskCompletionSource<int> JobRecordUpdated { get; }
         event EventHandler<ThrottlingEventArgs> JobServerQueueThrottling;
         Task ShutdownAsync();
-        void Start(Pipelines.AgentJobRequestMessage jobRequest, bool resultServiceOnly = false);
+        void Start(Pipelines.AgentJobRequestMessage jobRequest);
         void QueueWebConsoleLine(Guid stepRecordId, string line, long? lineNumber = null);
         void QueueFileUpload(Guid timelineId, Guid timelineRecordId, string type, string name, string path, bool deleteSource);
         void QueueResultsUpload(Guid timelineRecordId, string name, string path, string type, bool deleteSource, bool finalize, bool firstBlock, long totalLines);
@@ -65,12 +65,10 @@ namespace GitHub.Runner.Common
 
         // common
         private IJobServer _jobServer;
-        private IResultsServer _resultsServer;
         private Task[] _allDequeueTasks;
         private readonly TaskCompletionSource<int> _jobCompletionSource = new();
         private readonly TaskCompletionSource<int> _jobRecordUpdated = new();
         private bool _queueInProcess = false;
-        private bool _resultsServiceOnly = false;
 
         public TaskCompletionSource<int> JobRecordUpdated => _jobRecordUpdated;
 
@@ -93,20 +91,15 @@ namespace GitHub.Runner.Common
         {
             base.Initialize(hostContext);
             _jobServer = hostContext.GetService<IJobServer>();
-            _resultsServer = hostContext.GetService<IResultsServer>();
         }
 
-        public void Start(Pipelines.AgentJobRequestMessage jobRequest, bool resultServiceOnly = false)
+        public void Start(Pipelines.AgentJobRequestMessage jobRequest)
         {
             Trace.Entering();
-            _resultsServiceOnly = resultServiceOnly;
 
             var serviceEndPoint = jobRequest.Resources.Endpoints.Single(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
 
-            if (!resultServiceOnly)
-            {
             _jobServer.InitializeWebsocketClient(serviceEndPoint);
-            }
 
             // This code is usually wrapped by an instance of IExecutionContext which isn't available here.
             jobRequest.Variables.TryGetValue("system.github.results_endpoint", out VariableValue resultsEndpointVariable);
@@ -117,16 +110,8 @@ namespace GitHub.Runner.Common
                 !string.IsNullOrEmpty(accessToken) &&
                 !string.IsNullOrEmpty(resultsReceiverEndpoint))
             {
-                string liveConsoleFeedUrl = null;
                 Trace.Info("Initializing results client");
-                if (resultServiceOnly
-                    && serviceEndPoint.Data.TryGetValue("FeedStreamUrl", out var feedStreamUrl)
-                    && !string.IsNullOrEmpty(feedStreamUrl))
-                {
-                    liveConsoleFeedUrl = feedStreamUrl;
-                }
-
-                _resultsServer.InitializeResultsClient(new Uri(resultsReceiverEndpoint), liveConsoleFeedUrl, accessToken);
+                _jobServer.InitializeResultsClient(new Uri(resultsReceiverEndpoint), accessToken);
                 _resultsClientInitiated = true;
             }
 
@@ -207,9 +192,6 @@ namespace GitHub.Runner.Common
             Trace.Info($"Disposing job server ...");
             await _jobServer.DisposeAsync();
 
-            Trace.Info($"Disposing results server ...");
-            await _resultsServer.DisposeAsync();
-
             Trace.Info("All queue process tasks have been stopped, and all queues are drained.");
         }
 
@@ -387,16 +369,9 @@ namespace GitHub.Runner.Common
                             {
                                 // Give at most 60s for each request.
                                 using (var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(60)))
-                                {
-                                    if (_resultsServiceOnly)
-                                    {
-                                        await _resultsServer.AppendLiveConsoleFeedAsync(_scopeIdentifier, _hubName, _planId, _jobTimelineId, _jobTimelineRecordId, stepRecordId, batch.Select(logLine => logLine.Line).ToList(), batch[0].LineNumber, timeoutTokenSource.Token);
-                                    }
-                                    else
                                 {
                                     await _jobServer.AppendTimelineRecordFeedAsync(_scopeIdentifier, _hubName, _planId, _jobTimelineId, _jobTimelineRecordId, stepRecordId, batch.Select(logLine => logLine.Line).ToList(), batch[0].LineNumber, timeoutTokenSource.Token);
                                 }
-                                }
 
                                 if (_firstConsoleOutputs)
                                 {
@@ -537,14 +512,19 @@ namespace GitHub.Runner.Common
                         }
                         catch (Exception ex)
                         {
+                            var issue = new Issue() { Type = IssueType.Warning, Message = $"Caught exception during file upload to results. {ex.Message}" };
+                            issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.ResultsUploadFailure;
+
+                            var telemetryRecord = new TimelineRecord()
+                            {
+                                Id = Constants.Runner.TelemetryRecordId,
+                            };
+                            telemetryRecord.Issues.Add(issue);
+                            QueueTimelineRecordUpdate(_jobTimelineId, telemetryRecord);
+
                             Trace.Info("Catch exception during file upload to results, keep going since the process is best effort.");
                             Trace.Error(ex);
                             errorCount++;
-
-                            // If we hit any exceptions uploading to Results, let's skip any additional uploads to Results
-                            _resultsClientInitiated = false;
-
-                            SendResultsTelemetry(ex);
                         }
                     }
 
@@ -562,19 +542,6 @@ namespace GitHub.Runner.Common
             }
         }
 
-        private void SendResultsTelemetry(Exception ex)
-        {
-            var issue = new Issue() { Type = IssueType.Warning, Message = $"Caught exception with results. {ex.Message}" };
-            issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.ResultsUploadFailure;
-
-            var telemetryRecord = new TimelineRecord()
-            {
-                Id = Constants.Runner.TelemetryRecordId,
-            };
-            telemetryRecord.Issues.Add(issue);
-            QueueTimelineRecordUpdate(_jobTimelineId, telemetryRecord);
-        }
-
         private async Task ProcessTimelinesUpdateQueueAsync(bool runOnce = false)
         {
             while (!_jobCompletionSource.Task.IsCompleted || runOnce)
@@ -622,7 +589,7 @@ namespace GitHub.Runner.Common
 
                         foreach (var detailTimeline in update.PendingRecords.Where(r => r.Details != null))
                         {
-                            if (!_resultsServiceOnly && !_allTimelines.Contains(detailTimeline.Details.Id))
+                            if (!_allTimelines.Contains(detailTimeline.Details.Id))
                             {
                                 try
                                 {
@@ -643,28 +610,8 @@ namespace GitHub.Runner.Common
                         }
 
                         try
-                        {
-                            if (!_resultsServiceOnly)
                         {
                             await _jobServer.UpdateTimelineRecordsAsync(_scopeIdentifier, _hubName, _planId, update.TimelineId, update.PendingRecords, default(CancellationToken));
-                            }
-
-                            try
-                            {
-                                if (_resultsClientInitiated)
-                                {
-                                    await _resultsServer.UpdateResultsWorkflowStepsAsync(_scopeIdentifier, _hubName, _planId, update.TimelineId, update.PendingRecords, default(CancellationToken));
-                                }
-                            }
-                            catch (Exception e)
-                            {
-                                Trace.Info("Catch exception during update steps, skip update Results.");
-                                Trace.Error(e);
-                                _resultsClientInitiated = false;
-
-                                SendResultsTelemetry(e);
-                            }
-
                             if (_bufferedRetryRecords.Remove(update.TimelineId))
                             {
                                 Trace.Verbose("Cleanup buffered timeline record for timeline: {0}.", update.TimelineId);
@@ -756,17 +703,17 @@ namespace GitHub.Runner.Common
                     timelineRecord.State = rec.State ?? timelineRecord.State;
                     timelineRecord.WorkerName = rec.WorkerName ?? timelineRecord.WorkerName;
 
-                    if (rec.ErrorCount > 0)
+                    if (rec.ErrorCount != null && rec.ErrorCount > 0)
                     {
                         timelineRecord.ErrorCount = rec.ErrorCount;
                     }
 
-                    if (rec.WarningCount > 0)
+                    if (rec.WarningCount != null && rec.WarningCount > 0)
                     {
                         timelineRecord.WarningCount = rec.WarningCount;
                     }
 
-                    if (rec.NoticeCount > 0)
+                    if (rec.NoticeCount != null && rec.NoticeCount > 0)
                     {
                         timelineRecord.NoticeCount = rec.NoticeCount;
                     }
@@ -797,7 +744,7 @@ namespace GitHub.Runner.Common
             foreach (var record in mergedRecords)
             {
                 Trace.Verbose($"    Record: t={record.RecordType}, n={record.Name}, s={record.State}, st={record.StartTime}, {record.PercentComplete}%, ft={record.FinishTime}, r={record.Result}: {record.CurrentOperation}");
-                if (record.Issues != null)
+                if (record.Issues != null && record.Issues.Count > 0)
                 {
                     foreach (var issue in record.Issues)
                     {
@@ -807,7 +754,7 @@ namespace GitHub.Runner.Common
                     }
                 }
 
-                if (record.Variables != null)
+                if (record.Variables != null && record.Variables.Count > 0)
                 {
                     foreach (var variable in record.Variables)
                     {
@@ -823,8 +770,6 @@ namespace GitHub.Runner.Common
         {
             bool uploadSucceed = false;
             try
-            {
-                if (!_resultsServiceOnly)
             {
                 if (String.Equals(file.Type, CoreAttachmentType.Log, StringComparison.OrdinalIgnoreCase))
                 {
@@ -849,7 +794,6 @@ namespace GitHub.Runner.Common
                         var result = await _jobServer.CreateAttachmentAsync(_scopeIdentifier, _hubName, _planId, file.TimelineId, file.TimelineRecordId, file.Type, file.Name, fs, default(CancellationToken));
                     }
                 }
-                }
 
                 uploadSucceed = true;
             }
@@ -875,7 +819,7 @@ namespace GitHub.Runner.Common
             Trace.Info($"Starting to upload summary file to results service {file.Name}, {file.Path}");
             ResultsFileUploadHandler summaryHandler = async (file) =>
             {
-                await _resultsServer.CreateResultsStepSummaryAsync(file.PlanId, file.JobId, file.RecordId, file.Path, CancellationToken.None);
+                await _jobServer.CreateStepSummaryAsync(file.PlanId, file.JobId, file.RecordId, file.Path, CancellationToken.None);
             };
 
             await UploadResultsFile(file, summaryHandler);
@@ -886,7 +830,7 @@ namespace GitHub.Runner.Common
             Trace.Info($"Starting upload of step log file to results service {file.Name}, {file.Path}");
             ResultsFileUploadHandler stepLogHandler = async (file) =>
             {
-                await _resultsServer.CreateResultsStepLogAsync(file.PlanId, file.JobId, file.RecordId, file.Path, file.Finalize, file.FirstBlock, file.TotalLines, CancellationToken.None);
+                await _jobServer.CreateResultsStepLogAsync(file.PlanId, file.JobId, file.RecordId, file.Path, file.Finalize, file.FirstBlock, file.TotalLines, CancellationToken.None);
             };
 
             await UploadResultsFile(file, stepLogHandler);
@@ -897,7 +841,7 @@ namespace GitHub.Runner.Common
             Trace.Info($"Starting upload of job log file to results service {file.Name}, {file.Path}");
             ResultsFileUploadHandler jobLogHandler = async (file) =>
             {
-                await _resultsServer.CreateResultsJobLogAsync(file.PlanId, file.JobId, file.Path, file.Finalize, file.FirstBlock, file.TotalLines, CancellationToken.None);
+                await _jobServer.CreateResultsJobLogAsync(file.PlanId, file.JobId, file.Path, file.Finalize, file.FirstBlock, file.TotalLines, CancellationToken.None);
             };
 
             await UploadResultsFile(file, jobLogHandler);
@@ -905,11 +849,6 @@ namespace GitHub.Runner.Common
 
         private async Task UploadResultsFile(ResultsUploadFileInfo file, ResultsFileUploadHandler uploadHandler)
         {
-            if (!_resultsClientInitiated)
-            {
-                return;
-            }
-
             bool uploadSucceed = false;
             try
             {
@@ -964,6 +903,8 @@ namespace GitHub.Runner.Common
         public long TotalLines { get; set; }
     }
 
+
+
     internal class ConsoleLineInfo
     {
         public ConsoleLineInfo(Guid recordId, string line, long? lineNumber)

src/Runner.Common/JobStatusEventArgs.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using GitHub.DistributedTask.WebApi;
 
 namespace GitHub.Runner.Common

src/Runner.Common/LaunchServer.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Services.Launch.Client;
-using GitHub.Services.WebApi;
-
-namespace GitHub.Runner.Common
-{
-    [ServiceLocator(Default = typeof(LaunchServer))]
-    public interface ILaunchServer : IRunnerService
-    {
-        void InitializeLaunchClient(Uri uri, string token);
-
-        Task<ActionDownloadInfoCollection> ResolveActionsDownloadInfoAsync(Guid planId, Guid jobId, ActionReferenceList actionReferenceList, CancellationToken cancellationToken);
-    }
-
-    public sealed class LaunchServer : RunnerService, ILaunchServer
-    {
-        private LaunchHttpClient _launchClient;
-
-        public void InitializeLaunchClient(Uri uri, string token)
-        {
-            var httpMessageHandler = HostContext.CreateHttpClientHandler();
-            this._launchClient = new LaunchHttpClient(uri, httpMessageHandler, token, disposeHandler: true);
-        }
-
-        public Task<ActionDownloadInfoCollection> ResolveActionsDownloadInfoAsync(Guid planId, Guid jobId, ActionReferenceList actionReferenceList,
-            CancellationToken cancellationToken)
-        {
-            if (_launchClient != null)
-            {
-                return _launchClient.GetResolveActionsDownloadInfoAsync(planId, jobId, actionReferenceList,
-                    cancellationToken: cancellationToken);
-            }
-
-            throw new InvalidOperationException("Launch client is not initialized.");
-        }
-    }
-}

src/Runner.Common/Logging.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 namespace GitHub.Runner.Common

src/Runner.Common/ProcessInvoker.cs

@@ -1,4 +1,4 @@
-using GitHub.Runner.Common.Util;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Collections.Generic;

src/Runner.Common/ResultsServer.cs

@@ -1,262 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http.Headers;
-using System.Net.WebSockets;
-using System.Security;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
-using GitHub.Services.Results.Client;
-using GitHub.Services.WebApi.Utilities.Internal;
-
-namespace GitHub.Runner.Common
-{
-    [ServiceLocator(Default = typeof(ResultServer))]
-    public interface IResultsServer : IRunnerService, IAsyncDisposable
-    {
-        void InitializeResultsClient(Uri uri, string liveConsoleFeedUrl, string token);
-
-        Task<bool> AppendLiveConsoleFeedAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, Guid timelineRecordId, Guid stepId, IList<string> lines, long? startLine, CancellationToken cancellationToken);
-
-        // logging and console
-        Task CreateResultsStepSummaryAsync(string planId, string jobId, Guid stepId, string file,
-            CancellationToken cancellationToken);
-
-        Task CreateResultsStepLogAsync(string planId, string jobId, Guid stepId, string file, bool finalize,
-            bool firstBlock, long lineCount, CancellationToken cancellationToken);
-
-        Task CreateResultsJobLogAsync(string planId, string jobId, string file, bool finalize, bool firstBlock,
-            long lineCount, CancellationToken cancellationToken);
-
-        Task UpdateResultsWorkflowStepsAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId,
-            IEnumerable<TimelineRecord> records, CancellationToken cancellationToken);
-    }
-
-    public sealed class ResultServer : RunnerService, IResultsServer
-    {
-        private ResultsHttpClient _resultsClient;
-
-        private ClientWebSocket _websocketClient;
-        private DateTime? _lastConnectionFailure;
-
-        private static readonly TimeSpan MinDelayForWebsocketReconnect = TimeSpan.FromMilliseconds(100);
-        private static readonly TimeSpan MaxDelayForWebsocketReconnect = TimeSpan.FromMilliseconds(500);
-
-        private Task _websocketConnectTask;
-        private String _liveConsoleFeedUrl;
-        private string _token;
-
-        public void InitializeResultsClient(Uri uri, string liveConsoleFeedUrl, string token)
-        {
-            var httpMessageHandler = HostContext.CreateHttpClientHandler();
-            this._resultsClient = new ResultsHttpClient(uri, httpMessageHandler, token, disposeHandler: true);
-            _token = token;
-            if (!string.IsNullOrEmpty(liveConsoleFeedUrl))
-            {
-                _liveConsoleFeedUrl = liveConsoleFeedUrl;
-                InitializeWebsocketClient(liveConsoleFeedUrl, token, TimeSpan.Zero, retryConnection: true);
-            }
-        }
-
-        public Task CreateResultsStepSummaryAsync(string planId, string jobId, Guid stepId, string file,
-            CancellationToken cancellationToken)
-        {
-            if (_resultsClient != null)
-            {
-                return _resultsClient.UploadStepSummaryAsync(planId, jobId, stepId, file,
-                    cancellationToken: cancellationToken);
-            }
-
-            throw new InvalidOperationException("Results client is not initialized.");
-        }
-
-        public Task CreateResultsStepLogAsync(string planId, string jobId, Guid stepId, string file, bool finalize,
-            bool firstBlock, long lineCount, CancellationToken cancellationToken)
-        {
-            if (_resultsClient != null)
-            {
-                return _resultsClient.UploadResultsStepLogAsync(planId, jobId, stepId, file, finalize, firstBlock,
-                    lineCount, cancellationToken: cancellationToken);
-            }
-
-            throw new InvalidOperationException("Results client is not initialized.");
-        }
-
-        public Task CreateResultsJobLogAsync(string planId, string jobId, string file, bool finalize, bool firstBlock,
-            long lineCount, CancellationToken cancellationToken)
-        {
-            if (_resultsClient != null)
-            {
-                return _resultsClient.UploadResultsJobLogAsync(planId, jobId, file, finalize, firstBlock, lineCount,
-                    cancellationToken: cancellationToken);
-            }
-
-            throw new InvalidOperationException("Results client is not initialized.");
-        }
-
-        public Task UpdateResultsWorkflowStepsAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId,
-            IEnumerable<TimelineRecord> records, CancellationToken cancellationToken)
-        {
-            if (_resultsClient != null)
-            {
-                try
-                {
-                    var timelineRecords = records.ToList();
-                    return _resultsClient.UpdateWorkflowStepsAsync(planId, new List<TimelineRecord>(timelineRecords),
-                        cancellationToken: cancellationToken);
-                }
-                catch (Exception ex)
-                {
-                    // Log error, but continue as this call is best-effort
-                    Trace.Info($"Failed to update steps status due to {ex.GetType().Name}");
-                    Trace.Error(ex);
-                }
-            }
-
-            throw new InvalidOperationException("Results client is not initialized.");
-        }
-
-        public ValueTask DisposeAsync()
-        {
-            CloseWebSocket(WebSocketCloseStatus.NormalClosure, CancellationToken.None);
-
-            GC.SuppressFinalize(this);
-
-            return ValueTask.CompletedTask;
-        }
-
-        private void InitializeWebsocketClient(string liveConsoleFeedUrl, string accessToken, TimeSpan delay, bool retryConnection = false)
-        {
-            if (string.IsNullOrEmpty(accessToken))
-            {
-                Trace.Info($"No access token from server");
-                return;
-            }
-
-            if (string.IsNullOrEmpty(liveConsoleFeedUrl))
-            {
-                Trace.Info($"No live console feed url from server");
-                return;
-            }
-
-            Trace.Info($"Creating websocket client ..." + liveConsoleFeedUrl);
-            this._websocketClient = new ClientWebSocket();
-            this._websocketClient.Options.SetRequestHeader("Authorization", $"Bearer {accessToken}");
-            var userAgentValues = new List<ProductInfoHeaderValue>();
-            userAgentValues.AddRange(UserAgentUtility.GetDefaultRestUserAgent());
-            userAgentValues.AddRange(HostContext.UserAgents);
-            this._websocketClient.Options.SetRequestHeader("User-Agent", string.Join(" ", userAgentValues.Select(x => x.ToString())));
-
-            // during initialization, retry upto 3 times to setup connection
-            this._websocketConnectTask = ConnectWebSocketClient(liveConsoleFeedUrl, delay, retryConnection);
-        }
-
-        private async Task ConnectWebSocketClient(string feedStreamUrl, TimeSpan delay, bool retryConnection = false)
-        {
-            bool connected = false;
-            int retries = 0;
-
-            do
-            {
-                try
-                {
-                    Trace.Info($"Attempting to start websocket client with delay {delay}.");
-                    await Task.Delay(delay);
-                    using var connectTimeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(30));
-                    await this._websocketClient.ConnectAsync(new Uri(feedStreamUrl), connectTimeoutTokenSource.Token);
-                    Trace.Info($"Successfully started websocket client.");
-                    connected = true;
-                }
-                catch (Exception ex)
-                {
-                    Trace.Info("Exception caught during websocket client connect, retry connection.");
-                    Trace.Error(ex);
-                    retries++;
-                    this._websocketClient = null;
-                    _lastConnectionFailure = DateTime.Now;
-                }
-            } while (retryConnection && !connected && retries < 3);
-        }
-
-        public async Task<bool> AppendLiveConsoleFeedAsync(Guid scopeIdentifier, string hubName, Guid planId, Guid timelineId, Guid timelineRecordId, Guid stepId, IList<string> lines, long? startLine, CancellationToken cancellationToken)
-        {
-            if (_websocketConnectTask != null)
-            {
-                await _websocketConnectTask;
-            }
-
-            bool delivered = false;
-            int retries = 0;
-
-            // "_websocketClient != null" implies either: We have a successful connection OR we have to attempt sending again and then reconnect
-            // ...in other words, if websocket client is null, we will skip sending to websocket
-            if (_websocketClient != null)
-            {
-                var linesWrapper = startLine.HasValue
-                    ? new TimelineRecordFeedLinesWrapper(stepId, lines, startLine.Value)
-                    : new TimelineRecordFeedLinesWrapper(stepId, lines);
-                var jsonData = StringUtil.ConvertToJson(linesWrapper);
-                var jsonDataBytes = Encoding.UTF8.GetBytes(jsonData);
-                // break the message into chunks of 1024 bytes
-                for (var i = 0; i < jsonDataBytes.Length; i += 1 * 1024)
-                {
-                    var lastChunk = i + (1 * 1024) >= jsonDataBytes.Length;
-                    var chunk = new ArraySegment<byte>(jsonDataBytes, i, Math.Min(1 * 1024, jsonDataBytes.Length - i));
-
-                    delivered = false;
-                    while (!delivered && retries < 3)
-                    {
-                        try
-                        {
-                            if (_websocketClient != null)
-                            {
-                                await _websocketClient.SendAsync(chunk, WebSocketMessageType.Text, endOfMessage: lastChunk, cancellationToken);
-                                delivered = true;
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            var delay = BackoffTimerHelper.GetRandomBackoff(MinDelayForWebsocketReconnect, MaxDelayForWebsocketReconnect);
-                            Trace.Info($"Websocket is not open, let's attempt to connect back again with random backoff {delay} ms.");
-                            Trace.Verbose(ex.ToString());
-                            retries++;
-                            InitializeWebsocketClient(_liveConsoleFeedUrl, _token, delay);
-                        }
-                    }
-                }
-            }
-
-            if (!delivered)
-            {
-                // Giving up for now, so next invocation of this method won't attempt to reconnect
-                _websocketClient = null;
-
-                // however if 10 minutes have already passed, let's try reestablish connection again
-                if (_lastConnectionFailure.HasValue && DateTime.Now > _lastConnectionFailure.Value.AddMinutes(10))
-                {
-                    // Some minutes passed since we retried last time, try connection again
-                    InitializeWebsocketClient(_liveConsoleFeedUrl, _token, TimeSpan.Zero);
-                }
-            }
-
-            return delivered;
-        }
-
-        private void CloseWebSocket(WebSocketCloseStatus closeStatus, CancellationToken cancellationToken)
-        {
-            try
-            {
-                _websocketClient?.CloseOutputAsync(closeStatus, "Closing websocket", cancellationToken);
-            }
-            catch (Exception websocketEx)
-            {
-                // In some cases this might be okay since the websocket might be open yet, so just close and don't trace exceptions
-                Trace.Info($"Failed to close websocket gracefully {websocketEx.GetType().Name}");
-            }
-        }
-    }
-}

src/Runner.Common/RunServer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -19,14 +19,7 @@ namespace GitHub.Runner.Common
 
         Task<AgentJobRequestMessage> GetJobMessageAsync(string id, CancellationToken token);
 
-        Task CompleteJobAsync(
-            Guid planId,
-            Guid jobId,
-            TaskResult result,
-            Dictionary<String, VariableValue> outputs,
-            IList<StepResult> stepResults,
-            IList<Annotation> jobAnnotations,
-            CancellationToken token);
+        Task CompleteJobAsync(Guid planId, Guid jobId, TaskResult result, Dictionary<String, VariableValue> outputs, IList<StepResult> stepResults, CancellationToken token);
 
         Task<RenewJobResponse> RenewJobAsync(Guid planId, Guid jobId, CancellationToken token);
     }
@@ -58,30 +51,34 @@ namespace GitHub.Runner.Common
         public Task<AgentJobRequestMessage> GetJobMessageAsync(string id, CancellationToken cancellationToken)
         {
             CheckConnection();
-            return RetryRequest<AgentJobRequestMessage>(
-                async () => await _runServiceHttpClient.GetJobMessageAsync(requestUri, id, cancellationToken), cancellationToken,
-                shouldRetry: ex => ex is not TaskOrchestrationJobAlreadyAcquiredException);
+            var jobMessage = RetryRequest<AgentJobRequestMessage>(
+                async () => await _runServiceHttpClient.GetJobMessageAsync(requestUri, id, cancellationToken), cancellationToken);
+            if (jobMessage == null)
+            {
+                throw new TaskOrchestrationJobNotFoundException(id);
             }
 
-        public Task CompleteJobAsync(
-            Guid planId,
-            Guid jobId,
-            TaskResult result,
-            Dictionary<String, VariableValue> outputs,
-            IList<StepResult> stepResults,
-            IList<Annotation> jobAnnotations,
-            CancellationToken cancellationToken)
+            return jobMessage;
+        }
+
+        public Task CompleteJobAsync(Guid planId, Guid jobId, TaskResult result, Dictionary<String, VariableValue> outputs, IList<StepResult> stepResults, CancellationToken cancellationToken)
         {
             CheckConnection();
             return RetryRequest(
-                async () => await _runServiceHttpClient.CompleteJobAsync(requestUri, planId, jobId, result, outputs, stepResults, jobAnnotations, cancellationToken), cancellationToken);
+                async () => await _runServiceHttpClient.CompleteJobAsync(requestUri, planId, jobId, result, outputs, stepResults, cancellationToken), cancellationToken);
         }
 
         public Task<RenewJobResponse> RenewJobAsync(Guid planId, Guid jobId, CancellationToken cancellationToken)
         {
             CheckConnection();
-            return RetryRequest<RenewJobResponse>(
+            var renewJobResponse = RetryRequest<RenewJobResponse>(
                 async () => await _runServiceHttpClient.RenewJobAsync(requestUri, planId, jobId, cancellationToken), cancellationToken);
+            if (renewJobResponse == null)
+            {
+                throw new TaskOrchestrationJobNotFoundException(jobId.ToString());
+            }
+
+            return renewJobResponse;
         }
     }
 }

src/Runner.Common/RunnerDotcomServer.cs

@@ -1,237 +0,0 @@
-using GitHub.DistributedTask.WebApi;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.Services.WebApi;
-using GitHub.Services.Common;
-using GitHub.Runner.Sdk;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Linq;
-
-namespace GitHub.Runner.Common
-{
-    [ServiceLocator(Default = typeof(RunnerDotcomServer))]
-    public interface IRunnerDotcomServer : IRunnerService
-    {
-        Task<List<TaskAgent>> GetRunnersAsync(int runnerGroupId, string githubUrl, string githubToken, string agentName);
-
-        Task<DistributedTask.WebApi.Runner> AddRunnerAsync(int runnerGroupId, TaskAgent agent, string githubUrl, string githubToken, string publicKey);
-        Task<List<TaskAgentPool>> GetRunnerGroupsAsync(string githubUrl, string githubToken);
-
-        string GetGitHubRequestId(HttpResponseHeaders headers);
-    }
-
-    public enum RequestType
-    {
-        Get,
-        Post,
-        Patch,
-        Delete
-    }
-
-    public class RunnerDotcomServer : RunnerService, IRunnerDotcomServer
-    {
-        private ITerminal _term;
-
-        public override void Initialize(IHostContext hostContext)
-        {
-            base.Initialize(hostContext);
-            _term = hostContext.GetService<ITerminal>();
-        }
-
-
-        public async Task<List<TaskAgent>> GetRunnersAsync(int runnerGroupId, string githubUrl, string githubToken, string agentName = null)
-        {
-            var githubApiUrl = "";
-            var gitHubUrlBuilder = new UriBuilder(githubUrl);
-            var path = gitHubUrlBuilder.Path.Split('/', '\\', StringSplitOptions.RemoveEmptyEntries);
-            if (path.Length == 1)
-            {
-                // org runner
-                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/orgs/{path[0]}/actions/runner-groups/{runnerGroupId}/runners";
-                }
-                else
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/orgs/{path[0]}/actions/runner-groups/{runnerGroupId}/runners";
-                }
-            }
-            else if (path.Length == 2)
-            {
-                // repo or enterprise runner.
-                if (!string.Equals(path[0], "enterprises", StringComparison.OrdinalIgnoreCase))
-                {
-                    return null;
-                }
-
-                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/{path[0]}/{path[1]}/actions/runner-groups/{runnerGroupId}/runners";
-                }
-                else
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/{path[0]}/{path[1]}/actions/runner-groups/{runnerGroupId}/runners";
-                }
-            }
-            else
-            {
-                throw new ArgumentException($"'{githubUrl}' should point to an org or enterprise.");
-            }
-
-            var runnersList = await RetryRequest<ListRunnersResponse>(githubApiUrl, githubToken, RequestType.Get, 3, "Failed to get agents pools");
-            var agents = runnersList.ToTaskAgents();
-
-            if (string.IsNullOrEmpty(agentName))
-            {
-                return agents;
-            }
-
-            return agents.Where(x => string.Equals(x.Name, agentName, StringComparison.OrdinalIgnoreCase)).ToList();
-        }
-
-        public async Task<List<TaskAgentPool>> GetRunnerGroupsAsync(string githubUrl, string githubToken)
-        {
-            var githubApiUrl = "";
-            var gitHubUrlBuilder = new UriBuilder(githubUrl);
-            var path = gitHubUrlBuilder.Path.Split('/', '\\', StringSplitOptions.RemoveEmptyEntries);
-            if (path.Length == 1)
-            {
-                // org runner
-                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/orgs/{path[0]}/actions/runner-groups";
-                }
-                else
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/orgs/{path[0]}/actions/runner-groups";
-                }
-            }
-            else if (path.Length == 2)
-            {
-                // repo or enterprise runner.
-                if (!string.Equals(path[0], "enterprises", StringComparison.OrdinalIgnoreCase))
-                {
-                    return null;
-                }
-
-                if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/{path[0]}/{path[1]}/actions/runner-groups";
-                }
-                else
-                {
-                    githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/{path[0]}/{path[1]}/actions/runner-groups";
-                }
-            }
-            else
-            {
-                throw new ArgumentException($"'{githubUrl}' should point to an org or enterprise.");
-            }
-
-            var agentPools = await RetryRequest<RunnerGroupList>(githubApiUrl, githubToken, RequestType.Get, 3, "Failed to get agents pools");
-
-            return agentPools?.ToAgentPoolList();
-        }
-
-        public async Task<DistributedTask.WebApi.Runner> AddRunnerAsync(int runnerGroupId, TaskAgent agent, string githubUrl, string githubToken, string publicKey)
-        {
-            var gitHubUrlBuilder = new UriBuilder(githubUrl);
-            var path = gitHubUrlBuilder.Path.Split('/', '\\', StringSplitOptions.RemoveEmptyEntries);
-            string githubApiUrl;
-            if (UrlUtil.IsHostedServer(gitHubUrlBuilder))
-            {
-                githubApiUrl = $"{gitHubUrlBuilder.Scheme}://api.{gitHubUrlBuilder.Host}/actions/runners/register";
-            }
-            else
-            {
-                githubApiUrl = $"{gitHubUrlBuilder.Scheme}://{gitHubUrlBuilder.Host}/api/v3/actions/runners/register";
-            }
-
-            var bodyObject = new Dictionary<string, Object>()
-                    {
-                        {"url", githubUrl},
-                        {"group_id", runnerGroupId},
-                        {"name", agent.Name},
-                        {"version", agent.Version},
-                        {"updates_disabled", agent.DisableUpdate},
-                        {"ephemeral", agent.Ephemeral},
-                        {"labels", agent.Labels},
-                        {"public_key", publicKey}
-                    };
-
-            var body = new StringContent(StringUtil.ConvertToJson(bodyObject), null, "application/json");
-
-            return await RetryRequest<DistributedTask.WebApi.Runner>(githubApiUrl, githubToken, RequestType.Post, 3, "Failed to add agent", body);
-        }
-
-        private async Task<T> RetryRequest<T>(string githubApiUrl, string githubToken, RequestType requestType, int maxRetryAttemptsCount = 5, string errorMessage = null, StringContent body = null)
-        {
-            int retry = 0;
-            while (true)
-            {
-                retry++;
-                using (var httpClientHandler = HostContext.CreateHttpClientHandler())
-                using (var httpClient = new HttpClient(httpClientHandler))
-                {
-                    httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("RemoteAuth", githubToken);
-                    httpClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
-
-                    var responseStatus = System.Net.HttpStatusCode.OK;
-                    try
-                    {
-                        HttpResponseMessage response = null;
-                        if (requestType == RequestType.Get)
-                        {
-                            response = await httpClient.GetAsync(githubApiUrl);
-                        }
-                        else
-                        {
-                            response = await httpClient.PostAsync(githubApiUrl, body);
-                        }
-
-                        if (response != null)
-                        {
-                            responseStatus = response.StatusCode;
-                            var githubRequestId = GetGitHubRequestId(response.Headers);
-
-                            if (response.IsSuccessStatusCode)
-                            {
-                                Trace.Info($"Http response code: {response.StatusCode} from '{requestType.ToString()} {githubApiUrl}' ({githubRequestId})");
-                                var jsonResponse = await response.Content.ReadAsStringAsync();
-                                return StringUtil.ConvertFromJson<T>(jsonResponse);
-                            }
-                            else
-                            {
-                                _term.WriteError($"Http response code: {response.StatusCode} from '{requestType.ToString()} {githubApiUrl}' (Request Id: {githubRequestId})");
-                                var errorResponse = await response.Content.ReadAsStringAsync();
-                                _term.WriteError(errorResponse);
-                                response.EnsureSuccessStatusCode();
-                            }
-                        }
-
-                    }
-                    catch (Exception ex) when (retry < maxRetryAttemptsCount && responseStatus != System.Net.HttpStatusCode.NotFound)
-                    {
-                        Trace.Error($"{errorMessage} -- Atempt: {retry}");
-                        Trace.Error(ex);
-                    }
-                }
-                var backOff = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(5));
-                Trace.Info($"Retrying in {backOff.Seconds} seconds");
-                await Task.Delay(backOff);
-            }
-        }
-
-        public string GetGitHubRequestId(HttpResponseHeaders headers)
-        {
-            if (headers.TryGetValues("x-github-request-id", out var headerValues))
-            {
-                return headerValues.FirstOrDefault();
-            }
-            return string.Empty;
-        }
-    }
-}

src/Runner.Common/RunnerServer.cs

@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using System;
 using System.Collections.Generic;
 using System.Threading;

src/Runner.Common/RunnerService.cs

@@ -83,8 +83,7 @@ namespace GitHub.Runner.Common
         
         protected async Task<T> RetryRequest<T>(Func<Task<T>> func,
             CancellationToken cancellationToken,
-            int maxRetryAttemptsCount = 5,
-            Func<Exception, bool> shouldRetry = null
+            int maxRetryAttemptsCount = 5
         )
         {
             var retryCount = 0;
@@ -97,7 +96,7 @@ namespace GitHub.Runner.Common
                     return await func();
                 }
                 // TODO: Add handling of non-retriable exceptions: https://github.com/github/actions-broker/issues/122
-                catch (Exception ex) when (retryCount < maxRetryAttemptsCount && (shouldRetry == null || shouldRetry(ex)))
+                catch (Exception ex) when (retryCount < maxRetryAttemptsCount)
                 {
                     Trace.Error("Catch exception during request");
                     Trace.Error(ex);

src/Runner.Common/StdoutTraceListener.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;

src/Runner.Common/ThrottlingReportHandler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;

src/Runner.Common/TraceManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using GitHub.DistributedTask.Logging;

src/Runner.Common/Tracing.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;

src/Runner.Common/Unit.cs

@@ -1,4 +1,4 @@
-// Represents absence of value.
+// Represents absence of value.
 namespace GitHub.Runner.Common
 {
     public readonly struct Unit

src/Runner.Common/Util/EncodingUtil.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Sdk;

src/Runner.Common/Util/MessageUtil.cs

@@ -1,4 +1,4 @@
-namespace GitHub.Runner.Common.Util
+namespace GitHub.Runner.Common.Util
 {
     using System;
     using GitHub.DistributedTask.WebApi;

src/Runner.Common/Util/VarUtil.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace GitHub.Runner.Common.Util
 {

src/Runner.Listener/BrokerMessageListener.cs

@@ -1,209 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common;
-using GitHub.Runner.Listener.Configuration;
-using GitHub.Runner.Sdk;
-using GitHub.Services.Common;
-using GitHub.Runner.Common.Util;
-using GitHub.Services.OAuth;
-
-namespace GitHub.Runner.Listener
-{
-    public sealed class BrokerMessageListener : RunnerService, IMessageListener
-    {
-        private RunnerSettings _settings;
-        private ITerminal _term;
-        private TimeSpan _getNextMessageRetryInterval;
-        private TaskAgentStatus runnerStatus = TaskAgentStatus.Online;
-        private CancellationTokenSource _getMessagesTokenSource;
-        private IBrokerServer _brokerServer;
-
-        public override void Initialize(IHostContext hostContext)
-        {
-            base.Initialize(hostContext);
-
-            _term = HostContext.GetService<ITerminal>();
-            _brokerServer = HostContext.GetService<IBrokerServer>();
-        }
-
-        public async Task<Boolean> CreateSessionAsync(CancellationToken token)
-        {
-            await RefreshBrokerConnection();
-            return await Task.FromResult(true);
-        }
-
-        public async Task DeleteSessionAsync()
-        {
-            await Task.CompletedTask;
-        }
-
-        public void OnJobStatus(object sender, JobStatusEventArgs e)
-        {
-            Trace.Info("Received job status event. JobState: {0}", e.Status);
-            runnerStatus = e.Status;
-            try
-            {
-                _getMessagesTokenSource?.Cancel();
-            }
-            catch (ObjectDisposedException)
-            {
-                Trace.Info("_getMessagesTokenSource is already disposed.");
-            }
-        }
-
-        public async Task<TaskAgentMessage> GetNextMessageAsync(CancellationToken token)
-        {
-            bool encounteringError = false;
-            int continuousError = 0;
-            Stopwatch heartbeat = new();
-            heartbeat.Restart();
-            var maxRetryCount = 10;
-
-            while (true)
-            {
-                TaskAgentMessage message = null;
-                _getMessagesTokenSource = CancellationTokenSource.CreateLinkedTokenSource(token);
-                try
-                {
-                    message = await _brokerServer.GetRunnerMessageAsync(_getMessagesTokenSource.Token, runnerStatus, BuildConstants.RunnerPackage.Version);
-
-                    if (message == null)
-                    {
-                        continue;
-                    }
-
-                    return message;
-                }
-                catch (OperationCanceledException) when (_getMessagesTokenSource.Token.IsCancellationRequested && !token.IsCancellationRequested)
-                {
-                    Trace.Info("Get messages has been cancelled using local token source. Continue to get messages with new status.");
-                    continue;
-                }
-                catch (OperationCanceledException) when (token.IsCancellationRequested)
-                {
-                    Trace.Info("Get next message has been cancelled.");
-                    throw;
-                }
-                catch (TaskAgentAccessTokenExpiredException)
-                {
-                    Trace.Info("Runner OAuth token has been revoked. Unable to pull message.");
-                    throw;
-                }
-                catch (AccessDeniedException e) when (e.InnerException is InvalidTaskAgentVersionException)
-                {
-                    throw;
-                }
-                catch (Exception ex)
-                {
-                    Trace.Error("Catch exception during get next message.");
-                    Trace.Error(ex);
-
-                    if (!IsGetNextMessageExceptionRetriable(ex))
-                    {
-                        throw;
-                    }
-                    else
-                    {
-                        continuousError++;
-                        //retry after a random backoff to avoid service throttling
-                        //in case of there is a service error happened and all agents get kicked off of the long poll and all agent try to reconnect back at the same time.
-                        if (continuousError <= 5)
-                        {
-                            // random backoff [15, 30]
-                            _getNextMessageRetryInterval = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(30), _getNextMessageRetryInterval);
-                        }
-                        else if (continuousError >= maxRetryCount)
-                        {
-                            throw;
-                        }
-                        else
-                        {
-                            // more aggressive backoff [30, 60]
-                            _getNextMessageRetryInterval = BackoffTimerHelper.GetRandomBackoff(TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(60), _getNextMessageRetryInterval);
-                        }
-
-                        if (!encounteringError)
-                        {
-                            //print error only on the first consecutive error
-                            _term.WriteError($"{DateTime.UtcNow:u}: Runner connect error: {ex.Message}. Retrying until reconnected.");
-                            encounteringError = true;
-                        }
-
-                        // re-create VssConnection before next retry
-                        await RefreshBrokerConnection();
-
-                        Trace.Info("Sleeping for {0} seconds before retrying.", _getNextMessageRetryInterval.TotalSeconds);
-                        await HostContext.Delay(_getNextMessageRetryInterval, token);
-                    }
-                }
-                finally
-                {
-                    _getMessagesTokenSource.Dispose();
-                }
-
-                if (message == null)
-                {
-                    if (heartbeat.Elapsed > TimeSpan.FromMinutes(30))
-                    {
-                        Trace.Info($"No message retrieved within last 30 minutes.");
-                        heartbeat.Restart();
-                    }
-                    else
-                    {
-                        Trace.Verbose($"No message retrieved.");
-                    }
-
-                    continue;
-                }
-
-                Trace.Info($"Message '{message.MessageId}' received.");
-            }
-        }
-
-        public async Task DeleteMessageAsync(TaskAgentMessage message)
-        {
-            await Task.CompletedTask;
-        }
-
-        private bool IsGetNextMessageExceptionRetriable(Exception ex)
-        {
-            if (ex is TaskAgentNotFoundException ||
-                ex is TaskAgentPoolNotFoundException ||
-                ex is TaskAgentSessionExpiredException ||
-                ex is AccessDeniedException ||
-                ex is VssUnauthorizedException)
-            {
-                Trace.Info($"Non-retriable exception: {ex.Message}");
-                return false;
-            }
-            else
-            {
-                Trace.Info($"Retriable exception: {ex.Message}");
-                return true;
-            }
-        }
-
-        private async Task RefreshBrokerConnection()
-        {
-            var configManager = HostContext.GetService<IConfigurationManager>();
-            _settings = configManager.LoadSettings();
-
-            if (_settings.ServerUrlV2 == null)
-            {
-                throw new InvalidOperationException("ServerUrlV2 is not set");
-            }
-
-            var credMgr = HostContext.GetService<ICredentialManager>();
-            VssCredentials creds = credMgr.LoadCredentials();
-            await _brokerServer.ConnectAsync(new Uri(_settings.ServerUrlV2), creds);
-        }
-    }
-}

src/Runner.Listener/Checks/ActionsCheck.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;

src/Runner.Listener/Checks/CheckUtil.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using System.IO;

src/Runner.Listener/Checks/GitCheck.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Runner.Listener/Checks/ICheckExtension.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using GitHub.Runner.Common;
 

src/Runner.Listener/Checks/InternetCheck.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;

src/Runner.Listener/Checks/NodeJsCheck.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Runner.Listener/CommandSettings.cs

@@ -1,4 +1,4 @@
-using GitHub.Runner.Listener.Configuration;
+using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Common.Util;
 using System;
 using System.Collections;
@@ -38,7 +38,6 @@ namespace GitHub.Runner.Listener
                     Constants.Runner.CommandLine.Flags.Replace,
                     Constants.Runner.CommandLine.Flags.RunAsService,
                     Constants.Runner.CommandLine.Flags.Unattended,
-                    Constants.Runner.CommandLine.Flags.NoDefaultLabels,
                     Constants.Runner.CommandLine.Args.Auth,
                     Constants.Runner.CommandLine.Args.Labels,
                     Constants.Runner.CommandLine.Args.MonitorSocketAddress,
@@ -86,7 +85,6 @@ namespace GitHub.Runner.Listener
         public bool Ephemeral => TestFlag(Constants.Runner.CommandLine.Flags.Ephemeral);
         public bool GenerateServiceConfig => TestFlag(Constants.Runner.CommandLine.Flags.GenerateServiceConfig);
         public bool Help => TestFlag(Constants.Runner.CommandLine.Flags.Help);
-        public bool NoDefaultLabels => TestFlag(Constants.Runner.CommandLine.Flags.NoDefaultLabels);
         public bool Unattended => TestFlag(Constants.Runner.CommandLine.Flags.Unattended);
         public bool Version => TestFlag(Constants.Runner.CommandLine.Flags.Version);
         public bool RemoveLocalConfig => TestFlag(Constants.Runner.CommandLine.Flags.Local);

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
@@ -31,14 +31,12 @@ namespace GitHub.Runner.Listener.Configuration
     {
         private IConfigurationStore _store;
         private IRunnerServer _runnerServer;
-        private IRunnerDotcomServer _dotcomServer;
         private ITerminal _term;
 
         public override void Initialize(IHostContext hostContext)
         {
             base.Initialize(hostContext);
             _runnerServer = HostContext.GetService<IRunnerServer>();
-            _dotcomServer = HostContext.GetService<IRunnerDotcomServer>();
             Trace.Verbose("Creating _store");
             _store = hostContext.GetService<IConfigurationStore>();
             Trace.Verbose("store created");
@@ -115,7 +113,6 @@ namespace GitHub.Runner.Listener.Configuration
             ICredentialProvider credProvider = null;
             VssCredentials creds = null;
             _term.WriteSection("Authentication");
-            string registerToken = string.Empty;
             while (true)
             {
                 // When testing against a dev deployment of Actions Service, set this environment variable
@@ -133,11 +130,9 @@ namespace GitHub.Runner.Listener.Configuration
                 else
                 {
                     runnerSettings.GitHubUrl = inputUrl;
-                    registerToken = await GetRunnerTokenAsync(command, inputUrl, "registration");
+                    var registerToken = await GetRunnerTokenAsync(command, inputUrl, "registration");
                     GitHubAuthResult authResult = await GetTenantCredential(inputUrl, registerToken, Constants.RunnerEvent.Register);
                     runnerSettings.ServerUrl = authResult.TenantUrl;
-                    runnerSettings.UseV2Flow = authResult.UseV2Flow;
-                    Trace.Info($"Using V2 flow: {runnerSettings.UseV2Flow}");
                     creds = authResult.ToVssCredentials();
                     Trace.Info("cred retrieved via GitHub auth");
                 }
@@ -181,11 +176,9 @@ namespace GitHub.Runner.Listener.Configuration
             // We want to use the native CSP of the platform for storage, so we use the RSACSP directly
             RSAParameters publicKey;
             var keyManager = HostContext.GetService<IRSAKeyManager>();
-            string publicKeyXML;
             using (var rsa = keyManager.CreateKey())
             {
                 publicKey = rsa.ExportParameters(false);
-                publicKeyXML = rsa.ToXmlString(includePrivateParameters: false);
             }
 
             _term.WriteSection("Runner Registration");
@@ -193,17 +186,9 @@ namespace GitHub.Runner.Listener.Configuration
             // If we have more than one runner group available, allow the user to specify which one to be added into
             string poolName = null;
             TaskAgentPool agentPool = null;
-            List<TaskAgentPool> agentPools;
-            if (runnerSettings.UseV2Flow)
-            {
-                agentPools = await _dotcomServer.GetRunnerGroupsAsync(runnerSettings.GitHubUrl, registerToken);
-            }
-            else
-            {
-                agentPools = await _runnerServer.GetAgentPoolsAsync();
-            }
-
+            List<TaskAgentPool> agentPools = await _runnerServer.GetAgentPoolsAsync();
             TaskAgentPool defaultPool = agentPools?.Where(x => x.IsInternal).FirstOrDefault();
+
             if (agentPools?.Where(x => !x.IsHosted).Count() > 0)
             {
                 poolName = command.GetRunnerGroupName(defaultPool?.Name);
@@ -241,16 +226,8 @@ namespace GitHub.Runner.Listener.Configuration
 
                 var userLabels = command.GetLabels();
                 _term.WriteLine();
-                List<TaskAgent> agents;
-                if (runnerSettings.UseV2Flow)
-                {
-                    agents = await _dotcomServer.GetRunnersAsync(runnerSettings.PoolId, runnerSettings.GitHubUrl, registerToken, runnerSettings.AgentName);
-                }
-                else
-                {
-                    agents = await _runnerServer.GetAgentsAsync(runnerSettings.PoolId, runnerSettings.AgentName);
-                }
 
+                var agents = await _runnerServer.GetAgentsAsync(runnerSettings.PoolId, runnerSettings.AgentName);
                 Trace.Verbose("Returns {0} agents", agents.Count);
                 agent = agents.FirstOrDefault();
                 if (agent != null)
@@ -259,7 +236,7 @@ namespace GitHub.Runner.Listener.Configuration
                     if (command.GetReplace())
                     {
                         // Update existing agent with new PublicKey, agent version.
-                        agent = UpdateExistingAgent(agent, publicKey, userLabels, runnerSettings.Ephemeral, command.DisableUpdate, command.NoDefaultLabels);
+                        agent = UpdateExistingAgent(agent, publicKey, userLabels, runnerSettings.Ephemeral, command.DisableUpdate);
 
                         try
                         {
@@ -293,27 +270,11 @@ namespace GitHub.Runner.Listener.Configuration
                 else
                 {
                     // Create a new agent.
-                    agent = CreateNewAgent(runnerSettings.AgentName, publicKey, userLabels, runnerSettings.Ephemeral, command.DisableUpdate, command.NoDefaultLabels);
+                    agent = CreateNewAgent(runnerSettings.AgentName, publicKey, userLabels, runnerSettings.Ephemeral, command.DisableUpdate);
 
                     try
-                    {
-                        if (runnerSettings.UseV2Flow)
-                        {
-                            var runner = await _dotcomServer.AddRunnerAsync(runnerSettings.PoolId, agent, runnerSettings.GitHubUrl, registerToken, publicKeyXML);
-                            runnerSettings.ServerUrlV2 = runner.RunnerAuthorization.ServerUrl;
-
-                            agent.Id = runner.Id;
-                            agent.Authorization = new TaskAgentAuthorization()
-                            {
-                                AuthorizationUrl = runner.RunnerAuthorization.AuthorizationUrl,
-                                ClientId = new Guid(runner.RunnerAuthorization.ClientId)
-                            };
-                        }
-                        else
                     {
                         agent = await _runnerServer.AddAgentAsync(runnerSettings.PoolId, agent);
-                        }
-
                         if (command.DisableUpdate &&
                             command.DisableUpdate != agent.DisableUpdate)
                         {
@@ -364,9 +325,6 @@ namespace GitHub.Runner.Listener.Configuration
             }
 
             // Testing agent connection, detect any potential connection issue, like local clock skew that cause OAuth token expired.
-
-            if (!runnerSettings.UseV2Flow)
-            {
             var credMgr = HostContext.GetService<ICredentialManager>();
             VssCredentials credential = credMgr.LoadCredentials();
             try
@@ -386,7 +344,6 @@ namespace GitHub.Runner.Listener.Configuration
                 Trace.Error(ex);
                 throw new Exception("The local machine's clock may be out of sync with the server time by more than five minutes. Please sync your clock with your domain or internet time and try again.");
             }
-            }
 
             _term.WriteSection("Runner settings");
 
@@ -554,7 +511,7 @@ namespace GitHub.Runner.Listener.Configuration
         }
 
 
-        private TaskAgent UpdateExistingAgent(TaskAgent agent, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral, bool disableUpdate, bool noDefaultLabels)
+        private TaskAgent UpdateExistingAgent(TaskAgent agent, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral, bool disableUpdate)
         {
             ArgUtil.NotNull(agent, nameof(agent));
             agent.Authorization = new TaskAgentAuthorization
@@ -571,16 +528,9 @@ namespace GitHub.Runner.Listener.Configuration
 
             agent.Labels.Clear();
 
-            if (!noDefaultLabels)
-            {
             agent.Labels.Add(new AgentLabel("self-hosted", LabelType.System));
             agent.Labels.Add(new AgentLabel(VarUtil.OS, LabelType.System));
             agent.Labels.Add(new AgentLabel(VarUtil.OSArchitecture, LabelType.System));
-            }
-            else if (userLabels.Count == 0)
-            {
-                throw new NotSupportedException("Disabling default labels via --no-default-labels without specifying --labels is not supported");
-            }
 
             foreach (var userLabel in userLabels)
             {
@@ -590,7 +540,7 @@ namespace GitHub.Runner.Listener.Configuration
             return agent;
         }
 
-        private TaskAgent CreateNewAgent(string agentName, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral, bool disableUpdate, bool noDefaultLabels)
+        private TaskAgent CreateNewAgent(string agentName, RSAParameters publicKey, ISet<string> userLabels, bool ephemeral, bool disableUpdate)
         {
             TaskAgent agent = new(agentName)
             {
@@ -605,16 +555,9 @@ namespace GitHub.Runner.Listener.Configuration
                 DisableUpdate = disableUpdate
             };
 
-            if (!noDefaultLabels)
-            {
             agent.Labels.Add(new AgentLabel("self-hosted", LabelType.System));
             agent.Labels.Add(new AgentLabel(VarUtil.OS, LabelType.System));
             agent.Labels.Add(new AgentLabel(VarUtil.OSArchitecture, LabelType.System));
-            }
-            else if (userLabels.Count == 0)
-            {
-                throw new NotSupportedException("Disabling default labels via --no-default-labels without specifying --labels is not supported");
-            }
 
             foreach (var userLabel in userLabels)
             {
@@ -709,7 +652,7 @@ namespace GitHub.Runner.Listener.Configuration
                     {
                         var response = await httpClient.PostAsync(githubApiUrl, new StringContent(string.Empty));
                         responseStatus = response.StatusCode;
-                        var githubRequestId = _dotcomServer.GetGitHubRequestId(response.Headers);
+                        var githubRequestId = GetGitHubRequestId(response.Headers);
 
                         if (response.IsSuccessStatusCode)
                         {
@@ -772,7 +715,7 @@ namespace GitHub.Runner.Listener.Configuration
                     {
                         var response = await httpClient.PostAsync(githubApiUrl, new StringContent(StringUtil.ConvertToJson(bodyObject), null, "application/json"));
                         responseStatus = response.StatusCode;
-                        var githubRequestId = _dotcomServer.GetGitHubRequestId(response.Headers);
+                        var githubRequestId = GetGitHubRequestId(response.Headers);
 
                         if (response.IsSuccessStatusCode)
                         {
@@ -801,5 +744,14 @@ namespace GitHub.Runner.Listener.Configuration
             }
             return null;
         }
+
+        private string GetGitHubRequestId(HttpResponseHeaders headers)
+        {
+            if (headers.TryGetValues("x-github-request-id", out var headerValues))
+            {
+                return headerValues.FirstOrDefault();
+            }
+            return string.Empty;
+        }
     }
 }

src/Runner.Listener/Configuration/CredentialManager.cs

@@ -93,9 +93,6 @@ namespace GitHub.Runner.Listener.Configuration
         [DataMember(Name = "token")]
         public string Token { get; set; }
 
-        [DataMember(Name = "use_v2_flow")]
-        public bool UseV2Flow { get; set; }
-
         public VssCredentials ToVssCredentials()
         {
             ArgUtil.NotNullOrEmpty(TokenSchema, nameof(TokenSchema));

src/Runner.Listener/Configuration/NativeWindowsServiceHelper.cs

@@ -1,4 +1,4 @@
-#if OS_WINDOWS
+#if OS_WINDOWS
 #pragma warning disable CA1416
 using System;
 using System.Collections;

src/Runner.Listener/Configuration/PromptManager.cs

@@ -1,4 +1,4 @@
-using GitHub.Runner.Common;
+using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
 using System;
 

src/Runner.Listener/Configuration/RSAEncryptedFileKeyManager.cs

@@ -1,4 +1,4 @@
-#if OS_WINDOWS
+#if OS_WINDOWS
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;

src/Runner.Listener/Configuration/RSAFileKeyManager.cs

@@ -1,4 +1,4 @@
-#if OS_LINUX || OS_OSX
+#if OS_LINUX || OS_OSX
 using System;
 using System.IO;
 using System.Security.Cryptography;

src/Runner.Listener/Configuration/ServiceControlManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using GitHub.Runner.Common;

src/Runner.Listener/Configuration/SystemdControlManager.cs

@@ -1,4 +1,4 @@
-#if OS_LINUX
+#if OS_LINUX
 using System;
 using System.Collections.Generic;
 using System.IO;

src/Runner.Listener/Configuration/Validators.cs

@@ -1,4 +1,4 @@
-using GitHub.Runner.Common.Util;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Linq;

src/Runner.Listener/Configuration/WindowsServiceControlManager.cs

@@ -1,4 +1,4 @@
-#if OS_WINDOWS
+#if OS_WINDOWS
 #pragma warning disable CA1416
 using System;
 using System.IO;

src/Runner.Listener/InternalsVisibleTo.cs

@@ -1,3 +1,3 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Test")]

src/Runner.Listener/JobDispatcher.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
@@ -15,7 +15,6 @@ using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using GitHub.Services.WebApi;
 using GitHub.Services.WebApi.Jwt;
-using Sdk.RSWebApi.Contracts;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 
 namespace GitHub.Runner.Listener
@@ -373,8 +372,6 @@ namespace GitHub.Runner.Listener
                 TaskCompletionSource<int> firstJobRequestRenewed = new();
                 var notification = HostContext.GetService<IJobNotification>();
 
-                var systemConnection = message.Resources.Endpoints.SingleOrDefault(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
-
                 // lock renew cancellation token.
                 using (var lockRenewalTokenSource = new CancellationTokenSource())
                 using (var workerProcessCancelTokenSource = new CancellationTokenSource())
@@ -382,6 +379,8 @@ namespace GitHub.Runner.Listener
                     long requestId = message.RequestId;
                     Guid lockToken = Guid.Empty; // lockToken has never been used, keep this here of compat
 
+                    var systemConnection = message.Resources.Endpoints.SingleOrDefault(x => string.Equals(x.Name, WellKnownServiceEndpointNames.SystemVssConnection, StringComparison.OrdinalIgnoreCase));
+
                     // start renew job request
                     Trace.Info($"Start renew job request {requestId} for job {message.JobId}.");
                     Task renewJobRequest = RenewJobRequestAsync(message, systemConnection, _poolId, requestId, lockToken, orchestrationId, firstJobRequestRenewed, lockRenewalTokenSource.Token);
@@ -406,7 +405,7 @@ namespace GitHub.Runner.Listener
                         await renewJobRequest;
 
                         // complete job request with result Cancelled
-                        await CompleteJobRequestAsync(_poolId, message, systemConnection, lockToken, TaskResult.Canceled);
+                        await CompleteJobRequestAsync(_poolId, message, lockToken, TaskResult.Canceled);
                         return;
                     }
 
@@ -545,6 +544,7 @@ namespace GitHub.Runner.Listener
                                     detailInfo = string.Join(Environment.NewLine, workerOutput);
                                     Trace.Info($"Return code {returnCode} indicate worker encounter an unhandled exception or app crash, attach worker stdout/stderr to JobRequest result.");
 
+
                                     var jobServer = await InitializeJobServerAsync(systemConnection);
                                     await LogWorkerProcessUnhandledException(jobServer, message, detailInfo);
 
@@ -552,7 +552,7 @@ namespace GitHub.Runner.Listener
                                     if (detailInfo.Contains(typeof(System.IO.IOException).ToString(), StringComparison.OrdinalIgnoreCase))
                                     {
                                         Trace.Info($"Finish job with result 'Failed' due to IOException.");
-                                        await ForceFailJob(jobServer, message, detailInfo);
+                                        await ForceFailJob(jobServer, message);
                                     }
                                 }
 
@@ -567,7 +567,7 @@ namespace GitHub.Runner.Listener
                                 await renewJobRequest;
 
                                 // complete job request
-                                await CompleteJobRequestAsync(_poolId, message, systemConnection, lockToken, result, detailInfo);
+                                await CompleteJobRequestAsync(_poolId, message, lockToken, result, detailInfo);
 
                                 // print out unhandled exception happened in worker after we complete job request.
                                 // when we run out of disk space, report back to server has higher priority.
@@ -664,7 +664,7 @@ namespace GitHub.Runner.Listener
                             await renewJobRequest;
 
                             // complete job request
-                            await CompleteJobRequestAsync(_poolId, message, systemConnection, lockToken, resultOnAbandonOrCancel);
+                            await CompleteJobRequestAsync(_poolId, message, lockToken, resultOnAbandonOrCancel);
                         }
                         finally
                         {
@@ -1065,7 +1065,7 @@ namespace GitHub.Runner.Listener
             }
         }
 
-        private async Task CompleteJobRequestAsync(int poolId, Pipelines.AgentJobRequestMessage message, ServiceEndpoint systemConnection, Guid lockToken, TaskResult result, string detailInfo = null)
+        private async Task CompleteJobRequestAsync(int poolId, Pipelines.AgentJobRequestMessage message, Guid lockToken, TaskResult result, string detailInfo = null)
         {
             Trace.Entering();
 
@@ -1077,23 +1077,7 @@ namespace GitHub.Runner.Listener
 
             if (this._isRunServiceJob)
             {
-                var runServer = await GetRunServerAsync(systemConnection);
-                var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = detailInfo };
-                var unhandledAnnotation = unhandledExceptionIssue.ToAnnotation();
-                var jobAnnotations = new List<Annotation>();
-                if (unhandledAnnotation.HasValue)
-                {
-                    jobAnnotations.Add(unhandledAnnotation.Value);
-                }
-                try
-                {
-                    await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, result, outputs: null, stepResults: null, jobAnnotations: jobAnnotations, CancellationToken.None);
-                }
-                catch (Exception ex)
-                {
-                    Trace.Error("Fail to raise job completion back to service.");
-                    Trace.Error(ex);
-                }
+                Trace.Verbose($"Skip FinishAgentRequest call from Listener because MessageType is {message.MessageType}");
                 return;
             }
 
@@ -1133,7 +1117,7 @@ namespace GitHub.Runner.Listener
         }
 
         // log an error issue to job level timeline record
-        private async Task LogWorkerProcessUnhandledException(IRunnerService server, Pipelines.AgentJobRequestMessage message, string detailInfo)
+        private async Task LogWorkerProcessUnhandledException(IRunnerService server, Pipelines.AgentJobRequestMessage message, string errorMessage)
         {
             if (server is IJobServer jobServer)
             {
@@ -1145,11 +1129,34 @@ namespace GitHub.Runner.Listener
                     TimelineRecord jobRecord = timeline.Records.FirstOrDefault(x => x.Id == message.JobId && x.RecordType == "Job");
                     ArgUtil.NotNull(jobRecord, nameof(jobRecord));
 
-                    var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = detailInfo };
+                    try
+                    {
+                        if (!string.IsNullOrEmpty(errorMessage) &&
+                            message.Variables.TryGetValue("DistributedTask.EnableRunnerIPCDebug", out var enableRunnerIPCDebug) &&
+                            StringUtil.ConvertToBoolean(enableRunnerIPCDebug.Value))
+                        {
+                            // the trace should be best effort and not affect any job result
+                            var match = _invalidJsonRegex.Match(errorMessage);
+                            if (match.Success &&
+                                match.Groups.Count == 2)
+                            {
+                                var jsonPosition = int.Parse(match.Groups[1].Value);
+                                var serializedJobMessage = JsonUtility.ToString(message);
+                                var originalJson = serializedJobMessage.Substring(jsonPosition - 10, 20);
+                                errorMessage = $"Runner sent Json at position '{jsonPosition}': {originalJson} ({Convert.ToBase64String(Encoding.UTF8.GetBytes(originalJson))})\n{errorMessage}";
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Trace.Error(ex);
+                        errorMessage = $"Fail to check json IPC error: {ex.Message}\n{errorMessage}";
+                    }
+
+                    var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = errorMessage };
                     unhandledExceptionIssue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.WorkerCrash;
                     jobRecord.ErrorCount++;
                     jobRecord.Issues.Add(unhandledExceptionIssue);
-
                     await jobServer.UpdateTimelineRecordsAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, new TimelineRecord[] { jobRecord }, CancellationToken.None);
                 }
                 catch (Exception ex)
@@ -1160,13 +1167,13 @@ namespace GitHub.Runner.Listener
             }
             else
             {
-                Trace.Info("Job server does not support handling unhandled exception yet, error message: {0}", detailInfo);
+                Trace.Info("Job server does not support handling unhandled exception yet, error message: {0}", errorMessage);
                 return;
             }
         }
 
         // raise job completed event to fail the job.
-        private async Task ForceFailJob(IRunnerService server, Pipelines.AgentJobRequestMessage message, string detailInfo)
+        private async Task ForceFailJob(IRunnerService server, Pipelines.AgentJobRequestMessage message)
         {
             if (server is IJobServer jobServer)
             {
@@ -1185,15 +1192,7 @@ namespace GitHub.Runner.Listener
             {
                 try
                 {
-                    var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = detailInfo };
-                    var unhandledAnnotation = unhandledExceptionIssue.ToAnnotation();
-                    var jobAnnotations = new List<Annotation>();
-                    if (unhandledAnnotation.HasValue)
-                    {
-                        jobAnnotations.Add(unhandledAnnotation.Value);
-                    }
-
-                    await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, TaskResult.Failed, outputs: null, stepResults: null, jobAnnotations: jobAnnotations, CancellationToken.None);
+                    await runServer.CompleteJobAsync(message.Plan.PlanId, message.JobId, TaskResult.Failed, outputs: null, stepResults: null, CancellationToken.None);
                 }
                 catch (Exception ex)
                 {

src/Runner.Listener/MessageListener.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;

src/Runner.Listener/Program.cs

@@ -1,4 +1,4 @@
-using GitHub.Runner.Common;
+using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
 using System;
 using System.Globalization;

src/Runner.Listener/Runner.cs

@@ -1,10 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -211,16 +210,10 @@ namespace GitHub.Runner.Listener
                         foreach (var config in jitConfig)
                         {
                             var configFile = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), config.Key);
-                            var configContent = Convert.FromBase64String(config.Value);
-#if OS_WINDOWS
-                            if (configFile == HostContext.GetConfigFile(WellKnownConfigFile.RSACredentials))
-                            {
-                                configContent = ProtectedData.Protect(configContent, null, DataProtectionScope.LocalMachine);
-                            }
-#endif
-                            File.WriteAllBytes(configFile, configContent);
+                            var configContent = Encoding.UTF8.GetString(Convert.FromBase64String(config.Value));
+                            File.WriteAllText(configFile, configContent, Encoding.UTF8);
                             File.SetAttributes(configFile, File.GetAttributes(configFile) | FileAttributes.Hidden);
-                            Trace.Info($"Saved {configContent.Length} bytes to '{configFile}'.");
+                            Trace.Info($"Save {configContent.Length} chars to '{configFile}'.");
                         }
                     }
                     catch (Exception ex)
@@ -339,26 +332,13 @@ namespace GitHub.Runner.Listener
             }
         }
 
-        private IMessageListener GetMesageListener(RunnerSettings settings)
-        {
-            if (settings.UseV2Flow)
-            {
-                Trace.Info($"Using BrokerMessageListener");
-                var brokerListener = new BrokerMessageListener();
-                brokerListener.Initialize(HostContext);
-                return brokerListener;
-            }
-
-            return HostContext.GetService<IMessageListener>();
-        }
-
         //create worker manager, create message listener and start listening to the queue
         private async Task<int> RunAsync(RunnerSettings settings, bool runOnce = false)
         {
             try
             {
                 Trace.Info(nameof(RunAsync));
-                _listener = GetMesageListener(settings);
+                _listener = HostContext.GetService<IMessageListener>();
                 if (!await _listener.CreateSessionAsync(HostContext.RunnerShutdownToken))
                 {
                     return Constants.Runner.ReturnCode.TerminatedError;
@@ -549,17 +529,7 @@ namespace GitHub.Runner.Listener
                                     {
                                         var runServer = HostContext.CreateService<IRunServer>();
                                         await runServer.ConnectAsync(new Uri(messageRef.RunServiceUrl), creds);
-                                        try
-                                        {
-                                            jobRequestMessage =
-                                            await runServer.GetJobMessageAsync(messageRef.RunnerRequestId,
-                                            messageQueueLoopTokenSource.Token);
-                                        }
-                                        catch (TaskOrchestrationJobAlreadyAcquiredException)
-                                        {
-                                            Trace.Info("Job is already acquired, skip this message.");
-                                            continue;
-                                        }
+                                        jobRequestMessage = await runServer.GetJobMessageAsync(messageRef.RunnerRequestId, messageQueueLoopTokenSource.Token);
                                     }
 
                                     jobDispatcher.Run(jobRequestMessage, runOnce);
@@ -683,8 +653,7 @@ Config Options:
  --token string         Registration token. Required if unattended
  --name string          Name of the runner to configure (default {Environment.MachineName ?? "myrunner"})
  --runnergroup string   Name of the runner group to add this runner to (defaults to the default runner group)
- --labels string        Custom labels that will be added to the runner. This option is mandatory if --no-default-labels is used.
- --no-default-labels    Disables adding the default labels: 'self-hosted,{Constants.Runner.Platform},{Constants.Runner.PlatformArchitecture}'
+ --labels string        Extra labels in addition to the default: 'self-hosted,{Constants.Runner.Platform},{Constants.Runner.PlatformArchitecture}'
  --local                Removes the runner config files from your local machine. Used as an option to the remove command
  --work string          Relative runner work directory (default {Constants.Path.WorkDirectory})
  --replace              Replace any existing runner with the same name (default false)

src/Runner.Listener/RunnerJobRequestRef.cs

@@ -1,4 +1,4 @@
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 
 namespace GitHub.Runner.Listener
 {

src/Runner.Listener/SelfUpdater.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;

src/Runner.PluginHost/Program.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Reflection;

src/Runner.Plugins/Artifact/PipelinesServer.cs

@@ -1,4 +1,4 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Actions.Pipelines.WebApi;
 using GitHub.Services.WebApi;

src/Runner.Plugins/Artifact/PublishArtifact.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Runner.Plugins/Repository/GitCliManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/Runner.Plugins/Repository/v1.0/GitSourceProvider.cs

@@ -1,4 +1,4 @@
-using Pipelines = GitHub.DistributedTask.Pipelines;
+using Pipelines = GitHub.DistributedTask.Pipelines;
 using System;
 using System.Collections.Generic;
 using System.Threading;

src/Runner.Plugins/Repository/v1.0/RepositoryPlugin.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Sdk;

src/Runner.Plugins/Repository/v1.1/GitSourceProvider.cs

@@ -1,4 +1,4 @@
-using Pipelines = GitHub.DistributedTask.Pipelines;
+using Pipelines = GitHub.DistributedTask.Pipelines;
 using System;
 using System.Collections.Generic;
 using System.Threading;

src/Runner.Plugins/Repository/v1.1/RepositoryPlugin.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Sdk;

src/Runner.Sdk/ActionPlugin.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http.Headers;
@@ -220,12 +220,20 @@ namespace GitHub.Runner.Sdk
             return input;
         }
 
-        private Dictionary<string, string> _commandEscapeMappings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+        private Dictionary<string, string> _commandEscapeMappings = new(StringComparer.OrdinalIgnoreCase)
         {
-            { ";", "%3B" },
-            { "\r", "%0D" },
-            { "\n", "%0A" },
-            { "]", "%5D" },
+            {
+                ";", "%3B"
+            },
+            {
+                "\r", "%0D"
+            },
+            {
+                "\n", "%0A"
+            },
+            {
+                "]", "%5D"
+            },
         };
     }
 }

src/Runner.Sdk/BuildConstants.cs

@@ -1,4 +1,4 @@
-namespace GitHub.Runner.Sdk
+namespace GitHub.Runner.Sdk
 {
     /***
      * WARNING: This file is automatically regenerated on layout so the runner can provide version/commit info (do not manually edit it).

src/Runner.Sdk/ProcessInvoker.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel;

src/Runner.Sdk/RunnerWebProxy.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Text.RegularExpressions;

src/Runner.Sdk/Util/ArgUtil.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 
 namespace GitHub.Runner.Sdk

src/Runner.Sdk/Util/IOUtil.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
@@ -40,19 +40,10 @@ namespace GitHub.Runner.Sdk
             File.WriteAllText(path, StringUtil.ConvertToJson(obj), Encoding.UTF8);
         }
 
-        public static T LoadObject<T>(string path, bool required = false)
+        public static T LoadObject<T>(string path)
         {
             string json = File.ReadAllText(path, Encoding.UTF8);
-            if (required && string.IsNullOrEmpty(json))
-            {
-                throw new ArgumentNullException($"File {path} is empty");
-            }
-            T result = StringUtil.ConvertFromJson<T>(json);
-            if (required && result == null)
-            {
-                throw new ArgumentException("Converting json to object resulted in a null value");
-            }
-            return result;
+            return StringUtil.ConvertFromJson<T>(json);
         }
 
         public static string GetSha256Hash(string path)

src/Runner.Sdk/Util/PathUtil.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace GitHub.Runner.Sdk
 {

src/Runner.Sdk/Util/StringUtil.cs

@@ -1,4 +1,4 @@
-using GitHub.Services.WebApi;
+using GitHub.Services.WebApi;
 using Newtonsoft.Json;
 using System;
 using System.Globalization;

src/Runner.Sdk/Util/UrlUtil.cs

@@ -15,7 +15,6 @@ namespace GitHub.Runner.Sdk
                 string.Equals(gitHubUrl.Host, "github.com", StringComparison.OrdinalIgnoreCase) ||
                 string.Equals(gitHubUrl.Host, "www.github.com", StringComparison.OrdinalIgnoreCase) ||
                 string.Equals(gitHubUrl.Host, "github.localhost", StringComparison.OrdinalIgnoreCase) ||
-                gitHubUrl.Host.EndsWith(".ghe.localhost", StringComparison.OrdinalIgnoreCase) ||
                 gitHubUrl.Host.EndsWith(".ghe.com", StringComparison.OrdinalIgnoreCase);
         }
 

src/Runner.Sdk/Util/WhichUtil.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 
@@ -60,7 +60,7 @@ namespace GitHub.Runner.Sdk
                             trace?.Verbose(ex.ToString());
                         }
 
-                        if (matches != null && matches.Length > 0 && IsPathValid(matches.First(), trace))
+                        if (matches != null && matches.Length > 0)
                         {
                             trace?.Info($"Location: '{matches.First()}'");
                             return matches.First();
@@ -86,7 +86,7 @@ namespace GitHub.Runner.Sdk
                             for (int i = 0; i < pathExtSegments.Length; i++)
                             {
                                 string fullPath = Path.Combine(pathSegment, $"{command}{pathExtSegments[i]}");
-                                if (matches.Any(p => p.Equals(fullPath, StringComparison.OrdinalIgnoreCase)) && IsPathValid(fullPath, trace))
+                                if (matches.Any(p => p.Equals(fullPath, StringComparison.OrdinalIgnoreCase)))
                                 {
                                     trace?.Info($"Location: '{fullPath}'");
                                     return fullPath;
@@ -105,7 +105,7 @@ namespace GitHub.Runner.Sdk
                         trace?.Verbose(ex.ToString());
                     }
 
-                    if (matches != null && matches.Length > 0 && IsPathValid(matches.First(), trace))
+                    if (matches != null && matches.Length > 0)
                     {
                         trace?.Info($"Location: '{matches.First()}'");
                         return matches.First();
@@ -128,15 +128,5 @@ namespace GitHub.Runner.Sdk
 
             return null;
         }
-
-        // checks if the file is a symlink and if the symlink`s target exists.
-        private static bool IsPathValid(string path, ITraceWriter trace = null)
-        {
-            var fileInfo = new FileInfo(path);
-            var linkTargetFullPath = fileInfo.Directory?.FullName + Path.DirectorySeparatorChar + fileInfo.LinkTarget;
-            if (fileInfo.LinkTarget == null || File.Exists(linkTargetFullPath) || File.Exists(fileInfo.LinkTarget)) return true;
-            trace?.Info($"the target '{fileInfo.LinkTarget}' of the symbolic link '{path}', does not exist");
-            return false;
-        }
     }
 }

src/Runner.Worker/ActionCommandManager.cs

@@ -276,7 +276,7 @@ namespace GitHub.Runner.Worker
                         Message = $"Can't update {blocked} environment variable using ::set-env:: command."
                     };
                     issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = $"{Constants.Runner.UnsupportedCommand}_{envName}";
-                    context.AddIssue(issue, ExecutionContextLogOptions.Default);
+                    context.AddIssue(issue);
 
                     return;
                 }
@@ -315,7 +315,7 @@ namespace GitHub.Runner.Worker
                     Message = String.Format(Constants.Runner.UnsupportedCommandMessage, this.Command)
                 };
                 issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.UnsupportedCommand;
-                context.AddIssue(issue, ExecutionContextLogOptions.Default);
+                context.AddIssue(issue);
             }
 
             if (!command.Properties.TryGetValue(SetOutputCommandProperties.Name, out string outputName) || string.IsNullOrEmpty(outputName))
@@ -350,7 +350,7 @@ namespace GitHub.Runner.Worker
                     Message = String.Format(Constants.Runner.UnsupportedCommandMessage, this.Command)
                 };
                 issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.UnsupportedCommand;
-                context.AddIssue(issue, ExecutionContextLogOptions.Default);
+                context.AddIssue(issue);
             }
 
             if (!command.Properties.TryGetValue(SaveStateCommandProperties.Name, out string stateName) || string.IsNullOrEmpty(stateName))
@@ -666,7 +666,7 @@ namespace GitHub.Runner.Worker
                 }
             }
 
-            context.AddIssue(issue, ExecutionContextLogOptions.Default);
+            context.AddIssue(issue);
         }
 
         public static void ValidateLinesAndColumns(ActionCommand command, IExecutionContext context)

src/Runner.Worker/ActionManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
@@ -11,14 +11,12 @@ using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.ObjectTemplating.Tokens;
 using GitHub.Runner.Common;
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker.Container;
 using GitHub.Services.Common;
 using WebApi = GitHub.DistributedTask.WebApi;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 using PipelineTemplateConstants = GitHub.DistributedTask.Pipelines.ObjectTemplating.PipelineTemplateConstants;
-using GitHub.DistributedTask.WebApi;
 
 namespace GitHub.Runner.Worker
 {
@@ -102,19 +100,7 @@ namespace GitHub.Runner.Worker
             }
             IEnumerable<Pipelines.ActionStep> actions = steps.OfType<Pipelines.ActionStep>();
             executionContext.Output("Prepare all required actions");
-            PrepareActionsState result = new PrepareActionsState();
-            try
-            {
-                result = await PrepareActionsRecursiveAsync(executionContext, state, actions, depth, rootStepId);
-            }
-            catch (FailedToResolveActionDownloadInfoException ex)
-            {
-                // Log the error and fail the PrepareActionsAsync Initialization.
-                Trace.Error($"Caught exception from PrepareActionsAsync Initialization: {ex}");
-                executionContext.InfrastructureError(ex.Message);
-                executionContext.Result = TaskResult.Failed;
-                throw;
-            }
+            var result = await PrepareActionsRecursiveAsync(executionContext, state, actions, depth, rootStepId);
             if (!FeatureManager.IsContainerHooksEnabled(executionContext.Global.Variables))
             {
                 if (state.ImagesToPull.Count > 0)
@@ -316,18 +302,6 @@ namespace GitHub.Runner.Worker
             };
 
             if (action.Reference.Type == Pipelines.ActionSourceType.ContainerRegistry)
-            {
-                if (FeatureManager.IsContainerHooksEnabled(executionContext.Global.Variables))
-                {
-                    Trace.Info("Load action that will run container through container hooks.");
-                    var containerAction = action.Reference as Pipelines.ContainerRegistryReference;
-                    definition.Data.Execution = new ContainerActionExecutionData()
-                    {
-                        Image = containerAction.Image,
-                    };
-                    Trace.Info($"Using action container image: {containerAction.Image}.");
-                }
-                else
             {
                 Trace.Info("Load action that reference container from registry.");
                 CachedActionContainers.TryGetValue(action.Id, out var container);
@@ -339,7 +313,6 @@ namespace GitHub.Runner.Worker
 
                 Trace.Info($"Using action container image: {container.ContainerImage}.");
             }
-            }
             else if (action.Reference.Type == Pipelines.ActionSourceType.Repository)
             {
                 string actionDirectory = null;
@@ -675,21 +648,13 @@ namespace GitHub.Runner.Worker
             }
 
             // Resolve download info
-            var launchServer = HostContext.GetService<ILaunchServer>();
             var jobServer = HostContext.GetService<IJobServer>();
             var actionDownloadInfos = default(WebApi.ActionDownloadInfoCollection);
             for (var attempt = 1; attempt <= 3; attempt++)
             {
                 try
-                {
-                    if (MessageUtil.IsRunServiceJob(executionContext.Global.Variables.Get(Constants.Variables.System.JobRequestType)))
-                    {
-                        actionDownloadInfos = await launchServer.ResolveActionsDownloadInfoAsync(executionContext.Global.Plan.PlanId, executionContext.Root.Id, new WebApi.ActionReferenceList { Actions = actionReferences }, executionContext.CancellationToken);
-                    }
-                    else
                 {
                     actionDownloadInfos = await jobServer.ResolveActionDownloadInfoAsync(executionContext.Global.Plan.ScopeIdentifier, executionContext.Global.Plan.PlanType, executionContext.Global.Plan.PlanId, executionContext.Root.Id, new WebApi.ActionReferenceList { Actions = actionReferences }, executionContext.CancellationToken);
-                    }
                     break;
                 }
                 catch (Exception ex) when (!executionContext.CancellationToken.IsCancellationRequested) // Do not retry if the run is cancelled.

src/Runner.Worker/ActionManifestManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
@@ -141,7 +141,7 @@ namespace GitHub.Runner.Worker
                 foreach (var error in templateContext.Errors)
                 {
                     Trace.Error($"Action.yml load error: {error.Message}");
-                    executionContext.Error("And let's duplicate errors: " + error.Message);
+                    executionContext.Error(error.Message);
                 }
 
                 throw new ArgumentException($"Fail to load {fileRelativePath}");

src/Runner.Worker/ActionNotFoundException.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Runtime.Serialization;
 
 namespace GitHub.Runner.Worker

src/Runner.Worker/ActionRunner.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.ObjectTemplating;

src/Runner.Worker/ConditionTraceWriter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;

src/Runner.Worker/Container/ContainerHooks/HookInput.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -83,7 +83,7 @@ namespace GitHub.Runner.Worker.Container.ContainerHooks
         public HookContainer(ContainerInfo container)
         {
             Image = container.ContainerImage;
-            EntryPointArgs = container.ContainerEntryPointArgs?.Split(' ').Select(arg => arg.Trim()).Where(arg => !string.IsNullOrEmpty(arg)) ?? new List<string>();
+            EntryPointArgs = container.ContainerEntryPointArgs?.Split(' ').Select(arg => arg.Trim()) ?? new List<string>();
             EntryPoint = container.ContainerEntryPoint;
             WorkingDirectory = container.ContainerWorkDirectory;
             CreateOptions = container.ContainerCreateOptions;

src/Runner.Worker/Container/ContainerHooks/HookResponse.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 

src/Runner.Worker/ExecutionContext.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -18,22 +18,15 @@ using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker.Container;
 using GitHub.Runner.Worker.Handlers;
 using Newtonsoft.Json;
-using Sdk.RSWebApi.Contracts;
 using ObjectTemplating = GitHub.DistributedTask.ObjectTemplating;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 
 namespace GitHub.Runner.Worker
 {
-    public static class ExecutionContextType
+    public class ExecutionContextType
     {
-        public const string Job = "Job";
-        public const string Task = "Task";
-    }
-
-    public record ExecutionContextLogOptions(bool WriteToLog, string LogMessageOverride)
-    {
-        public static readonly ExecutionContextLogOptions None = new(false, null);
-        public static readonly ExecutionContextLogOptions Default = new(true, null);
+        public static string Job = "Job";
+        public static string Task = "Task";
     }
 
     [ServiceLocator(Default = typeof(ExecutionContext))]
@@ -99,7 +92,7 @@ namespace GitHub.Runner.Worker
         void SetGitHubContext(string name, string value);
         void SetOutput(string name, string value, out string reference);
         void SetTimeout(TimeSpan? timeout);
-        void AddIssue(Issue issue, ExecutionContextLogOptions logOptions);
+        void AddIssue(Issue issue, string message = null);
         void Progress(int percentage, string currentOperation = null);
         void UpdateDetailTimelineRecord(TimelineRecord record);
 
@@ -125,7 +118,7 @@ namespace GitHub.Runner.Worker
 
     public sealed class ExecutionContext : RunnerService, IExecutionContext
     {
-        private const int _maxCountPerIssueType = 10;
+        private const int _maxIssueCount = 10;
         private const int _throttlingDelayReportThreshold = 10 * 1000; // Don't report throttling with less than 10 seconds delay
         private const int _maxIssueMessageLength = 4096; // Don't send issue with huge message since we can't forward them from actions to check annotation.
         private const int _maxIssueCountInTelemetry = 3; // Only send the first 3 issues to telemetry
@@ -133,10 +126,8 @@ namespace GitHub.Runner.Worker
 
         private readonly TimelineRecord _record = new();
         private readonly Dictionary<Guid, TimelineRecord> _detailRecords = new();
-        private readonly List<Issue> _embeddedIssueCollector;
         private readonly object _loggerLock = new();
         private readonly object _matchersLock = new();
-        private readonly ExecutionContext _parentExecutionContext;
 
         private event OnMatcherChanged _onMatcherChanged;
 
@@ -144,6 +135,7 @@ namespace GitHub.Runner.Worker
 
         private IPagingLogger _logger;
         private IJobServerQueue _jobServerQueue;
+        private ExecutionContext _parentExecutionContext;
 
         private Guid _mainTimelineId;
         private Guid _detailTimelineId;
@@ -157,29 +149,6 @@ namespace GitHub.Runner.Worker
         private long _totalThrottlingDelayInMilliseconds = 0;
         private bool _stepTelemetryPublished = false;
 
-        public ExecutionContext()
-            : this(parent: null, embedded: false)
-        {
-        }
-
-        private ExecutionContext(ExecutionContext parent, bool embedded)
-        {
-            if (embedded)
-            {
-                ArgUtil.NotNull(parent, nameof(parent));
-            }
-
-            _parentExecutionContext = parent;
-            this.IsEmbedded = embedded;
-            this.StepTelemetry = new ActionsStepTelemetry
-            {
-                IsEmbedded = embedded
-            };
-
-            //Embedded Execution Contexts pseudo-inherit their parent's embeddedIssueCollector.
-            _embeddedIssueCollector = embedded ? parent._embeddedIssueCollector : new();
-        }
-
         public Guid Id => _record.Id;
         public Guid EmbeddedId { get; private set; }
         public string ScopeName { get; private set; }
@@ -192,7 +161,7 @@ namespace GitHub.Runner.Worker
         public Dictionary<string, VariableValue> JobOutputs { get; private set; }
 
         public ActionsEnvironmentReference ActionsEnvironment { get; private set; }
-        public ActionsStepTelemetry StepTelemetry { get; private init; }
+        public ActionsStepTelemetry StepTelemetry { get; } = new ActionsStepTelemetry();
         public DictionaryContextData ExpressionValues { get; } = new DictionaryContextData();
         public IList<IFunctionInfo> ExpressionFunctions { get; } = new List<IFunctionInfo>();
 
@@ -217,7 +186,7 @@ namespace GitHub.Runner.Worker
 
         // An embedded execution context shares the same record ID, record name, and logger
         // as its enclosing execution context.
-        public bool IsEmbedded { get; private init; }
+        public bool IsEmbedded { get; private set; }
 
         public TaskResult? Result
         {
@@ -352,7 +321,7 @@ namespace GitHub.Runner.Worker
         {
             Trace.Entering();
 
-            var child = new ExecutionContext(this, isEmbedded);
+            var child = new ExecutionContext();
             child.Initialize(HostContext);
             child.Global = Global;
             child.ScopeName = scopeName;
@@ -377,6 +346,7 @@ namespace GitHub.Runner.Worker
                 child.ExpressionFunctions.Add(item);
             }
             child._cancellationTokenSource = cancellationTokenSource ?? new CancellationTokenSource();
+            child._parentExecutionContext = this;
             child.EchoOnActionCommand = EchoOnActionCommand;
 
             if (recordOrder != null)
@@ -397,9 +367,11 @@ namespace GitHub.Runner.Worker
                 child._logger.Setup(_mainTimelineId, recordId);
             }
 
+            child.IsEmbedded = isEmbedded;
             child.StepTelemetry.StepId = recordId;
             child.StepTelemetry.Stage = stage.ToString();
-            child.StepTelemetry.StepContextName = child.GetFullyQualifiedContextName();
+            child.StepTelemetry.IsEmbedded = isEmbedded;
+            child.StepTelemetry.StepContextName = child.GetFullyQualifiedContextName(); ;
 
             return child;
         }
@@ -441,24 +413,13 @@ namespace GitHub.Runner.Worker
                 this.Warning($"The job has experienced {TimeSpan.FromMilliseconds(_totalThrottlingDelayInMilliseconds).TotalSeconds} seconds total delay caused by server throttling.");
             }
 
-            DateTime now = DateTime.UtcNow;
             _record.CurrentOperation = currentOperation ?? _record.CurrentOperation;
             _record.ResultCode = resultCode ?? _record.ResultCode;
-            _record.FinishTime = now;
+            _record.FinishTime = DateTime.UtcNow;
             _record.PercentComplete = 100;
             _record.Result = _record.Result ?? TaskResult.Succeeded;
             _record.State = TimelineRecordState.Completed;
 
-            // Before our main timeline's final QueueTimelineRecordUpdate,
-            //    inject any issues collected by embedded ExecutionContexts.
-            if (!this.IsEmbedded)
-            {
-                foreach (var issue in _embeddedIssueCollector)
-                {
-                    AddIssue(issue, ExecutionContextLogOptions.None);
-                }
-            }
-
             _jobServerQueue.QueueTimelineRecordUpdate(_mainTimelineId, _record);
 
             // complete all detail timeline records.
@@ -466,7 +427,7 @@ namespace GitHub.Runner.Worker
             {
                 foreach (var record in _detailRecords)
                 {
-                    record.Value.FinishTime = record.Value.FinishTime ?? now;
+                    record.Value.FinishTime = record.Value.FinishTime ?? DateTime.UtcNow;
                     record.Value.PercentComplete = record.Value.PercentComplete ?? 100;
                     record.Value.Result = record.Value.Result ?? TaskResult.Succeeded;
                     record.Value.State = TimelineRecordState.Completed;
@@ -477,26 +438,14 @@ namespace GitHub.Runner.Worker
 
             PublishStepTelemetry();
 
-            var stepResult = new StepResult
-            {
-                ExternalID = _record.Id,
-                Conclusion = _record.Result ?? TaskResult.Succeeded,
-                Status = _record.State,
-                Number = _record.Order,
-                Name = _record.Name,
-                StartedAt = _record.StartTime,
-                CompletedAt = _record.FinishTime,
-                Annotations = new List<Annotation>()
-            };
-
-            _record.Issues?.ForEach(issue =>
-            {
-                var annotation = issue.ToAnnotation();
-                if (annotation != null)
-                {
-                    stepResult.Annotations.Add(annotation.Value);
-                }
-            });
+            var stepResult = new StepResult();
+            stepResult.ExternalID = _record.Id;
+            stepResult.Conclusion = _record.Result ?? TaskResult.Succeeded;
+            stepResult.Status = _record.State;
+            stepResult.Number = _record.Order;
+            stepResult.Name = _record.Name;
+            stepResult.StartedAt = _record.StartTime;
+            stepResult.CompletedAt = _record.FinishTime;
 
             Global.StepsResult.Add(stepResult);
 
@@ -610,10 +559,14 @@ namespace GitHub.Runner.Worker
         }
 
         // This is not thread safe, the caller need to take lock before calling issue()
-        public void AddIssue(Issue issue, ExecutionContextLogOptions logOptions)
+        public void AddIssue(Issue issue, string logMessage = null)
         {
             ArgUtil.NotNull(issue, nameof(issue));
-            ArgUtil.NotNull(logOptions, nameof(logOptions));
+
+            if (string.IsNullOrEmpty(logMessage))
+            {
+                logMessage = issue.Message;
+            }
 
             issue.Message = HostContext.SecretMasker.MaskSecrets(issue.Message);
             if (issue.Message.Length > _maxIssueMessageLength)
@@ -628,65 +581,54 @@ namespace GitHub.Runner.Worker
                 issue.Data["stepNumber"] = _record.Order.ToString();
             }
 
-            string wellKnownTag = null;
-            Int32 previousCountForIssueType = 0;
-            Action incrementIssueTypeCount = NoOp;
-            switch (issue.Type)
+            if (issue.Type == IssueType.Error)
             {
-                case IssueType.Error:
-                    wellKnownTag = WellKnownTags.Error;
-                    previousCountForIssueType = _record.ErrorCount;
-                    incrementIssueTypeCount = () => { _record.ErrorCount++; };
-                    break;
-                case IssueType.Warning:
-                    wellKnownTag = WellKnownTags.Warning;
-                    previousCountForIssueType = _record.WarningCount;
-                    incrementIssueTypeCount = () => { _record.WarningCount++; };
-                    break;
-                case IssueType.Notice:
-                    wellKnownTag = WellKnownTags.Notice;
-                    previousCountForIssueType = _record.NoticeCount;
-                    incrementIssueTypeCount = () => { _record.NoticeCount++; };
-                    break;
+                if (!string.IsNullOrEmpty(logMessage))
+                {
+                    long logLineNumber = Write(WellKnownTags.Error, logMessage);
+                    issue.Data["logFileLineNumber"] = logLineNumber.ToString();
                 }
 
-            if (!string.IsNullOrEmpty(wellKnownTag))
+                if (_record.ErrorCount < _maxIssueCount)
                 {
-                if (!this.IsEmbedded && previousCountForIssueType < _maxCountPerIssueType)
-                {
-                    incrementIssueTypeCount();
                     _record.Issues.Add(issue);
                 }
 
-                if (logOptions.WriteToLog)
-                {
-                    string logMessage = issue.Message;
-                    if (!string.IsNullOrEmpty(logOptions.LogMessageOverride))
-                    {
-                        logMessage = logOptions.LogMessageOverride;
+                _record.ErrorCount++;
             }
-
+            else if (issue.Type == IssueType.Warning)
+            {
                 if (!string.IsNullOrEmpty(logMessage))
                 {
-                        // Note that ::Write() has its own secret-masking logic.
-                        long logLineNumber = Write(wellKnownTag, logMessage);
+                    long logLineNumber = Write(WellKnownTags.Warning, logMessage);
                     issue.Data["logFileLineNumber"] = logLineNumber.ToString();
                 }
-                }
+
+                if (_record.WarningCount < _maxIssueCount)
+                {
+                    _record.Issues.Add(issue);
                 }
 
-            // Embedded ExecutionContexts (a.k.a. Composite actions) should never upload a timeline record to the server.
-            //    Instead, we store processed issues on a shared (psuedo-inherited) list (belonging to the closest
-            //    non-embedded ancestor ExecutionContext) so that they can be processed when that ancestor completes.
-            if (this.IsEmbedded)
-            {
-                _embeddedIssueCollector.Add(issue);
+                _record.WarningCount++;
             }
-            else
+            else if (issue.Type == IssueType.Notice)
             {
+                if (!string.IsNullOrEmpty(logMessage))
+                {
+                    long logLineNumber = Write(WellKnownTags.Notice, logMessage);
+                    issue.Data["logFileLineNumber"] = logLineNumber.ToString();
+                }
+
+                if (_record.NoticeCount < _maxIssueCount)
+                {
+                    _record.Issues.Add(issue);
+                }
+
+                _record.NoticeCount++;
+            }
+
             _jobServerQueue.QueueTimelineRecordUpdate(_mainTimelineId, _record);
         }
-        }
 
         public void UpdateDetailTimelineRecord(TimelineRecord record)
         {
@@ -783,9 +725,6 @@ namespace GitHub.Runner.Worker
             // Steps results for entire job
             Global.StepsResult = new List<StepResult>();
 
-            // Job level annotations
-            Global.JobAnnotations = new List<Annotation>();
-
             // Job Outputs
             JobOutputs = new Dictionary<string, VariableValue>(StringComparer.OrdinalIgnoreCase);
 
@@ -802,9 +741,6 @@ namespace GitHub.Runner.Worker
             // File table
             Global.FileTable = new List<String>(message.FileTable ?? new string[0]);
 
-            // What type of job request is running (i.e. Run Service vs. pipelines)
-            Global.Variables.Set(Constants.Variables.System.JobRequestType, message.MessageType);
-
             // Expression values
             if (message.ContextData?.Count > 0)
             {
@@ -1059,7 +995,8 @@ namespace GitHub.Runner.Worker
                         StepTelemetry.FinishTime = _record.FinishTime;
                     }
 
-                    if (!IsEmbedded)
+                    if (!IsEmbedded &&
+                        _record.Issues.Count > 0)
                     {
                         foreach (var issue in _record.Issues)
                         {
@@ -1225,11 +1162,6 @@ namespace GitHub.Runner.Worker
 
             UpdateGlobalStepsContext();
         }
-
-        private static void NoOp()
-        {
-        }
-
     }
 
     // The Error/Warning/etc methods are created as extension methods to simplify unit testing.
@@ -1254,22 +1186,19 @@ namespace GitHub.Runner.Worker
         // Do not add a format string overload. See comment on ExecutionContext.Write().
         public static void Error(this IExecutionContext context, string message)
         {
-            var issue = new Issue() { Type = IssueType.Error, Message = message };
-            context.AddIssue(issue, ExecutionContextLogOptions.Default);
+            context.AddIssue(new Issue() { Type = IssueType.Error, Message = message });
         }
 
         // Do not add a format string overload. See comment on ExecutionContext.Write().
         public static void InfrastructureError(this IExecutionContext context, string message)
         {
-            var issue = new Issue() { Type = IssueType.Error, Message = message, IsInfrastructureIssue = true };
-            context.AddIssue(issue, ExecutionContextLogOptions.Default);
+            context.AddIssue(new Issue() { Type = IssueType.Error, Message = message, IsInfrastructureIssue = true });
         }
 
         // Do not add a format string overload. See comment on ExecutionContext.Write().
         public static void Warning(this IExecutionContext context, string message)
         {
-            var issue = new Issue() { Type = IssueType.Warning, Message = message };
-            context.AddIssue(issue, ExecutionContextLogOptions.Default);
+            context.AddIssue(new Issue() { Type = IssueType.Warning, Message = message });
         }
 
         // Do not add a format string overload. See comment on ExecutionContext.Write().
@@ -1401,7 +1330,7 @@ namespace GitHub.Runner.Worker
 
         public void Error(string format, params Object[] args)
         {
-            _executionContext.Error("error from template trace writer: " + string.Format(CultureInfo.CurrentCulture, format, args));
+            _executionContext.Error(string.Format(CultureInfo.CurrentCulture, format, args));
         }
 
         public void Info(string format, params Object[] args)

src/Runner.Worker/Expressions/HashFilesFunction.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using GitHub.DistributedTask.Expressions2.Sdk;
 using GitHub.DistributedTask.Pipelines.ContextData;

src/Runner.Worker/FileCommandManager.cs

@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Worker.Container;
 using GitHub.Runner.Common;
 using System;

src/Runner.Worker/GitHubContext.cs

@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.Pipelines.ContextData;
+using GitHub.DistributedTask.Pipelines.ContextData;
 using System;
 using System.Collections.Generic;
 

src/Runner.Worker/GlobalContext.cs

@@ -5,7 +5,6 @@ using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Worker.Container;
 using Newtonsoft.Json.Linq;
-using Sdk.RSWebApi.Contracts;
 
 namespace GitHub.Runner.Worker
 {
@@ -19,7 +18,6 @@ namespace GitHub.Runner.Worker
         public IDictionary<String, IDictionary<String, String>> JobDefaults { get; set; }
         public List<ActionsStepTelemetry> StepsTelemetry { get; set; }
         public List<StepResult> StepsResult { get; set; }
-        public List<Annotation> JobAnnotations { get; set; }
         public List<JobTelemetry> JobTelemetry { get; set; }
         public TaskOrchestrationPlanReference Plan { get; set; }
         public List<string> PrependPath { get; set; }

src/Runner.Worker/Handlers/CompositeActionHandler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -294,7 +294,7 @@ namespace GitHub.Runner.Worker.Handlers
                     // Evaluation error
                     Trace.Info("Caught exception from expression for embedded step.env");
                     step.ExecutionContext.Error(ex);
-                    SetStepConclusion(step, TaskResult.Failed);
+                    step.ExecutionContext.Complete(TaskResult.Failed);
                 }
 
                 // Register Callback

src/Runner.Worker/Handlers/Handler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Runner.Worker/Handlers/NodeScriptActionHandler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Runner.Worker/Handlers/OutputManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -143,8 +143,7 @@ namespace GitHub.Runner.Worker.Handlers
                         if (issue != null)
                         {
                             // Log issue
-                            var logOptions = new ExecutionContextLogOptions(true, stripped);
-                            _executionContext.AddIssue(issue, logOptions);
+                            _executionContext.AddIssue(issue, stripped);
 
                             return;
                         }

src/Runner.Worker/Handlers/ScriptHandlerHelpers.cs

@@ -1,4 +1,4 @@
-
+
 using System;
 using System.Collections.Generic;
 using System.IO;

src/Runner.Worker/IEnvironmentContextData.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 public interface IEnvironmentContextData
 {