remove the Recovery limits

Signed-off-by: Gabriele Santomaggio <G.santomaggio@gmail.com>

Author: Gsantomaggio

pkg/rabbitmqamqp/amqp_connection.go

@@ -227,9 +227,6 @@ func validateOptions(connOptions *AmqpConnOptions) (*AmqpConnOptions, error) {
 	if connOptions.RecoveryConfiguration.MaxReconnectAttempts <= 0 && connOptions.RecoveryConfiguration.ActiveRecovery {
 		return nil, fmt.Errorf("MaxReconnectAttempts should be greater than 0")
 	}
-	if connOptions.RecoveryConfiguration.BackOffReconnectInterval <= 1*time.Second && connOptions.RecoveryConfiguration.ActiveRecovery {
-		return nil, fmt.Errorf("BackOffReconnectInterval should be greater than 1 second")
-	}
 
 	return connOptions, nil
 }
@@ -325,9 +322,11 @@ func (a *AmqpConnection) maybeReconnect() {
 
 		///wait for before reconnecting
 		// add some random milliseconds to the wait time to avoid thundering herd
-		// the random time is between 0 and 500 milliseconds
-		// Calculate delay with exponential backoff and jitter
-		jitter := time.Duration(rand.Intn(500)) * time.Millisecond
+		var jitter = time.Duration(0)
+		if a.amqpConnOptions.RecoveryConfiguration.Jitter > 0 {
+			jitter = time.Duration(rand.Int63n(int64(a.amqpConnOptions.RecoveryConfiguration.Jitter)))
+		}
+
 		delay := baseDelay + jitter
 		if delay > maxDelay {
 			delay = maxDelay

pkg/rabbitmqamqp/amqp_connection_recovery.go

@@ -21,6 +21,12 @@ type RecoveryConfiguration struct {
 	*/
 	BackOffReconnectInterval time.Duration
 
+	/*
+		Jitter used to add randomness to the reconnection interval.
+		Default is 500 milliseconds.
+	*/
+	Jitter time.Duration
+
 	/*
 		MaxReconnectAttempts The maximum number of reconnection attempts.
 		Default is 5.
@@ -34,6 +40,7 @@ func (c *RecoveryConfiguration) Clone() *RecoveryConfiguration {
 		ActiveRecovery:           c.ActiveRecovery,
 		BackOffReconnectInterval: c.BackOffReconnectInterval,
 		MaxReconnectAttempts:     c.MaxReconnectAttempts,
+		Jitter:                   c.Jitter,
 	}
 
 	return cloned
@@ -45,6 +52,7 @@ func NewRecoveryConfiguration() *RecoveryConfiguration {
 		ActiveRecovery:           true,
 		BackOffReconnectInterval: 5 * time.Second,
 		MaxReconnectAttempts:     5,
+		Jitter:                   500 * time.Millisecond,
 	}
 }
 

pkg/rabbitmqamqp/amqp_connection_recovery_test.go

@@ -29,8 +29,9 @@ var _ = Describe("Recovery connection test", func() {
 			// reduced the reconnect interval to speed up the test
 			RecoveryConfiguration: &RecoveryConfiguration{
 				ActiveRecovery:           true,
-				BackOffReconnectInterval: 2 * time.Second,
+				BackOffReconnectInterval: 1 * time.Second,
 				MaxReconnectAttempts:     5,
+				Jitter:                   200 * time.Millisecond,
 			},
 			Id: "reconnect producers and consumers",
 		})
@@ -178,18 +179,6 @@ var _ = Describe("Recovery connection test", func() {
 	It("validate the Recovery connection parameters", func() {
 
 		_, err := Dial(context.Background(), "amqp://", &AmqpConnOptions{
-			SASLType: amqp.SASLTypeAnonymous(),
-			// reduced the reconnect interval to speed up the test
-			RecoveryConfiguration: &RecoveryConfiguration{
-				ActiveRecovery:           true,
-				BackOffReconnectInterval: 500 * time.Millisecond,
-				MaxReconnectAttempts:     5,
-			},
-		})
-		Expect(err).NotTo(BeNil())
-		Expect(err.Error()).To(ContainSubstring("BackOffReconnectInterval should be greater than"))
-
-		_, err = Dial(context.Background(), "amqp://", &AmqpConnOptions{
 			SASLType: amqp.SASLTypeAnonymous(),
 			RecoveryConfiguration: &RecoveryConfiguration{
 				ActiveRecovery:       true,