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

Signed-off-by: Bogdan Drutu <[email protected]>
open-telemetry · Feb 17, 2025 · adca17d · adca17d
1 parent 4397ebc
commit adca17d
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 32 deletions.
diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod
@@ -37,6 +37,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.2 // 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
@@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/config/configretry
 go 1.23.0
 
 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
@@ -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/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"
@@ -75,13 +75,13 @@ func (rs *retrySender) Send(ctx context.Context, req request.Request) error {
 		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.",
@@ -111,7 +111,13 @@ func (rs *retrySender) Send(ctx context.Context, req request.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/xexporterhelper/go.mod b/exporter/exporterhelper/xexporterhelper/go.mod
@@ -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
@@ -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
@@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/exporter
 go 1.23.0
 
 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.119.0
 	go.opentelemetry.io/collector/component/componenttest v0.119.0

diff --git a/exporter/go.sum b/exporter/go.sum
diff --git a/exporter/nopexporter/go.sum b/exporter/nopexporter/go.sum
diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod
@@ -32,7 +32,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
@@ -30,7 +30,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/internal/e2e/go.mod b/internal/e2e/go.mod
@@ -40,6 +40,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.2 // 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.0
 
-toolchain go1.23.2
-
 require (
 	github.com/a8m/envsubst v1.4.2
 	github.com/client9/misspell v0.3.4

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