Rename CallbackException event to CallbackExceptionAsync

lukebakken · lukebakken · commit 6eb842dbceb2 · 2024-09-17T10:03:41.000-07:00
diff --git a/projects/RabbitMQ.Client/PublicAPI.Shipped.txt b/projects/RabbitMQ.Client/PublicAPI.Shipped.txt
@@ -895,3 +895,4 @@ RabbitMQ.Client.IChannel.ConfirmSelectAsync(bool trackConfirmations = true, Syst
 const RabbitMQ.Client.Constants.DefaultConsumerDispatchConcurrency = 1 -> ushort
 readonly RabbitMQ.Client.ConnectionConfig.ConsumerDispatchConcurrency -> ushort
 RabbitMQ.Client.IConnection.CreateChannelAsync(ushort? consumerDispatchConcurrency = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.IChannel!>!
+RabbitMQ.Client.IConnection.CallbackExceptionAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.CallbackExceptionEventArgs!>!
diff --git a/projects/RabbitMQ.Client/client/api/IConnection.cs b/projects/RabbitMQ.Client/client/api/IConnection.cs
@@ -143,7 +143,7 @@ public interface IConnection : INetworkConnection, IDisposable
         /// <see cref="IConnection"/>, then this event will be signalled whenever one
         /// of those event handlers throws an exception, as well.
         /// </remarks>
-        event AsyncEventHandler<CallbackExceptionEventArgs> CallbackException;
+        event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsync;
 
         event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlocked;
 
diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs b/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs
@@ -102,10 +102,10 @@ public event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecov
         }
         private AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs> _connectionRecoveryErrorWrapper;
 
-        public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackException
+        public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsync
         {
-            add => InnerConnection.CallbackException += value;
-            remove => InnerConnection.CallbackException -= value;
+            add => InnerConnection.CallbackExceptionAsync += value;
+            remove => InnerConnection.CallbackExceptionAsync -= value;
         }
 
         public event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlocked
diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -65,7 +65,7 @@ internal Connection(ConnectionConfig config, IFrameHandler frameHandler)
             _frameHandler = frameHandler;
 
             Func<Exception, string, Task> onException = (exception, context) => OnCallbackExceptionAsync(CallbackExceptionEventArgs.Build(exception, context));
-            _callbackExceptionWrapper = new AsyncEventingWrapper<CallbackExceptionEventArgs>(string.Empty, (exception, context) => Task.CompletedTask);
+            _callbackExceptionAsyncWrapper = new AsyncEventingWrapper<CallbackExceptionEventArgs>(string.Empty, (exception, context) => Task.CompletedTask);
             _connectionBlockedWrapper = new AsyncEventingWrapper<ConnectionBlockedEventArgs>("OnConnectionBlocked", onException);
             _connectionUnblockedWrapper = new AsyncEventingWrapper<EventArgs>("OnConnectionUnblocked", onException);
             _connectionShutdownWrapper = new AsyncEventingWrapper<ShutdownEventArgs>("OnShutdown", onException);
@@ -118,12 +118,12 @@ internal IFrameHandler FrameHandler
             get { return _frameHandler; }
         }
 
-        public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackException
+        public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsync
         {
-            add => _callbackExceptionWrapper.AddHandler(value);
-            remove => _callbackExceptionWrapper.RemoveHandler(value);
+            add => _callbackExceptionAsyncWrapper.AddHandler(value);
+            remove => _callbackExceptionAsyncWrapper.RemoveHandler(value);
         }
-        private AsyncEventingWrapper<CallbackExceptionEventArgs> _callbackExceptionWrapper;
+        private AsyncEventingWrapper<CallbackExceptionEventArgs> _callbackExceptionAsyncWrapper;
 
         public event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlocked
         {
@@ -207,7 +207,7 @@ public event AsyncEventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueName
 
         internal void TakeOver(Connection other)
         {
-            _callbackExceptionWrapper.Takeover(other._callbackExceptionWrapper);
+            _callbackExceptionAsyncWrapper.Takeover(other._callbackExceptionAsyncWrapper);
             _connectionBlockedWrapper.Takeover(other._connectionBlockedWrapper);
             _connectionUnblockedWrapper.Takeover(other._connectionUnblockedWrapper);
             _connectionShutdownWrapper.Takeover(other._connectionShutdownWrapper);
@@ -464,7 +464,7 @@ private void LogCloseError(string error, Exception ex)
 
         internal Task OnCallbackExceptionAsync(CallbackExceptionEventArgs args)
         {
-            return _callbackExceptionWrapper.InvokeAsync(this, args);
+            return _callbackExceptionAsyncWrapper.InvokeAsync(this, args);
         }
 
         internal ValueTask WriteAsync(RentedMemory frames, CancellationToken cancellationToken)
diff --git a/projects/Test/Common/IntegrationFixture.cs b/projects/Test/Common/IntegrationFixture.cs
@@ -240,7 +240,7 @@ protected void AddCallbackExceptionHandlers(IConnection conn, IChannel channel)
                     return Task.CompletedTask;
                 };
 
-                conn.CallbackException += (o, ea) =>
+                conn.CallbackExceptionAsync += (o, ea) =>
                 {
                     _connectionCallbackException = ea.Exception;
 
diff --git a/projects/Test/Integration/TestConnectionRecoveryWithoutSetup.cs b/projects/Test/Integration/TestConnectionRecoveryWithoutSetup.cs
@@ -300,7 +300,7 @@ public async Task TestTopologyRecoveryConsumerFilter()
                     connectionRecoveryTcs.SetException(ea.Exception);
                     return Task.CompletedTask;
                 };
-                conn.CallbackException += (source, ea) =>
+                conn.CallbackExceptionAsync += (source, ea) =>
                 {
                     connectionRecoveryTcs.SetException(ea.Exception);
                     return Task.CompletedTask;
diff --git a/projects/Test/Integration/TestConnectionTopologyRecovery.cs b/projects/Test/Integration/TestConnectionTopologyRecovery.cs
@@ -259,7 +259,7 @@ public async Task TestTopologyRecoveryDefaultFilterRecoversAllEntities()
                 connectionRecoveryTcs.SetException(ea.Exception);
                 return Task.CompletedTask;
             };
-            conn.CallbackException += (source, ea) =>
+            conn.CallbackExceptionAsync += (source, ea) =>
             {
                 connectionRecoveryTcs.SetException(ea.Exception);
                 return Task.CompletedTask;
diff --git a/projects/Test/Integration/TestToxiproxy.cs b/projects/Test/Integration/TestToxiproxy.cs
@@ -85,7 +85,7 @@ public async Task TestCloseConnection()
                 {
                     using (IConnection conn = await cf.CreateConnectionAsync())
                     {
-                        conn.CallbackException += (s, ea) =>
+                        conn.CallbackExceptionAsync += (s, ea) =>
                         {
                             _output.WriteLine($"[ERROR] unexpected callback exception {ea.Detail} {ea.Exception}");
                             recoverySucceededTcs.SetResult(false);

Original file line number	Diff line number	Diff line change
`@@ -102,10 +102,10 @@ public event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecov`
`102`	`102`	`}`
`103`	`103`	`private AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs> _connectionRecoveryErrorWrapper;`
`104`	`104`
`105`		`- public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackException`
	`105`	`+ public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsync`
`106`	`106`	`{`
`107`		`- add => InnerConnection.CallbackException += value;`
`108`		`- remove => InnerConnection.CallbackException -= value;`
	`107`	`+ add => InnerConnection.CallbackExceptionAsync += value;`
	`108`	`+ remove => InnerConnection.CallbackExceptionAsync -= value;`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlocked`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ internal Connection(ConnectionConfig config, IFrameHandler frameHandler)`
`65`	`65`	`_frameHandler = frameHandler;`
`66`	`66`
`67`	`67`	`Func<Exception, string, Task> onException = (exception, context) => OnCallbackExceptionAsync(CallbackExceptionEventArgs.Build(exception, context));`
`68`		`- _callbackExceptionWrapper = new AsyncEventingWrapper<CallbackExceptionEventArgs>(string.Empty, (exception, context) => Task.CompletedTask);`
	`68`	`+ _callbackExceptionAsyncWrapper = new AsyncEventingWrapper<CallbackExceptionEventArgs>(string.Empty, (exception, context) => Task.CompletedTask);`
`69`	`69`	`_connectionBlockedWrapper = new AsyncEventingWrapper<ConnectionBlockedEventArgs>("OnConnectionBlocked", onException);`
`70`	`70`	`_connectionUnblockedWrapper = new AsyncEventingWrapper<EventArgs>("OnConnectionUnblocked", onException);`
`71`	`71`	`_connectionShutdownWrapper = new AsyncEventingWrapper<ShutdownEventArgs>("OnShutdown", onException);`
`@@ -118,12 +118,12 @@ internal IFrameHandler FrameHandler`
`118`	`118`	`get { return _frameHandler; }`
`119`	`119`	`}`
`120`	`120`
`121`		`- public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackException`
	`121`	`+ public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsync`
`122`	`122`	`{`
`123`		`- add => _callbackExceptionWrapper.AddHandler(value);`
`124`		`- remove => _callbackExceptionWrapper.RemoveHandler(value);`
	`123`	`+ add => _callbackExceptionAsyncWrapper.AddHandler(value);`
	`124`	`+ remove => _callbackExceptionAsyncWrapper.RemoveHandler(value);`
`125`	`125`	`}`
`126`		`- private AsyncEventingWrapper<CallbackExceptionEventArgs> _callbackExceptionWrapper;`
	`126`	`+ private AsyncEventingWrapper<CallbackExceptionEventArgs> _callbackExceptionAsyncWrapper;`
`127`	`127`
`128`	`128`	`public event AsyncEventHandler<ConnectionBlockedEventArgs> ConnectionBlocked`
`129`	`129`	`{`
`@@ -207,7 +207,7 @@ public event AsyncEventHandler<QueueNameChangedAfterRecoveryEventArgs> QueueName`
`207`	`207`
`208`	`208`	`internal void TakeOver(Connection other)`
`209`	`209`	`{`
`210`		`- _callbackExceptionWrapper.Takeover(other._callbackExceptionWrapper);`
	`210`	`+ _callbackExceptionAsyncWrapper.Takeover(other._callbackExceptionAsyncWrapper);`
`211`	`211`	`_connectionBlockedWrapper.Takeover(other._connectionBlockedWrapper);`
`212`	`212`	`_connectionUnblockedWrapper.Takeover(other._connectionUnblockedWrapper);`
`213`	`213`	`_connectionShutdownWrapper.Takeover(other._connectionShutdownWrapper);`
`@@ -464,7 +464,7 @@ private void LogCloseError(string error, Exception ex)`
`464`	`464`
`465`	`465`	`internal Task OnCallbackExceptionAsync(CallbackExceptionEventArgs args)`
`466`	`466`	`{`
`467`		`- return _callbackExceptionWrapper.InvokeAsync(this, args);`
	`467`	`+ return _callbackExceptionAsyncWrapper.InvokeAsync(this, args);`
`468`	`468`	`}`
`469`	`469`
`470`	`470`	`internal ValueTask WriteAsync(RentedMemory frames, CancellationToken cancellationToken)`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ protected void AddCallbackExceptionHandlers(IConnection conn, IChannel channel)`
`240`	`240`	`return Task.CompletedTask;`
`241`	`241`	`};`
`242`	`242`
`243`		`- conn.CallbackException += (o, ea) =>`
	`243`	`+ conn.CallbackExceptionAsync += (o, ea) =>`
`244`	`244`	`{`
`245`	`245`	`_connectionCallbackException = ea.Exception;`
`246`	`246`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ public async Task TestTopologyRecoveryConsumerFilter()`
`300`	`300`	`connectionRecoveryTcs.SetException(ea.Exception);`
`301`	`301`	`return Task.CompletedTask;`
`302`	`302`	`};`
`303`		`- conn.CallbackException += (source, ea) =>`
	`303`	`+ conn.CallbackExceptionAsync += (source, ea) =>`
`304`	`304`	`{`
`305`	`305`	`connectionRecoveryTcs.SetException(ea.Exception);`
`306`	`306`	`return Task.CompletedTask;`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ public async Task TestTopologyRecoveryDefaultFilterRecoversAllEntities()`
`259`	`259`	`connectionRecoveryTcs.SetException(ea.Exception);`
`260`	`260`	`return Task.CompletedTask;`
`261`	`261`	`};`
`262`		`- conn.CallbackException += (source, ea) =>`
	`262`	`+ conn.CallbackExceptionAsync += (source, ea) =>`
`263`	`263`	`{`
`264`	`264`	`connectionRecoveryTcs.SetException(ea.Exception);`
`265`	`265`	`return Task.CompletedTask;`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public async Task TestCloseConnection()`
`85`	`85`	`{`
`86`	`86`	`using (IConnection conn = await cf.CreateConnectionAsync())`
`87`	`87`	`{`
`88`		`- conn.CallbackException += (s, ea) =>`
	`88`	`+ conn.CallbackExceptionAsync += (s, ea) =>`
`89`	`89`	`{`
`90`	`90`	`_output.WriteLine($"[ERROR] unexpected callback exception {ea.Detail} {ea.Exception}");`
`91`	`91`	`recoverySucceededTcs.SetResult(false);`