* Refactor CachedString overload of BasicPublishAsync

Author: lukebakken

projects/RabbitMQ.Client/Impl/Channel.PublisherConfirms.cs

@@ -239,6 +239,7 @@ private void HandleReturn(BasicReturnEventArgs basicReturnEvent)
             }
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private async Task MaybeHandlePublisherConfirmationTcsOnChannelShutdownAsync(ShutdownEventArgs reason)
         {
             if (_publisherConfirmationsEnabled)
@@ -265,6 +266,7 @@ await _confirmSemaphore.WaitAsync(reason.CancellationToken)
             }
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private async Task<PublisherConfirmationInfo?> MaybeStartPublisherConfirmationTracking(CancellationToken cancellationToken)
         {
             if (_publisherConfirmationsEnabled)
@@ -291,6 +293,7 @@ await _confirmSemaphore.WaitAsync(cancellationToken)
             }
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private bool MaybeHandleExceptionWithEnabledPublisherConfirmations(PublisherConfirmationInfo? publisherConfirmationInfo,
             Exception ex)
         {
@@ -312,6 +315,7 @@ private bool MaybeHandleExceptionWithEnabledPublisherConfirmations(PublisherConf
             return exceptionWasHandled;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private async Task MaybeEndPublisherConfirmationTracking(PublisherConfirmationInfo? publisherConfirmationInfo,
             CancellationToken cancellationToken)
         {

projects/RabbitMQ.Client/Impl/Channel.cs

@@ -1004,26 +1004,13 @@ public async ValueTask BasicPublishAsync<TProperties>(CachedString exchange, Cac
             CancellationToken cancellationToken = default)
             where TProperties : IReadOnlyBasicProperties, IAmqpHeader
         {
-            TaskCompletionSource<bool>? publisherConfirmationTcs = null;
-            ulong publishSequenceNumber = 0;
+            PublisherConfirmationInfo? publisherConfirmationInfo = null;
             try
             {
-                if (_publisherConfirmationsEnabled)
-                {
-                    await _confirmSemaphore.WaitAsync(cancellationToken)
+                publisherConfirmationInfo =
+                    await MaybeStartPublisherConfirmationTracking(cancellationToken)
                         .ConfigureAwait(false);
 
-                    publishSequenceNumber = _nextPublishSeqNo;
-
-                    if (_publisherConfirmationTrackingEnabled)
-                    {
-                        publisherConfirmationTcs = new(TaskCreationOptions.RunContinuationsAsynchronously);
-                        _confirmsTaskCompletionSources[publishSequenceNumber] = publisherConfirmationTcs;
-                    }
-
-                    _nextPublishSeqNo++;
-                }
-
                 await EnforceFlowControlAsync(cancellationToken)
                     .ConfigureAwait(false);
 
@@ -1033,6 +1020,12 @@ await EnforceFlowControlAsync(cancellationToken)
                     ? RabbitMQActivitySource.Send(routingKey.Value, exchange.Value, body.Length)
                     : default;
 
+                ulong publishSequenceNumber = 0;
+                if (publisherConfirmationInfo is not null)
+                {
+                    publishSequenceNumber = publisherConfirmationInfo.PublishSequenceNumber;
+                }
+
                 BasicProperties? props = PopulateBasicPropertiesHeaders(basicProperties, sendActivity, publishSequenceNumber);
                 if (props is null)
                 {
@@ -1047,35 +1040,16 @@ await ModelSendAsync(in cmd, in props, body, cancellationToken)
             }
             catch (Exception ex)
             {
-                if (_publisherConfirmationsEnabled)
-                {
-                    _nextPublishSeqNo--;
-                    if (_publisherConfirmationTrackingEnabled)
-                    {
-                        _confirmsTaskCompletionSources.TryRemove(publishSequenceNumber, out _);
-                    }
-                }
-
-                if (publisherConfirmationTcs is not null)
-                {
-                    publisherConfirmationTcs.SetException(ex);
-                }
-                else
+                bool exceptionWasHandled =
+                    MaybeHandleExceptionWithEnabledPublisherConfirmations(publisherConfirmationInfo, ex);
+                if (!exceptionWasHandled)
                 {
                     throw;
                 }
             }
             finally
             {
-                if (_publisherConfirmationsEnabled)
-                {
-                    _confirmSemaphore.Release();
-                }
-            }
-
-            if (publisherConfirmationTcs is not null)
-            {
-                await publisherConfirmationTcs.Task.WaitAsync(cancellationToken)
+                await MaybeEndPublisherConfirmationTracking(publisherConfirmationInfo, cancellationToken)
                     .ConfigureAwait(false);
             }
         }