Add solution suggested by @fhammerl

src/Runner.Common/BrokerServer.cs

@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using GitHub.Actions.RunService.WebApi;
 using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using Sdk.RSWebApi.Contracts;
@@ -19,7 +18,6 @@ namespace GitHub.Runner.Common
         Task ConnectAsync(Uri serverUrl, VssCredentials credentials);
 
         Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken token, TaskAgentStatus status, string version);
-        Task<bool> DeleteRunnerMessageAsync(string messageID, CancellationToken token);
     }
 
     public sealed class BrokerServer : RunnerService, IBrokerServer
@@ -50,20 +48,9 @@ namespace GitHub.Runner.Common
         {
             CheckConnection();
             var jobMessage = RetryRequest<TaskAgentMessage>(
-                async () => await _brokerHttpClient.GetRunnerMessageAsync(version, status, cancellationToken), cancellationToken
-                );
+                async () => await _brokerHttpClient.GetRunnerMessageAsync(version, status, cancellationToken), cancellationToken);
 
             return jobMessage;
         }
-
-        public Task<bool> DeleteRunnerMessageAsync(string messageID, CancellationToken cancellationToken)
-        {
-            CheckConnection();
-
-            return RetryRequest(
-                async () => await _brokerHttpClient.DeleteRunnerMessageAsync(messageID, cancellationToken),
-                cancellationToken
-            );
-        }
     }
 }

src/Runner.Common/JobServerQueue.cs

@@ -818,7 +818,6 @@ namespace GitHub.Runner.Common
 
             return mergedRecords;
         }
-
         private async Task UploadFile(UploadFileInfo file)
         {
             bool uploadSucceed = false;

src/Runner.Listener/BrokerMessageListener.cs

@@ -170,17 +170,7 @@ namespace GitHub.Runner.Listener
 
         public async Task DeleteMessageAsync(TaskAgentMessage message)
         {
-            Trace.Entering();
-
-            if (MessageUtil.IsRunServiceJob(message.MessageType))
-            {
-                var messageRef = StringUtil.ConvertFromJson<RunnerJobRequestRef>(message.Body);
-
-                using (var cs = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
-                {
-                    await _brokerServer.DeleteRunnerMessageAsync(messageRef.RunnerRequestId, cs.Token);
-                }
-            }
+            await Task.CompletedTask;
         }
 
         private bool IsGetNextMessageExceptionRetriable(Exception ex)

src/Runner.Listener/Runner.cs

@@ -392,7 +392,6 @@ namespace GitHub.Runner.Listener
                     {
                         TaskAgentMessage message = null;
                         bool skipMessageDeletion = false;
-                        bool useBrokerDeletion = false;
                         try
                         {
                             Task<TaskAgentMessage> getNextMessage = _listener.GetNextMessageAsync(messageQueueLoopTokenSource.Token);
@@ -601,15 +600,7 @@ namespace GitHub.Runner.Listener
                             {
                                 try
                                 {
-                                    if (useBrokerDeletion)
-                                    {
-                                        // await _listener.DeleteMessageAsync(brokerDeletionParamsMessageID, brokerDeletionParamsToken);
-                                        await _listener.DeleteMessageAsync(message);
-                                    }
-                                    else
-                                    {
-                                        await _listener.DeleteMessageAsync(message);
-                                    }
+                                    await _listener.DeleteMessageAsync(message);
                                 }
                                 catch (Exception ex)
                                 {

src/Sdk/DTObjectTemplating/ObjectTemplating/TemplateContext.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -163,7 +163,6 @@ namespace GitHub.DistributedTask.ObjectTemplating
                 message = $"{prefix} {message}";
             }
 
-            Errors.Add(message);
             TraceWriter.Error(message);
         }
 

src/Sdk/WebApi/WebApi/BrokerHttpClient.cs

@@ -88,28 +88,5 @@ namespace GitHub.Actions.RunService.WebApi
 
             throw new Exception($"Failed to get job message: {result.Error}");
         }
-
-        public async Task<bool> DeleteRunnerMessageAsync(
-            string messageID,
-            CancellationToken cancellationToken = default
-        )
-        {
-            var requestUri = new Uri(Client.BaseAddress, "message");
-
-            List<KeyValuePair<string, string>> queryParams = new List<KeyValuePair<string, string>>();
-
-            if (messageID != null)
-            {
-                queryParams.Add("messageID", messageID);
-            }
-
-            var result = await SendAsync<TaskAgentMessage>(
-                new HttpMethod("DELETE"),
-                requestUri: requestUri,
-                queryParameters: queryParams,
-                cancellationToken: cancellationToken);
-
-            return (result.IsSuccess);
-        }
     }
 }