Skip to content

Commit 11b2e2e

Browse files
bogdandrutubogdandrutu
authored
Update module github.com/cenkalti/backoff/v4 to v5 (#11989)
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 27ff489 commit 11b2e2e

File tree

24 files changed

+48
-30
lines changed

24 files changed

+48
-30
lines changed

‎cmd/otelcorecol/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ require (
3737
require (
3838
github.com/beorn7/perks v1.0.1 // indirect
3939
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
40+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
4041
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4142
github.com/davecgh/go-spew v1.1.1 // indirect
4243
github.com/ebitengine/purego v0.8.2 // indirect

‎cmd/otelcorecol/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/configretry/backoff.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"errors"
88
"time"
99

10-
"github.com/cenkalti/backoff/v4"
10+
"github.com/cenkalti/backoff/v5"
1111
)
1212

1313
// NewDefaultBackOffConfig returns the default settings for RetryConfig.

‎config/configretry/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/config/configretry
33
go 1.23.0
44

55
require (
6-
github.com/cenkalti/backoff/v4 v4.3.0
6+
github.com/cenkalti/backoff/v5 v5.0.2
77
github.com/stretchr/testify v1.10.0
88
go.uber.org/goleak v1.3.0
99
)

‎config/configretry/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/debugexporter/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
)
2323

2424
require (
25-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
25+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
2626
github.com/davecgh/go-spew v1.1.1 // indirect
2727
github.com/go-logr/logr v1.4.2 // indirect
2828
github.com/go-logr/stdr v1.2.2 // indirect

‎exporter/debugexporter/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/exporterhelper/internal/retry_sender.go

+12-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010
"time"
1111

12-
"github.com/cenkalti/backoff/v4"
12+
"github.com/cenkalti/backoff/v5"
1313
"go.opentelemetry.io/otel/attribute"
1414
"go.opentelemetry.io/otel/trace"
1515
"go.uber.org/zap"
@@ -75,13 +75,13 @@ func (rs *retrySender) Send(ctx context.Context, req request.Request) error {
7575
RandomizationFactor: rs.cfg.RandomizationFactor,
7676
Multiplier: rs.cfg.Multiplier,
7777
MaxInterval: rs.cfg.MaxInterval,
78-
MaxElapsedTime: rs.cfg.MaxElapsedTime,
79-
Stop: backoff.Stop,
80-
Clock: backoff.SystemClock,
8178
}
82-
expBackoff.Reset()
8379
span := trace.SpanFromContext(ctx)
8480
retryNum := int64(0)
81+
var maxElapsedTime time.Time
82+
if rs.cfg.MaxElapsedTime > 0 {
83+
maxElapsedTime = time.Now().Add(rs.cfg.MaxElapsedTime)
84+
}
8585
for {
8686
span.AddEvent(
8787
"Sending request.",
@@ -111,7 +111,13 @@ func (rs *retrySender) Send(ctx context.Context, req request.Request) error {
111111
backoffDelay = max(backoffDelay, throttleErr.delay)
112112
}
113113

114-
if deadline, has := ctx.Deadline(); has && time.Until(deadline) < backoffDelay {
114+
nextRetryTime := time.Now().Add(backoffDelay)
115+
if !maxElapsedTime.IsZero() && maxElapsedTime.Before(nextRetryTime) {
116+
// The delay is longer than the maxElapsedTime.
117+
return fmt.Errorf("no more retries left: %w", err)
118+
}
119+
120+
if deadline, has := ctx.Deadline(); has && deadline.Before(nextRetryTime) {
115121
// The delay is longer than the deadline. There is no point in
116122
// waiting for cancelation.
117123
return fmt.Errorf("request will be cancelled before next retry: %w", err)

‎exporter/exporterhelper/xexporterhelper/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
)
2626

2727
require (
28-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
28+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
2929
github.com/davecgh/go-spew v1.1.1 // indirect
3030
github.com/go-logr/logr v1.4.2 // indirect
3131
github.com/go-logr/stdr v1.2.2 // indirect

‎exporter/exporterhelper/xexporterhelper/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/exportertest/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
)
2323

2424
require (
25-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
25+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
2626
github.com/davecgh/go-spew v1.1.1 // indirect
2727
github.com/go-logr/logr v1.4.2 // indirect
2828
github.com/go-logr/stdr v1.2.2 // indirect

‎exporter/exportertest/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/exporter
33
go 1.23.0
44

55
require (
6-
github.com/cenkalti/backoff/v4 v4.3.0
6+
github.com/cenkalti/backoff/v5 v5.0.2
77
github.com/stretchr/testify v1.10.0
88
go.opentelemetry.io/collector/component v1.27.0
99
go.opentelemetry.io/collector/component/componenttest v0.121.0

‎exporter/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/nopexporter/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/otlpexporter/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
)
3333

3434
require (
35-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
35+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
3636
github.com/davecgh/go-spew v1.1.1 // indirect
3737
github.com/fsnotify/fsnotify v1.8.0 // indirect
3838
github.com/go-logr/logr v1.4.2 // indirect

‎exporter/otlpexporter/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/otlphttpexporter/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
)
3131

3232
require (
33-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
33+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
3434
github.com/davecgh/go-spew v1.1.1 // indirect
3535
github.com/felixge/httpsnoop v1.0.4 // indirect
3636
github.com/fsnotify/fsnotify v1.8.0 // indirect

‎exporter/otlphttpexporter/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/e2e/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ require (
4141
require (
4242
github.com/beorn7/perks v1.0.1 // indirect
4343
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
44+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
4445
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4546
github.com/davecgh/go-spew v1.1.1 // indirect
4647
github.com/ebitengine/purego v0.8.2 // indirect

‎internal/e2e/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎otelcol/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎otelcol/otelcoltest/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎service/go.sum

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)