Use async overload where possible

Author: danielmarbach

projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recovery.cs

@@ -406,7 +406,7 @@ await _config.TopologyRecoveryExceptionHandler.QueueRecoveryExceptionHandlerAsyn
                         }
                         finally
                         {
-                            await _recordedEntitiesSemaphore.WaitAsync()
+                            await _recordedEntitiesSemaphore.WaitAsync(cancellationToken)
                                 .ConfigureAwait(false);
                         }
                     }
@@ -493,7 +493,7 @@ await _recordedEntitiesSemaphore.WaitAsync(cancellationToken)
         }
 
         internal async ValueTask RecoverConsumersAsync(AutorecoveringChannel channelToRecover, IChannel channelToUse,
-            bool recordedEntitiesSemaphoreHeld = false)
+            bool recordedEntitiesSemaphoreHeld = false, CancellationToken cancellationToken = default)
         {
             if (_disposed)
             {
@@ -519,7 +519,8 @@ internal async ValueTask RecoverConsumersAsync(AutorecoveringChannel channelToRe
                 }
                 finally
                 {
-                    _recordedEntitiesSemaphore.Wait();
+                    await _recordedEntitiesSemaphore.WaitAsync(cancellationToken)
+                        .ConfigureAwait(false);
                 }
 
                 string oldTag = consumer.ConsumerTag;
@@ -539,7 +540,7 @@ internal async ValueTask RecoverConsumersAsync(AutorecoveringChannel channelToRe
                         }
                         finally
                         {
-                            await _recordedEntitiesSemaphore.WaitAsync()
+                            await _recordedEntitiesSemaphore.WaitAsync(cancellationToken)
                                 .ConfigureAwait(false);
                         }
                     }
@@ -557,7 +558,7 @@ await _config.TopologyRecoveryExceptionHandler.ConsumerRecoveryExceptionHandlerA
                         }
                         finally
                         {
-                            await _recordedEntitiesSemaphore.WaitAsync()
+                            await _recordedEntitiesSemaphore.WaitAsync(cancellationToken)
                                 .ConfigureAwait(false);
                         }
                     }