Rename ConnectionRecoveryError to ConnectionRecoveryErrorAsync

lukebakken · lukebakken · commit 2d8bc9a7356b · 2024-09-17T10:29:29.000-07:00
diff --git a/projects/RabbitMQ.Client/PublicAPI.Shipped.txt b/projects/RabbitMQ.Client/PublicAPI.Shipped.txt
@@ -449,7 +449,6 @@ RabbitMQ.Client.IConnection.ChannelMax.get -> ushort
 RabbitMQ.Client.IConnection.ClientProperties.get -> System.Collections.Generic.IDictionary<string, object>
 RabbitMQ.Client.IConnection.ClientProvidedName.get -> string
 RabbitMQ.Client.IConnection.CloseReason.get -> RabbitMQ.Client.ShutdownEventArgs
-RabbitMQ.Client.IConnection.ConnectionRecoveryError -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConnectionRecoveryErrorEventArgs>
 RabbitMQ.Client.IConnection.ConnectionUnblocked -> RabbitMQ.Client.Events.AsyncEventHandler<System.EventArgs>
 RabbitMQ.Client.IConnection.ConsumerTagChangeAfterRecovery -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConsumerTagChangedAfterRecoveryEventArgs>
 RabbitMQ.Client.IConnection.Endpoint.get -> RabbitMQ.Client.AmqpTcpEndpoint
@@ -895,3 +894,4 @@ RabbitMQ.Client.IConnection.CallbackExceptionAsync -> RabbitMQ.Client.Events.Asy
 RabbitMQ.Client.IConnection.ConnectionBlockedAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConnectionBlockedEventArgs!>!
 RabbitMQ.Client.IConnection.ConnectionShutdownAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.ShutdownEventArgs!>!
 RabbitMQ.Client.IConnection.RecoverySucceededAsync -> RabbitMQ.Client.Events.AsyncEventHandler<System.EventArgs!>!
+RabbitMQ.Client.IConnection.ConnectionRecoveryErrorAsync -> RabbitMQ.Client.Events.AsyncEventHandler<RabbitMQ.Client.Events.ConnectionRecoveryErrorEventArgs!>!
diff --git a/projects/RabbitMQ.Client/client/api/IConnection.cs b/projects/RabbitMQ.Client/client/api/IConnection.cs
@@ -172,7 +172,7 @@ public interface IConnection : INetworkConnection, IDisposable
         /// <remarks>
         /// This event will never fire for connections that disable automatic recovery.
         /// </remarks>
-        event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryError;
+        event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryErrorAsync;
 
         /// <summary>
         /// Raised when the server-generated tag of a consumer registered on this connection changes during
diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recovery.cs b/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recovery.cs
@@ -269,10 +269,10 @@ await maybeNewInnerConnection.OpenAsync(cancellationToken)
             {
                 ESLog.Error("Connection recovery exception.", e);
                 // Trigger recovery error events
-                if (!_connectionRecoveryErrorWrapper.IsEmpty)
+                if (!_connectionRecoveryErrorAsyncWrapper.IsEmpty)
                 {
                     // Note: recordedEntities semaphore is _NOT_ held at this point
-                    await _connectionRecoveryErrorWrapper.InvokeAsync(this, new ConnectionRecoveryErrorEventArgs(e))
+                    await _connectionRecoveryErrorAsyncWrapper.InvokeAsync(this, new ConnectionRecoveryErrorEventArgs(e))
                         .ConfigureAwait(false);
                 }
 
diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs b/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs
@@ -68,7 +68,7 @@ internal AutorecoveringConnection(ConnectionConfig config, IEndpointResolver end
 
             ConnectionShutdownAsync += HandleConnectionShutdown;
             _recoverySucceededAsyncWrapper = new AsyncEventingWrapper<EventArgs>("OnConnectionRecovery", onExceptionAsync);
-            _connectionRecoveryErrorWrapper = new AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs>("OnConnectionRecoveryError", onExceptionAsync);
+            _connectionRecoveryErrorAsyncWrapper = new AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs>("OnConnectionRecoveryError", onExceptionAsync);
             _consumerTagChangeAfterRecoveryWrapper = new AsyncEventingWrapper<ConsumerTagChangedAfterRecoveryEventArgs>("OnConsumerRecovery", onExceptionAsync);
             _queueNameChangedAfterRecoveryWrapper = new AsyncEventingWrapper<QueueNameChangedAfterRecoveryEventArgs>("OnQueueRecovery", onExceptionAsync);
 
@@ -95,12 +95,12 @@ public event AsyncEventHandler<EventArgs> RecoverySucceededAsync
         }
         private AsyncEventingWrapper<EventArgs> _recoverySucceededAsyncWrapper;
 
-        public event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryError
+        public event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryErrorAsync
         {
-            add => _connectionRecoveryErrorWrapper.AddHandler(value);
-            remove => _connectionRecoveryErrorWrapper.RemoveHandler(value);
+            add => _connectionRecoveryErrorAsyncWrapper.AddHandler(value);
+            remove => _connectionRecoveryErrorAsyncWrapper.RemoveHandler(value);
         }
-        private AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs> _connectionRecoveryErrorWrapper;
+        private AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs> _connectionRecoveryErrorAsyncWrapper;
 
         public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsync
         {
diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -181,7 +181,7 @@ public event AsyncEventHandler<EventArgs> RecoverySucceededAsync
         /// <summary>
         /// This event is never fired by non-recovering connections but it is a part of the <see cref="IConnection"/> interface.
         /// </summary>
-        public event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryError
+        public event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryErrorAsync
         {
             add { }
             remove { }
diff --git a/projects/Test/Common/IntegrationFixture.cs b/projects/Test/Common/IntegrationFixture.cs
@@ -225,7 +225,7 @@ protected void AddCallbackExceptionHandlers(IConnection conn, IChannel channel)
         {
             if (conn != null)
             {
-                conn.ConnectionRecoveryError += (s, ea) =>
+                conn.ConnectionRecoveryErrorAsync += (s, ea) =>
                 {
                     _connectionRecoveryException = ea.Exception;
 
diff --git a/projects/Test/Integration/TestConnectionRecoveryWithoutSetup.cs b/projects/Test/Integration/TestConnectionRecoveryWithoutSetup.cs
@@ -295,7 +295,7 @@ public async Task TestTopologyRecoveryConsumerFilter()
                     connectionRecoveryTcs.SetResult(true);
                     return Task.CompletedTask;
                 };
-                conn.ConnectionRecoveryError += (source, ea) =>
+                conn.ConnectionRecoveryErrorAsync += (source, ea) =>
                 {
                     connectionRecoveryTcs.SetException(ea.Exception);
                     return Task.CompletedTask;
diff --git a/projects/Test/Integration/TestConnectionTopologyRecovery.cs b/projects/Test/Integration/TestConnectionTopologyRecovery.cs
@@ -254,7 +254,7 @@ public async Task TestTopologyRecoveryDefaultFilterRecoversAllEntities()
                 connectionRecoveryTcs.SetResult(true);
                 return Task.CompletedTask;
             };
-            conn.ConnectionRecoveryError += (source, ea) =>
+            conn.ConnectionRecoveryErrorAsync += (source, ea) =>
             {
                 connectionRecoveryTcs.SetException(ea.Exception);
                 return Task.CompletedTask;
diff --git a/projects/Test/Integration/TestToxiproxy.cs b/projects/Test/Integration/TestToxiproxy.cs
@@ -92,7 +92,7 @@ public async Task TestCloseConnection()
                             return Task.CompletedTask;
                         };
 
-                        conn.ConnectionRecoveryError += (s, ea) =>
+                        conn.ConnectionRecoveryErrorAsync += (s, ea) =>
                         {
                             _output.WriteLine($"[ERROR] connection recovery error {ea.Exception}");
                             recoverySucceededTcs.SetResult(false);
diff --git a/projects/Test/OAuth2/TestOAuth2.cs b/projects/Test/OAuth2/TestOAuth2.cs
@@ -89,7 +89,7 @@ public async Task InitializeAsync()
                 return Task.CompletedTask;
             };
 
-            _connection.ConnectionRecoveryError += (sender, ea) =>
+            _connection.ConnectionRecoveryErrorAsync += (sender, ea) =>
             {
                 _testOutputHelper.WriteLine("{0} [ERROR] connection recovery error: {1}",
                     DateTime.Now, ea.Exception);
diff --git a/projects/Test/SequentialIntegration/TestConnectionRecovery.cs b/projects/Test/SequentialIntegration/TestConnectionRecovery.cs
@@ -289,7 +289,7 @@ public async Task TestShutdownEventHandlersRecoveryOnConnectionAfterTwoDelayedSe
 
             AutorecoveringConnection aconn = (AutorecoveringConnection)_conn;
 
-            aconn.ConnectionRecoveryError += (c, args) =>
+            aconn.ConnectionRecoveryErrorAsync += (c, args) =>
             {
                 // Uncomment for debugging
                 // _output.WriteLine("[INFO] ConnectionRecoveryError: {0}", args.Exception);

Original file line number	Diff line number	Diff line change
`@@ -269,10 +269,10 @@ await maybeNewInnerConnection.OpenAsync(cancellationToken)`
`269`	`269`	`{`
`270`	`270`	`ESLog.Error("Connection recovery exception.", e);`
`271`	`271`	`// Trigger recovery error events`
`272`		`- if (!_connectionRecoveryErrorWrapper.IsEmpty)`
	`272`	`+ if (!_connectionRecoveryErrorAsyncWrapper.IsEmpty)`
`273`	`273`	`{`
`274`	`274`	`// Note: recordedEntities semaphore is _NOT_ held at this point`
`275`		`- await _connectionRecoveryErrorWrapper.InvokeAsync(this, new ConnectionRecoveryErrorEventArgs(e))`
	`275`	`+ await _connectionRecoveryErrorAsyncWrapper.InvokeAsync(this, new ConnectionRecoveryErrorEventArgs(e))`
`276`	`276`	`.ConfigureAwait(false);`
`277`	`277`	`}`
`278`	`278`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ internal AutorecoveringConnection(ConnectionConfig config, IEndpointResolver end`
`68`	`68`
`69`	`69`	`ConnectionShutdownAsync += HandleConnectionShutdown;`
`70`	`70`	`_recoverySucceededAsyncWrapper = new AsyncEventingWrapper<EventArgs>("OnConnectionRecovery", onExceptionAsync);`
`71`		`- _connectionRecoveryErrorWrapper = new AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs>("OnConnectionRecoveryError", onExceptionAsync);`
	`71`	`+ _connectionRecoveryErrorAsyncWrapper = new AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs>("OnConnectionRecoveryError", onExceptionAsync);`
`72`	`72`	`_consumerTagChangeAfterRecoveryWrapper = new AsyncEventingWrapper<ConsumerTagChangedAfterRecoveryEventArgs>("OnConsumerRecovery", onExceptionAsync);`
`73`	`73`	`_queueNameChangedAfterRecoveryWrapper = new AsyncEventingWrapper<QueueNameChangedAfterRecoveryEventArgs>("OnQueueRecovery", onExceptionAsync);`
`74`	`74`
`@@ -95,12 +95,12 @@ public event AsyncEventHandler<EventArgs> RecoverySucceededAsync`
`95`	`95`	`}`
`96`	`96`	`private AsyncEventingWrapper<EventArgs> _recoverySucceededAsyncWrapper;`
`97`	`97`
`98`		`- public event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryError`
	`98`	`+ public event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryErrorAsync`
`99`	`99`	`{`
`100`		`- add => _connectionRecoveryErrorWrapper.AddHandler(value);`
`101`		`- remove => _connectionRecoveryErrorWrapper.RemoveHandler(value);`
	`100`	`+ add => _connectionRecoveryErrorAsyncWrapper.AddHandler(value);`
	`101`	`+ remove => _connectionRecoveryErrorAsyncWrapper.RemoveHandler(value);`
`102`	`102`	`}`
`103`		`- private AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs> _connectionRecoveryErrorWrapper;`
	`103`	`+ private AsyncEventingWrapper<ConnectionRecoveryErrorEventArgs> _connectionRecoveryErrorAsyncWrapper;`
`104`	`104`
`105`	`105`	`public event AsyncEventHandler<CallbackExceptionEventArgs> CallbackExceptionAsync`
`106`	`106`	`{`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ public event AsyncEventHandler<EventArgs> RecoverySucceededAsync`
`181`	`181`	`/// <summary>`
`182`	`182`	`/// This event is never fired by non-recovering connections but it is a part of the <see cref="IConnection"/> interface.`
`183`	`183`	`/// </summary>`
`184`		`- public event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryError`
	`184`	`+ public event AsyncEventHandler<ConnectionRecoveryErrorEventArgs> ConnectionRecoveryErrorAsync`
`185`	`185`	`{`
`186`	`186`	`add { }`
`187`	`187`	`remove { }`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ protected void AddCallbackExceptionHandlers(IConnection conn, IChannel channel)`
`225`	`225`	`{`
`226`	`226`	`if (conn != null)`
`227`	`227`	`{`
`228`		`- conn.ConnectionRecoveryError += (s, ea) =>`
	`228`	`+ conn.ConnectionRecoveryErrorAsync += (s, ea) =>`
`229`	`229`	`{`
`230`	`230`	`_connectionRecoveryException = ea.Exception;`
`231`	`231`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public async Task TestTopologyRecoveryConsumerFilter()`
`295`	`295`	`connectionRecoveryTcs.SetResult(true);`
`296`	`296`	`return Task.CompletedTask;`
`297`	`297`	`};`
`298`		`- conn.ConnectionRecoveryError += (source, ea) =>`
	`298`	`+ conn.ConnectionRecoveryErrorAsync += (source, ea) =>`
`299`	`299`	`{`
`300`	`300`	`connectionRecoveryTcs.SetException(ea.Exception);`
`301`	`301`	`return Task.CompletedTask;`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ public async Task TestTopologyRecoveryDefaultFilterRecoversAllEntities()`
`254`	`254`	`connectionRecoveryTcs.SetResult(true);`
`255`	`255`	`return Task.CompletedTask;`
`256`	`256`	`};`
`257`		`- conn.ConnectionRecoveryError += (source, ea) =>`
	`257`	`+ conn.ConnectionRecoveryErrorAsync += (source, ea) =>`
`258`	`258`	`{`
`259`	`259`	`connectionRecoveryTcs.SetException(ea.Exception);`
`260`	`260`	`return Task.CompletedTask;`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public async Task TestCloseConnection()`
`92`	`92`	`return Task.CompletedTask;`
`93`	`93`	`};`
`94`	`94`
`95`		`- conn.ConnectionRecoveryError += (s, ea) =>`
	`95`	`+ conn.ConnectionRecoveryErrorAsync += (s, ea) =>`
`96`	`96`	`{`
`97`	`97`	`_output.WriteLine($"[ERROR] connection recovery error {ea.Exception}");`
`98`	`98`	`recoverySucceededTcs.SetResult(false);`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public async Task InitializeAsync()`
`89`	`89`	`return Task.CompletedTask;`
`90`	`90`	`};`
`91`	`91`
`92`		`- _connection.ConnectionRecoveryError += (sender, ea) =>`
	`92`	`+ _connection.ConnectionRecoveryErrorAsync += (sender, ea) =>`
`93`	`93`	`{`
`94`	`94`	`_testOutputHelper.WriteLine("{0} [ERROR] connection recovery error: {1}",`
`95`	`95`	`DateTime.Now, ea.Exception);`