From 02780d942c396dec131588aa9fe2b4c8cc333c74 Mon Sep 17 00:00:00 2001 From: Lukasz Raczylo Date: Sun, 4 Oct 2026 10:15:21 +0100 Subject: [PATCH] fix(deps): update avast/retry-go to v5 The v5 API replaces retry.Do(fn, opts...) with retry.New(opts...).Do(fn). The retry call in proxy.go uses the new form with the same options. --- go.mod | 3 ++- go.sum | 2 ++ proxy.go | 11 +++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index b09c547..a1e0577 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/MicahParks/keyfunc/v3 v3.8.2 github.com/VictoriaMetrics/metrics v1.44.1 github.com/alicebob/miniredis/v2 v2.33.0 - github.com/avast/retry-go/v4 v4.7.0 + github.com/avast/retry-go/v5 v5.0.0 github.com/goccy/go-json v0.11.2 github.com/gofiber/contrib/v3/websocket v1.2.7 github.com/gofiber/fiber/v3 v3.5.0 @@ -38,6 +38,7 @@ require ( require ( github.com/MicahParks/jwkset v0.11.3 // indirect github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect + github.com/avast/retry-go/v4 v4.7.0 // indirect github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/fasthttp/websocket v1.5.12 // indirect diff --git a/go.sum b/go.sum index c562f59..e82308d 100644 --- a/go.sum +++ b/go.sum @@ -10,6 +10,8 @@ github.com/alicebob/miniredis/v2 v2.33.0 h1:uvTF0EDeu9RLnUEG27Db5I68ESoIxTiXbNUi github.com/alicebob/miniredis/v2 v2.33.0/go.mod h1:MhP4a3EU7aENRi9aO+tHfTBZicLqQevyi/DJpoj6mi0= github.com/avast/retry-go/v4 v4.7.0 h1:yjDs35SlGvKwRNSykujfjdMxMhMQQM0TnIjJaHB+Zio= github.com/avast/retry-go/v4 v4.7.0/go.mod h1:ZMPDa3sY2bKgpLtap9JRUgk2yTAba7cgiFhqxY2Sg6Q= +github.com/avast/retry-go/v5 v5.0.0 h1:kf1Qc2UsTZ4qq8elDymqfbISvkyMuhgRxuJqX2NHP7k= +github.com/avast/retry-go/v5 v5.0.0/go.mod h1://d+usmKWio1agtZfS1H/ltTqwtIfBnRq9zEwjc3eH8= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= diff --git a/proxy.go b/proxy.go index 37f6de4..55ec59f 100644 --- a/proxy.go +++ b/proxy.go @@ -17,7 +17,7 @@ import ( "go.opentelemetry.io/otel/trace" - "github.com/avast/retry-go/v4" + "github.com/avast/retry-go/v5" "github.com/gofiber/fiber/v3" libpack_cache "github.com/lukaszraczylo/graphql-monitoring-proxy/cache" libpack_logger "github.com/lukaszraczylo/graphql-monitoring-proxy/logging" @@ -978,10 +978,7 @@ func performProxyRequestWithEnhancedRetries(c fiber.Ctx, proxyURL string, backen maxDelayTime = time.Duration(maxDelayMs) * time.Millisecond } - return retry.Do( - func() error { - return executeProxyAttempt(c, req) - }, + return retry.New( retry.Attempts(attempts), retry.DelayType(retry.BackOffDelay), retry.Delay(initialDelay), @@ -1056,7 +1053,9 @@ func performProxyRequestWithEnhancedRetries(c fiber.Ctx, proxyURL string, backen } return true }), - ) + ).Do(func() error { + return executeProxyAttempt(c, req) + }) } // isConnectionError checks if the error is a connection-related error