AmazonSQS was possibly using the wrong cancellationToken making it impossible to shut down cleanly when consuming messages.

Author: phatboyg

src/Transports/MassTransit.AmazonSqsTransport/AmazonSqsTransport/ConnectionContextFactory.cs

@@ -22,7 +22,7 @@ public ConnectionContextFactory(IAmazonSqsHostConfiguration hostConfiguration)
 
     public IPipeContextAgent<ConnectionContext> CreateContext(ISupervisor supervisor)
     {
-        Task<ConnectionContext> context = Task.Run(() => CreateConnection(supervisor), supervisor.Stopping);
+        Task<ConnectionContext> context = Task.Run(() => CreateConnection(supervisor), supervisor.Stopped);
 
         IPipeContextAgent<ConnectionContext> contextHandle = supervisor.AddContext(context);
 

src/Transports/MassTransit.AmazonSqsTransport/AmazonSqsTransport/Middleware/AmazonSqsMessageReceiver.cs

@@ -51,7 +51,7 @@ protected override async Task ActiveAndActualAgentsCompleted(StopContext context
 
     async Task Consume()
     {
-        await GetQueueAttributes(_context.CancellationToken).ConfigureAwait(false);
+        await GetQueueAttributes(Stopping).ConfigureAwait(false);
 
         using var algorithm = new RequestRateAlgorithm(new RequestRateAlgorithmOptions
         {
@@ -64,7 +64,7 @@ async Task Consume()
 
         Task Handle(Message message, CancellationToken cancellationToken)
         {
-            var lockContext = new AmazonSqsReceiveLockContext(_context.InputAddress, message, _receiveSettings, _client, cancellationToken);
+            var lockContext = new AmazonSqsReceiveLockContext(_context.InputAddress, message, _receiveSettings, _client, Stopped);
 
             return _receiveSettings.IsOrdered
                 ? _executorPool.Run(message, () => HandleMessage(message, lockContext), cancellationToken)