Add more info during the reconnection

Signed-off-by: Gabriele Santomaggio <[email protected]>

Author: Gsantomaggio

RabbitMQ.AMQP.Client/IRecoveryConfiguration.cs

@@ -60,4 +60,6 @@ public interface IBackOffDelayPolicy
     /// or when the user wants to disable the backoff delay policy.
     /// </summary>
     bool IsActive();
+    
+    int CurrentAttempt { get; }
 }

RabbitMQ.AMQP.Client/Impl/AbstractLifeCycle.cs

@@ -57,10 +57,12 @@ internal async Task Reconnect()
         try
         {
             int randomWait = Random.Shared.Next(300, 900);
-            Trace.WriteLine(TraceLevel.Information, $"{ToString()} is reconnecting in {randomWait} ms");
+            Trace.WriteLine(TraceLevel.Information, $"{ToString()} is reconnecting in {randomWait} ms, " +
+                                                    $"attempt: {_backOffDelayPolicy.CurrentAttempt}");
             await Task.Delay(randomWait).ConfigureAwait(false);
             await OpenAsync().ConfigureAwait(false);
-            Trace.WriteLine(TraceLevel.Information, $"{ToString()} is reconnected");
+            Trace.WriteLine(TraceLevel.Information,
+                $"{ToString()} is reconnected, attempt: {_backOffDelayPolicy.CurrentAttempt}");
             _backOffDelayPolicy.Reset();
         }
         catch (Exception e)

RabbitMQ.AMQP.Client/Impl/AmqpConnection.cs

@@ -289,8 +289,12 @@ await Task.Run(async () =>
                             try
                             {
                                 int next = _connectionSettings.RecoveryConfiguration.GetBackOffDelayPolicy().Delay();
+
                                 Trace.WriteLine(TraceLevel.Information,
-                                    $"Trying Recovering connection in {next} milliseconds. Info: {ToString()})");
+                                    $"Trying Recovering connection in {next} milliseconds, " +
+                                    $"attempt: {_connectionSettings.RecoveryConfiguration.GetBackOffDelayPolicy().CurrentAttempt}. " +
+                                    $"Info: {ToString()})");
+
                                 await Task.Delay(TimeSpan.FromMilliseconds(next))
                                     .ConfigureAwait(false);
 
@@ -342,7 +346,7 @@ await _recordingTopologyListener.Accept(visitor)
                             Trace.WriteLine(TraceLevel.Error, $"Error trying to reconnect entities {e}. Info: {this}");
                         }
                     }).ConfigureAwait(false);
-                    
+
                     return;
                 }
 

RabbitMQ.AMQP.Client/Impl/ConnectionSettings.cs

@@ -281,7 +281,6 @@ private BackOffDelayPolicy(int maxAttempt)
     private const int EndRandomMilliseconds = 1500;
 
     private int _attempt = 1;
-    private int _totalAttempt = 0;
     private readonly int _maxAttempt = 12;
 
 
@@ -296,25 +295,27 @@ private void ResetAfterMaxAttempt()
     public int Delay()
     {
         _attempt++;
-        _totalAttempt++;
+        CurrentAttempt++;
         ResetAfterMaxAttempt();
         return Random.Shared.Next(StartRandomMilliseconds, EndRandomMilliseconds) * _attempt;
     }
 
     public void Reset()
     {
         _attempt = 1;
-        _totalAttempt = 0;
+        CurrentAttempt = 0;
     }
 
     public bool IsActive()
     {
-        return _totalAttempt < _maxAttempt;
+        return CurrentAttempt < _maxAttempt;
     }
 
+    public int CurrentAttempt { get; private set; } = 0;
+
 
     public override string ToString()
     {
-        return $"BackOffDelayPolicy{{ Attempt={_attempt}, TotalAttempt={_totalAttempt}, IsActive={IsActive} }}";
+        return $"BackOffDelayPolicy{{ Attempt={_attempt}, TotalAttempt={CurrentAttempt}, IsActive={IsActive} }}";
     }
 }

Tests/ConnectionRecoveryTests.cs

@@ -22,6 +22,7 @@ public void Reset()
     }
 
     public bool IsActive() => false;
+    public int CurrentAttempt => 1;
 }
 
 internal class FakeFastBackOffDelay : IBackOffDelayPolicy
@@ -36,6 +37,7 @@ public void Reset()
     }
 
     public bool IsActive() => true;
+    public int CurrentAttempt => 1;
 }
 
 public class ConnectionRecoveryTests(ITestOutputHelper testOutputHelper)