Update module github.com/cenkalti/backoff/v4 to v5

Signed-off-by: Bogdan Drutu <[email protected]>
open-telemetry · Jan 2, 2025 · f31015c · f31015c
1 parent 20bf1fa
commit f31015c
Show file tree

Hide file tree

Showing 32 changed files with 70 additions and 57 deletions.
diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod
@@ -2,9 +2,7 @@
 
 module go.opentelemetry.io/collector/cmd/otelcorecol
 
-go 1.22.0
-
-toolchain go1.22.10
+go 1.23
 
 require (
 	go.opentelemetry.io/collector/component v0.116.0
@@ -37,6 +35,7 @@ require (
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/ebitengine/purego v0.8.1 // indirect

diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum
diff --git a/config/configretry/backoff.go b/config/configretry/backoff.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/cenkalti/backoff/v4"
+	"github.com/cenkalti/backoff/v5"
 )
 
 // NewDefaultBackOffConfig returns the default settings for RetryConfig.

diff --git a/config/configretry/go.mod b/config/configretry/go.mod
@@ -1,9 +1,9 @@
 module go.opentelemetry.io/collector/config/configretry
 
-go 1.22.0
+go 1.23
 
 require (
-	github.com/cenkalti/backoff/v4 v4.3.0
+	github.com/cenkalti/backoff/v5 v5.0.0
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/goleak v1.3.0
 )

diff --git a/config/configretry/go.sum b/config/configretry/go.sum
diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/collector/exporter/debugexporter
 
-go 1.22.0
+go 1.23
 
 require (
 	github.com/stretchr/testify v1.10.0
@@ -22,7 +22,7 @@ require (
 )
 
 require (
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect

diff --git a/exporter/debugexporter/go.sum b/exporter/debugexporter/go.sum
diff --git a/exporter/exporterhelper/internal/queue_sender_test.go b/exporter/exporterhelper/internal/queue_sender_test.go
@@ -196,6 +196,10 @@ func TestQueuedRetryHappyPath(t *testing.T) {
 	) {
 		t.Run(testName, func(t *testing.T) {
 			resetFeatureGate := setFeatureGateForTest(t, usePullingBasedExporterQueueBatcher, enableQueueBatcher)
+			t.Cleanup(func() {
+				resetFeatureGate()
+			})
+
 			tel, err := componenttest.SetupTelemetry(defaultID)
 			require.NoError(t, err)
 			t.Cleanup(func() { require.NoError(t, tel.Shutdown(context.Background())) })
@@ -221,7 +225,6 @@ func TestQueuedRetryHappyPath(t *testing.T) {
 			require.NoError(t, be.Start(context.Background(), componenttest.NewNopHost()))
 			t.Cleanup(func() {
 				assert.NoError(t, be.Shutdown(context.Background()))
-				resetFeatureGate()
 			})
 
 			// Wait until all batches received

diff --git a/exporter/exporterhelper/internal/retry_sender.go b/exporter/exporterhelper/internal/retry_sender.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/cenkalti/backoff/v4"
+	"github.com/cenkalti/backoff/v5"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
@@ -65,22 +65,20 @@ func (rs *retrySender) Shutdown(context.Context) error {
 	return nil
 }
 
-// send implements the requestSender interface
+// Send implements the requestSender interface
 func (rs *retrySender) Send(ctx context.Context, req internal.Request) error {
-	// Do not use NewExponentialBackOff since it calls Reset and the code here must
-	// call Reset after changing the InitialInterval (this saves an unnecessary call to Now).
 	expBackoff := backoff.ExponentialBackOff{
 		InitialInterval:     rs.cfg.InitialInterval,
 		RandomizationFactor: rs.cfg.RandomizationFactor,
 		Multiplier:          rs.cfg.Multiplier,
 		MaxInterval:         rs.cfg.MaxInterval,
-		MaxElapsedTime:      rs.cfg.MaxElapsedTime,
-		Stop:                backoff.Stop,
-		Clock:               backoff.SystemClock,
 	}
-	expBackoff.Reset()
 	span := trace.SpanFromContext(ctx)
 	retryNum := int64(0)
+	var maxElapsedTime time.Time
+	if rs.cfg.MaxElapsedTime > 0 {
+		maxElapsedTime = time.Now().Add(rs.cfg.MaxElapsedTime)
+	}
 	for {
 		span.AddEvent(
 			"Sending request.",
@@ -110,7 +108,13 @@ func (rs *retrySender) Send(ctx context.Context, req internal.Request) error {
 			backoffDelay = max(backoffDelay, throttleErr.delay)
 		}
 
-		if deadline, has := ctx.Deadline(); has && time.Until(deadline) < backoffDelay {
+		nextRetryTime := time.Now().Add(backoffDelay)
+		if !maxElapsedTime.IsZero() && maxElapsedTime.Before(nextRetryTime) {
+			// The delay is longer than the maxElapsedTime.
+			return fmt.Errorf("no more retries left: %w", err)
+		}
+
+		if deadline, has := ctx.Deadline(); has && deadline.Before(nextRetryTime) {
 			// The delay is longer than the deadline.  There is no point in
 			// waiting for cancelation.
 			return fmt.Errorf("request will be cancelled before next retry: %w", err)

diff --git a/exporter/exporterhelper/internal/retry_sender_test.go b/exporter/exporterhelper/internal/retry_sender_test.go
@@ -318,10 +318,10 @@ func TestQueueRetryWithDisabledRetires(t *testing.T) {
 			ocs.run(func() {
 				require.Error(t, be.Send(context.Background(), mockR))
 			})
+			ocs.awaitAsyncProcessing()
 			assert.Len(t, observed.All(), 1)
 			assert.Equal(t, "Exporting failed. Rejecting data. "+
 				"Try enabling retry_on_failure config option to retry on retryable errors.", observed.All()[0].Message)
-			ocs.awaitAsyncProcessing()
 			mockR.checkNumRequests(t, 1)
 			ocs.checkSendItemsCount(t, 0)
 			ocs.checkDroppedItemsCount(t, 2)
@@ -367,15 +367,13 @@ func TestRetryWithContextTimeout(t *testing.T) {
 			ocs.run(func() {
 				ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
 				defer cancel()
-				err := be.Send(ctx, mockR)
-				require.Error(t, err)
-				require.Equal(t, "request will be cancelled before next retry: transient error", err.Error())
+				require.EqualError(t, be.Send(ctx, mockR), "request will be cancelled before next retry: transient error")
 			})
+			ocs.awaitAsyncProcessing()
 			assert.Len(t, observed.All(), 2)
 			assert.Equal(t, "Exporting failed. Will retry the request after interval.", observed.All()[0].Message)
 			assert.Equal(t, "Exporting failed. Rejecting data. "+
 				"Try enabling sending_queue to survive temporary failures.", observed.All()[1].Message)
-			ocs.awaitAsyncProcessing()
 			ocs.checkDroppedItemsCount(t, 7)
 			require.Equal(t, 2, mockR.(*mockErrorRequest).getNumRequests())
 			require.NoError(t, be.Shutdown(context.Background()))

diff --git a/exporter/exporterhelper/xexporterhelper/go.mod b/exporter/exporterhelper/xexporterhelper/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper
 
-go 1.22.0
+go 1.23
 
 require (
 	github.com/stretchr/testify v1.10.0
@@ -25,7 +25,7 @@ require (
 )
 
 require (
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect

diff --git a/exporter/exporterhelper/xexporterhelper/go.sum b/exporter/exporterhelper/xexporterhelper/go.sum
diff --git a/exporter/exportertest/go.mod b/exporter/exportertest/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/collector/exporter/exportertest
 
-go 1.22.0
+go 1.23
 
 require (
 	github.com/google/uuid v1.6.0
@@ -22,7 +22,7 @@ require (
 )
 
 require (
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect

diff --git a/exporter/exportertest/go.sum b/exporter/exportertest/go.sum
diff --git a/exporter/go.mod b/exporter/go.mod
@@ -1,9 +1,9 @@
 module go.opentelemetry.io/collector/exporter
 
-go 1.22.0
+go 1.23
 
 require (
-	github.com/cenkalti/backoff/v4 v4.3.0
+	github.com/cenkalti/backoff/v5 v5.0.0
 	github.com/stretchr/testify v1.10.0
 	go.opentelemetry.io/collector/component v0.116.0
 	go.opentelemetry.io/collector/component/componenttest v0.116.0

diff --git a/exporter/go.sum b/exporter/go.sum
diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/collector/exporter/nopexporter
 
-go 1.22.0
+go 1.23
 
 require (
 	github.com/stretchr/testify v1.10.0

diff --git a/exporter/nopexporter/go.sum b/exporter/nopexporter/go.sum
diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/collector/exporter/otlpexporter
 
-go 1.22.0
+go 1.23
 
 require (
 	github.com/stretchr/testify v1.10.0
@@ -31,7 +31,7 @@ require (
 )
 
 require (
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect

diff --git a/exporter/otlpexporter/go.sum b/exporter/otlpexporter/go.sum
diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/collector/exporter/otlphttpexporter
 
-go 1.22.0
+go 1.23
 
 require (
 	github.com/stretchr/testify v1.10.0
@@ -29,7 +29,7 @@ require (
 )
 
 require (
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect

diff --git a/exporter/otlphttpexporter/go.sum b/exporter/otlphttpexporter/go.sum
diff --git a/exporter/xexporter/go.mod b/exporter/xexporter/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/collector/exporter/xexporter
 
-go 1.22.0
+go 1.23
 
 require (
 	github.com/stretchr/testify v1.10.0

diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/collector/internal/e2e
 
-go 1.22.0
+go 1.23
 
 require (
 	github.com/stretchr/testify v1.10.0
@@ -39,6 +39,7 @@ require (
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/ebitengine/purego v0.8.1 // indirect

diff --git a/internal/e2e/go.sum b/internal/e2e/go.sum
diff --git a/internal/tools/go.mod b/internal/tools/go.mod
@@ -2,8 +2,6 @@ module go.opentelemetry.io/collector/internal/tools
 
 go 1.23
 
-toolchain go1.23.2
-
 require (
 	github.com/a8m/envsubst v1.4.2
 	github.com/client9/misspell v0.3.4

diff --git a/otelcol/go.mod b/otelcol/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/collector/otelcol
 
-go 1.22.0
+go 1.23
 
 require (
 	github.com/spf13/cobra v1.8.1

diff --git a/otelcol/go.sum b/otelcol/go.sum
diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/collector/otelcol/otelcoltest
 
-go 1.22.0
+go 1.23
 
 require (
 	github.com/stretchr/testify v1.10.0

diff --git a/otelcol/otelcoltest/go.sum b/otelcol/otelcoltest/go.sum