Make sure corresponding Connection and Channel token properly float into handlers

danielmarbach · danielmarbach · commit 378121a2d2fc · 2024-12-08T10:10:16.000+01:00
diff --git a/projects/RabbitMQ.Client/Impl/Channel.cs b/projects/RabbitMQ.Client/Impl/Channel.cs
@@ -196,7 +196,7 @@ protected void TakeOver(Channel other)
         public Task CloseAsync(ushort replyCode, string replyText, bool abort,
             CancellationToken cancellationToken)
         {
-            var args = new ShutdownEventArgs(ShutdownInitiator.Application, replyCode, replyText);
+            var args = new ShutdownEventArgs(ShutdownInitiator.Application, replyCode, replyText, cancellationToken: cancellationToken);
             return CloseAsync(args, abort, cancellationToken);
         }
 
@@ -763,7 +763,7 @@ protected async Task<bool> HandleConnectionStartAsync(IncomingCommand cmd, Cance
         {
             if (m_connectionStartCell is null)
             {
-                var reason = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.CommandInvalid, "Unexpected Connection.Start");
+                var reason = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.CommandInvalid, "Unexpected Connection.Start", cancellationToken: cancellationToken);
                 await Session.Connection.CloseAsync(reason, false,
                     InternalConstants.DefaultConnectionCloseTimeout,
                     cancellationToken)
diff --git a/projects/RabbitMQ.Client/Impl/Connection.cs b/projects/RabbitMQ.Client/Impl/Connection.cs
@@ -252,7 +252,7 @@ await _channel0.ConnectionOpenAsync(_config.VirtualHost, cancellationToken)
             {
                 try
                 {
-                    var ea = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.InternalError, "FailedOpen");
+                    var ea = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.InternalError, "FailedOpen", cancellationToken: cancellationToken);
                     await CloseAsync(ea, true,
                         InternalConstants.DefaultConnectionAbortTimeout,
                         cancellationToken).ConfigureAwait(false);
@@ -297,7 +297,7 @@ internal void EnsureIsOpen()
         public Task CloseAsync(ushort reasonCode, string reasonText, TimeSpan timeout, bool abort,
             CancellationToken cancellationToken = default)
         {
-            var reason = new ShutdownEventArgs(ShutdownInitiator.Application, reasonCode, reasonText);
+            var reason = new ShutdownEventArgs(ShutdownInitiator.Application, reasonCode, reasonText, cancellationToken: cancellationToken);
             return CloseAsync(reason, abort, timeout, cancellationToken);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ protected void TakeOver(Channel other)`
`196`	`196`	`public Task CloseAsync(ushort replyCode, string replyText, bool abort,`
`197`	`197`	`CancellationToken cancellationToken)`
`198`	`198`	`{`
`199`		`- var args = new ShutdownEventArgs(ShutdownInitiator.Application, replyCode, replyText);`
	`199`	`+ var args = new ShutdownEventArgs(ShutdownInitiator.Application, replyCode, replyText, cancellationToken: cancellationToken);`
`200`	`200`	`return CloseAsync(args, abort, cancellationToken);`
`201`	`201`	`}`
`202`	`202`
`@@ -763,7 +763,7 @@ protected async Task<bool> HandleConnectionStartAsync(IncomingCommand cmd, Cance`
`763`	`763`	`{`
`764`	`764`	`if (m_connectionStartCell is null)`
`765`	`765`	`{`
`766`		`- var reason = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.CommandInvalid, "Unexpected Connection.Start");`
	`766`	`+ var reason = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.CommandInvalid, "Unexpected Connection.Start", cancellationToken: cancellationToken);`
`767`	`767`	`await Session.Connection.CloseAsync(reason, false,`
`768`	`768`	`InternalConstants.DefaultConnectionCloseTimeout,`
`769`	`769`	`cancellationToken)`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ await _channel0.ConnectionOpenAsync(_config.VirtualHost, cancellationToken)`
`252`	`252`	`{`
`253`	`253`	`try`
`254`	`254`	`{`
`255`		`- var ea = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.InternalError, "FailedOpen");`
	`255`	`+ var ea = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.InternalError, "FailedOpen", cancellationToken: cancellationToken);`
`256`	`256`	`await CloseAsync(ea, true,`
`257`	`257`	`InternalConstants.DefaultConnectionAbortTimeout,`
`258`	`258`	`cancellationToken).ConfigureAwait(false);`
`@@ -297,7 +297,7 @@ internal void EnsureIsOpen()`
`297`	`297`	`public Task CloseAsync(ushort reasonCode, string reasonText, TimeSpan timeout, bool abort,`
`298`	`298`	`CancellationToken cancellationToken = default)`
`299`	`299`	`{`
`300`		`- var reason = new ShutdownEventArgs(ShutdownInitiator.Application, reasonCode, reasonText);`
	`300`	`+ var reason = new ShutdownEventArgs(ShutdownInitiator.Application, reasonCode, reasonText, cancellationToken: cancellationToken);`
`301`	`301`	`return CloseAsync(reason, abort, timeout, cancellationToken);`
`302`	`302`	`}`
`303`	`303`