Change backoff to not be cumulative

internal/bundle/strict/processor_retry.go

@@ -16,7 +16,7 @@ func wrapWithRetry(p iprocessor.V1, mgr bundle.NewManagement, maxRetries int) ip
 	backoffCtor := func() backoff.BackOff {
 		boff := backoff.NewExponentialBackOff()
 		boff.InitialInterval = time.Millisecond * 100
-		boff.MaxInterval = time.Second * 3
+		boff.MaxInterval = time.Second * 60
 		boff.MaxElapsedTime = 0
 		return boff
 	}
@@ -116,7 +116,7 @@ errorChecks:
 	).Trace("Error occurred, sleeping for next backoff period.")
 
 	select {
-	case <-time.After(r.backoffDuration):
+	case <-time.After(nextSleep):
 		return nil, err
 	case <-ctx.Done():
 		return nil, ctx.Err()

internal/bundle/strict/processor_retry_test.go

@@ -52,19 +52,17 @@ func TestProcessorWrapWithRetry(t *testing.T) {
 	msgs, err = retryProc.ProcessBatch(tCtx, msg)
 	require.Error(t, err, "Expected error on third attempt")
 	require.Empty(t, msgs)
-	end := time.Now()
+
+	elapsedTime := time.Since(start)
+	expectedMinimum := 200 * time.Millisecond // [200ms, 600ms]
+	require.GreaterOrEqualf(t, elapsedTime, expectedMinimum, "Total wait duration should be at least %v, got %v", expectedMinimum, elapsedTime)
 
 	msgs, err = retryProc.ProcessBatch(tCtx, msg)
 	require.NoError(t, err, "Expected no error as maxiumum retries exceeded")
 	require.Len(t, msgs, 1)
 
 	require.Equal(t, 4, mock.retries,
 		"Expected exactly %d attempts", 4)
-
-	expectedTotal := 1 * time.Second
-	require.WithinDurationf(t, end, start, expectedTotal,
-		"Total duration should be at least %v, got %v",
-		expectedTotal, end)
 }
 
 func TestProcessorWrapWithRetryMultiMessage(t *testing.T) {
@@ -101,18 +99,14 @@ func TestProcessorWrapWithRetryMultiMessage(t *testing.T) {
 	require.Error(t, err, "Expected error on fifth attempt")
 	require.Empty(t, msgs)
 
-	end := time.Now()
+	elapsedTime := time.Since(start)
+	expectedMinimum := 800 * time.Millisecond // [800ms, 2400ms]
+	require.GreaterOrEqualf(t, elapsedTime, expectedMinimum, "Total wait duration should be at least %v, got %v", expectedMinimum, elapsedTime)
 
 	msgs, err = retryProc.ProcessBatch(tCtx, msg)
 	require.NoError(t, err, "Expected no error as maxiumum retries exceeded")
 	require.Len(t, msgs, 1)
 
 	require.Equal(t, 6, mock.retries,
 		"Expected exactly %d attempts", 6)
-
-	expectedTotal := 4 * time.Second
-	require.WithinDurationf(t, end, start, expectedTotal,
-		"Total duration should be at least %v, got %v",
-		expectedTotal, end)
-
 }