Implement DeleteSession

src/Runner.Common/BrokerServer.cs

@@ -19,7 +19,7 @@ public interface IBrokerServer : IRunnerService
 
         Task<TaskAgentSession> CreateSessionAsync(TaskAgentSession session, CancellationToken cancellationToken);
 
-        Task DeleteSessionAsync(Guid sessionId, CancellationToken cancellationToken);
+        Task DeleteSessionAsync(CancellationToken cancellationToken);
         Task<TaskAgentMessage> GetRunnerMessageAsync(Guid? sessionId, TaskAgentStatus status, string version, string os, string architecture, bool disableUpdate, CancellationToken token);
     }
 
@@ -64,9 +64,10 @@ public Task<TaskAgentMessage> GetRunnerMessageAsync(Guid? sessionId, TaskAgentSt
             return brokerSession;
         }
 
-        public async Task DeleteSessionAsync(Guid sessionId, CancellationToken cancellationToken)
+        public async Task DeleteSessionAsync(CancellationToken cancellationToken)
         {
-            await Task.CompletedTask; // not implemented yet
+            CheckConnection();
+            await _brokerHttpClient.DeleteSessionAsync(cancellationToken);
         }
     }
 }

src/Runner.Listener/BrokerMessageListener.cs

@@ -49,7 +49,7 @@ public async Task<Boolean> CreateSessionAsync(CancellationToken token)
             // Settings
             var configManager = HostContext.GetService<IConfigurationManager>();
             _settings = configManager.LoadSettings();
-            var serverUrl = _settings.ServerUrl;
+            var serverUrl = _settings.ServerUrlV2;
             Trace.Info(_settings);
 
             // Create connection.
@@ -159,7 +159,7 @@ public async Task DeleteSessionAsync()
                 {
                     using (var ts = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
                     {
-                        await _brokerServer.DeleteSessionAsync(_session.SessionId, ts.Token);
+                        await _brokerServer.DeleteSessionAsync(ts.Token);
                     }
                 }
                 else

src/Runner.Listener/MessageListener.cs

@@ -46,6 +46,8 @@ public sealed class MessageListener : RunnerService, IMessageListener
         private CancellationTokenSource _getMessagesTokenSource;
         private VssCredentials _creds;
 
+        private bool _isBrokerSession = false;
+
         public override void Initialize(IHostContext hostContext)
         {
             base.Initialize(hostContext);
@@ -105,9 +107,9 @@ public async Task<Boolean> CreateSessionAsync(CancellationToken token)
                     if (_session.BrokerMigrationMessage != null)
                     {
                         Trace.Info("Runner session is in migration mode: Creating Broker session with BrokerBaseUrl: {0}", _session.BrokerMigrationMessage.BrokerBaseUrl);
-                        var brokerServer = HostContext.GetService<IBrokerServer>();
-                        await brokerServer.ConnectAsync(_session.BrokerMigrationMessage.BrokerBaseUrl, _creds);
-                        _session = await brokerServer.CreateSessionAsync(taskAgentSession, token);
+                        await _brokerServer.ConnectAsync(_session.BrokerMigrationMessage.BrokerBaseUrl, _creds);
+                        _session = await _brokerServer.CreateSessionAsync(taskAgentSession, token);
+                        _isBrokerSession = true;
                     }
 
                     Trace.Info($"Session created.");
@@ -183,6 +185,11 @@ public async Task DeleteSessionAsync()
                 {
                     using (var ts = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
                     {
+                        if (_isBrokerSession)
+                        {
+                            await _brokerServer.DeleteSessionAsync(ts.Token);
+                            return;
+                        }
                         await _runnerServer.DeleteAgentSessionAsync(_settings.PoolId, _session.SessionId, ts.Token);
                     }
                 }

src/Runner.Listener/Runner.cs

@@ -634,6 +634,7 @@ await runServer.GetJobMessageAsync(messageRef.RunnerRequestId,
                     {
                         try
                         {
+                            Trace.Info("Deleting Runner Session...");
                             await _listener.DeleteSessionAsync();
                         }
                         catch (Exception ex) when (runOnce)

src/Sdk/WebApi/WebApi/BrokerHttpClient.cs

@@ -149,5 +149,23 @@ public async Task<TaskAgentSession> CreateSessionAsync(
 
             throw new Exception($"Failed to create broker session: {result.Error}");
         }
+
+        public async Task DeleteSessionAsync(
+            CancellationToken cancellationToken = default)
+        {
+            var requestUri = new Uri(Client.BaseAddress, $"session");
+
+            var result = await SendAsync<object>(
+                new HttpMethod("DELETE"),
+                requestUri: requestUri,
+                cancellationToken: cancellationToken);
+
+            if (result.IsSuccess)
+            {
+                return;
+            }
+
+            throw new Exception($"Failed to delete broker session: {result.Error}");
+        }
     }
 }