Skip to content

Commit 6ff007f

Browse files
Update module github.com/cenkalti/backoff/v4 to v5
1 parent b7beae5 commit 6ff007f

File tree

7 files changed

+17
-16
lines changed

7 files changed

+17
-16
lines changed

client/internal/httpsender.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import (
1313
"sync/atomic"
1414
"time"
1515

16-
"github.com/cenkalti/backoff/v4"
17-
"github.com/open-telemetry/opamp-go/internal"
16+
"github.com/cenkalti/backoff/v5"
1817
"google.golang.org/protobuf/proto"
1918

2019
"github.com/open-telemetry/opamp-go/client/types"
20+
"github.com/open-telemetry/opamp-go/internal"
2121
"github.com/open-telemetry/opamp-go/protobufs"
2222
)
2323

@@ -176,8 +176,6 @@ func (h *HTTPSender) sendRequestWithRetries(ctx context.Context) (*http.Response
176176

177177
// Repeatedly try requests with a backoff strategy.
178178
infiniteBackoff := backoff.NewExponentialBackOff()
179-
// Make backoff run forever.
180-
infiniteBackoff.MaxElapsedTime = 0
181179

182180
interval := time.Duration(0)
183181

client/wsclient.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sync/atomic"
1010
"time"
1111

12-
"github.com/cenkalti/backoff/v4"
12+
"github.com/cenkalti/backoff/v5"
1313
"github.com/gorilla/websocket"
1414

1515
"github.com/open-telemetry/opamp-go/client/internal"
@@ -202,9 +202,6 @@ func (c *wsClient) tryConnectOnce(ctx context.Context) (retryAfter sharedinterna
202202
func (c *wsClient) ensureConnected(ctx context.Context) error {
203203
infiniteBackoff := backoff.NewExponentialBackOff()
204204

205-
// Make ticker run forever.
206-
infiniteBackoff.MaxElapsedTime = 0
207-
208205
interval := time.Duration(0)
209206

210207
for {

go.mod

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
module github.com/open-telemetry/opamp-go
22

3-
go 1.22
3+
go 1.23
4+
5+
toolchain go1.23.2
46

57
require (
6-
github.com/cenkalti/backoff/v4 v4.3.0
8+
github.com/cenkalti/backoff/v5 v5.0.0
79
github.com/google/uuid v1.6.0
810
github.com/gorilla/websocket v1.5.3
911
github.com/stretchr/testify v1.10.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
2-
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
1+
github.com/cenkalti/backoff/v5 v5.0.0 h1:4ziwFuaVJicDO1ah1Nz1aXXV1caM28PFgf1V5TTFXew=
2+
github.com/cenkalti/backoff/v5 v5.0.0/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
33
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
44
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
55
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=

internal/examples/go.mod

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
module github.com/open-telemetry/opamp-go/internal/examples
22

3-
go 1.22
3+
go 1.23
4+
5+
toolchain go1.23.2
46

57
require (
6-
github.com/cenkalti/backoff/v4 v4.3.0
8+
github.com/cenkalti/backoff/v5 v5.0.0
79
github.com/google/uuid v1.6.0
810
github.com/knadh/koanf v1.3.3
911
github.com/oklog/ulid/v2 v2.1.0
@@ -20,6 +22,7 @@ require (
2022
)
2123

2224
require (
25+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2326
github.com/davecgh/go-spew v1.1.1 // indirect
2427
github.com/felixge/httpsnoop v1.0.4 // indirect
2528
github.com/fsnotify/fsnotify v1.4.9 // indirect

internal/examples/go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAm
1515
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
1616
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
1717
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
18+
github.com/cenkalti/backoff/v5 v5.0.0 h1:4ziwFuaVJicDO1ah1Nz1aXXV1caM28PFgf1V5TTFXew=
19+
github.com/cenkalti/backoff/v5 v5.0.0/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
1820
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
1921
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2022
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

internal/examples/supervisor/supervisor/supervisor.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"sync/atomic"
1212
"time"
1313

14-
"github.com/cenkalti/backoff/v4"
14+
"github.com/cenkalti/backoff/v5"
1515
"github.com/google/uuid"
1616
"github.com/knadh/koanf"
1717
"github.com/knadh/koanf/parsers/yaml"
@@ -424,7 +424,6 @@ func (s *Supervisor) startAgent() {
424424
// Prepare health checker
425425
healthCheckBackoff := backoff.NewExponentialBackOff()
426426
healthCheckBackoff.MaxInterval = 60 * time.Second
427-
healthCheckBackoff.MaxElapsedTime = 0 // Never stop
428427
if s.healthCheckTicker != nil {
429428
s.healthCheckTicker.Stop()
430429
}

0 commit comments

Comments
 (0)