Skip to content

Commit 310f08a

Browse files
committed
migrate to resty v3
Signed-off-by: Markus Blaschke <[email protected]>
1 parent 5743c49 commit 310f08a

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

fenecon/prober.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"strings"
88
"time"
99

10-
resty "github.com/go-resty/resty/v2"
1110
"github.com/prometheus/client_golang/prometheus"
1211
"github.com/remeh/sizedwaitgroup"
1312
"go.uber.org/zap"
13+
resty "resty.dev/v3"
1414
)
1515

1616
type (
@@ -49,12 +49,11 @@ func New(ctx context.Context, registry *prometheus.Registry, logger *zap.Sugared
4949

5050
func (fp *FeneconProber) initResty() {
5151
fp.client = resty.New()
52-
fp.client.RetryCount = 3
53-
fp.client.RetryWaitTime = 2 * time.Second
54-
fp.client.RetryMaxWaitTime = 5 * time.Second
55-
fp.client.AddRetryAfterErrorCondition()
56-
57-
fp.client.OnAfterResponse(func(client *resty.Client, response *resty.Response) error {
52+
fp.client.SetRetryCount(3)
53+
fp.client.SetRetryWaitTime(2 * time.Second)
54+
fp.client.SetRetryMaxWaitTime(5 * time.Second)
55+
fp.client.EnableRetryDefaultConditions()
56+
fp.client.AddResponseMiddleware(func(client *resty.Client, response *resty.Response) error {
5857
switch statusCode := response.StatusCode(); statusCode {
5958
case 401:
6059
return errors.New(`fenecon requires authentication or credentials are invalid`)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ go 1.24.0
55
toolchain go1.24.2
66

77
require (
8-
github.com/go-resty/resty/v2 v2.16.5
98
github.com/jessevdk/go-flags v1.6.1
109
github.com/prometheus/client_golang v1.22.0
1110
github.com/remeh/sizedwaitgroup v1.0.0
1211
github.com/webdevops/go-common v0.0.0-20250501164923-7cab87d11d0f
1312
go.uber.org/zap v1.27.0
13+
resty.dev/v3 v3.0.0-beta.2
1414
)
1515

1616
require (

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
88
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
99
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
1010
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
11-
github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM=
12-
github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA=
1311
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
1412
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
1513
github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bBK4=
@@ -54,9 +52,9 @@ golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
5452
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
5553
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
5654
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
57-
golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
58-
golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
5955
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
6056
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
6157
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
6258
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
59+
resty.dev/v3 v3.0.0-beta.2 h1:xu4mGAdbCLuc3kbk7eddWfWm4JfhwDtdapwss5nCjnQ=
60+
resty.dev/v3 v3.0.0-beta.2/go.mod h1:OgkqiPvTDtOuV4MGZuUDhwOpkY8enjOsjjMzeOHefy4=

0 commit comments

Comments
 (0)