From 833d0374b33267d3f0194dfd2d004412f4836951 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Jun 2026 19:26:23 +0200 Subject: [PATCH] Update module github.com/cenkalti/backoff/v5 to v6 (#6752) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: qwerty287 Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com> --- agent/rpc/client_grpc.go | 8 +++++--- cmd/server/server.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- pipeline/backend/docker/docker.go | 7 +++---- pipeline/backend/kubernetes/kubernetes.go | 4 ++-- server/services/utils/http.go | 2 +- server/store/datastore/pipeline.go | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/agent/rpc/client_grpc.go b/agent/rpc/client_grpc.go index 71ab4404c..03ecd8d46 100644 --- a/agent/rpc/client_grpc.go +++ b/agent/rpc/client_grpc.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/cenkalti/backoff/v5" + "github.com/cenkalti/backoff/v6" "github.com/rs/zerolog/log" "google.golang.org/grpc" "google.golang.org/grpc/codes" @@ -150,13 +150,15 @@ func retryRPC[T any](ctx context.Context, c *client, opName string, op backoff.O // Context canceled while inside Retry: callers historically swallowed this // and returned a zero-value error, so preserve that contract. - if ctxErr := context.Cause(ctx); ctxErr != nil && errors.Is(err, ctxErr) { + if errors.Is(err, context.Canceled) { log.Debug().Err(err).Msgf("grpc: %s(): context canceled", opName) return zero, nil } + re := backoff.AsRetryError(err) + // MaxElapsedTime exhausted while we were still in errNotConnected — give up. - if errors.Is(err, errNotConnected) { + if errors.Is(re.LastErr, errNotConnected) { log.Error().Msg("grpc: connection lost, giving up") return zero, ErrConnectionLost } diff --git a/cmd/server/server.go b/cmd/server/server.go index feb8b11a3..e2df69f57 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/cenkalti/backoff/v5" + "github.com/cenkalti/backoff/v6" "github.com/gin-gonic/gin" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/rs/zerolog" diff --git a/go.mod b/go.mod index 5cf6f018a..0781fe195 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/6543/logfile-open v1.2.1 github.com/adrg/xdg v0.5.3 github.com/bmatcuk/doublestar/v4 v4.10.0 - github.com/cenkalti/backoff/v5 v5.0.3 + github.com/cenkalti/backoff/v6 v6.0.1 github.com/containerd/errdefs v1.0.0 github.com/distribution/reference v0.6.0 github.com/docker/cli v29.5.2+incompatible diff --git a/go.sum b/go.sum index e52dd5e7f..de403f781 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiD github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= github.com/catppuccin/go v0.3.0 h1:d+0/YicIq+hSTo5oPuRi5kOpqkVA5tAsU6dNhvRu+aY= github.com/catppuccin/go v0.3.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc= -github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= -github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= +github.com/cenkalti/backoff/v6 v6.0.1 h1:sjqUu1q4wY0FfFEkBmM3bVIHfr1QGq4nATg9M5VWj1U= +github.com/cenkalti/backoff/v6 v6.0.1/go.mod h1:5WCmPelT2zwAaNETjGJVKHDnZvjQdPsGeHHwm5lIPPI= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/charmbracelet/colorprofile v0.4.2 h1:BdSNuMjRbotnxHSfxy+PCSa4xAmz7szw70ktAtWRYrY= diff --git a/pipeline/backend/docker/docker.go b/pipeline/backend/docker/docker.go index 5bd2c0757..59dbd5b28 100644 --- a/pipeline/backend/docker/docker.go +++ b/pipeline/backend/docker/docker.go @@ -24,7 +24,7 @@ import ( "path/filepath" "time" - "github.com/cenkalti/backoff/v5" + "github.com/cenkalti/backoff/v6" "github.com/containerd/errdefs" "github.com/docker/go-connections/tlsconfig" "github.com/moby/moby/api/pkg/stdcopy" @@ -383,9 +383,8 @@ func (e *docker) DestroyWorkflow(ctx context.Context, conf *backend_types.Config log.Error().Err(err).Msgf("could not destroy all containers") } - var err error - _, _ = backoff.Retry(ctx, func() (any, error) { - _, err = e.client.VolumeRemove(ctx, conf.Volume, client.VolumeRemoveOptions{ + _, err := backoff.Retry(ctx, func() (any, error) { + _, err := e.client.VolumeRemove(ctx, conf.Volume, client.VolumeRemoveOptions{ Force: true, }) if err == nil || !isErrVolumeInUse(err) { diff --git a/pipeline/backend/kubernetes/kubernetes.go b/pipeline/backend/kubernetes/kubernetes.go index 9f512ea80..201c7c4c8 100644 --- a/pipeline/backend/kubernetes/kubernetes.go +++ b/pipeline/backend/kubernetes/kubernetes.go @@ -28,7 +28,7 @@ import ( "sync" "time" - "github.com/cenkalti/backoff/v5" + "github.com/cenkalti/backoff/v6" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" kube_core_v1 "k8s.io/api/core/v1" @@ -381,7 +381,7 @@ func (e *kube) WaitStep(ctx context.Context, step *types.Step, taskUUID string) }), ) if err != nil { - if kube_errors.IsNotFound(err) { + if kube_errors.IsNotFound(backoff.AsRetryError(err).LastErr) { return &types.State{ExitCode: 0, Exited: true}, nil } return nil, err diff --git a/server/services/utils/http.go b/server/services/utils/http.go index 46a62c650..6c71d965f 100644 --- a/server/services/utils/http.go +++ b/server/services/utils/http.go @@ -30,7 +30,7 @@ import ( "strings" "time" - "github.com/cenkalti/backoff/v5" + "github.com/cenkalti/backoff/v6" "github.com/rs/zerolog/log" "github.com/yaronf/httpsign" diff --git a/server/store/datastore/pipeline.go b/server/store/datastore/pipeline.go index f29cfa625..94b25b92c 100644 --- a/server/store/datastore/pipeline.go +++ b/server/store/datastore/pipeline.go @@ -19,7 +19,7 @@ import ( "strings" "time" - "github.com/cenkalti/backoff/v5" + "github.com/cenkalti/backoff/v6" "xorm.io/builder" "xorm.io/xorm"