Skip to content

Commit 9decb65

Browse files
fix(deps): update module github.com/sony/gobreaker to v2 (#15036)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Paul Rogers <paul.rogers@grafana.com>
1 parent ef02dcd commit 9decb65

File tree

7 files changed

+36
-165
lines changed

7 files changed

+36
-165
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ require (
9090
github.com/segmentio/fasthash v1.0.3
9191
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c
9292
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
93-
github.com/sony/gobreaker v0.5.0
93+
github.com/sony/gobreaker/v2 v2.0.0
9494
github.com/spf13/afero v1.11.0
9595
github.com/stretchr/testify v1.9.0
9696
github.com/uber/jaeger-client-go v2.30.0+incompatible

‎go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2540,6 +2540,8 @@ github.com/soniah/gosnmp v1.25.0/go.mod h1:8YvfZxH388NIIw2A+X5z2Oh97VcNhtmxDLt5Q
25402540
github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
25412541
github.com/sony/gobreaker v0.5.0 h1:dRCvqm0P490vZPmy7ppEk2qCnCieBooFJ+YoXGYB+yg=
25422542
github.com/sony/gobreaker v0.5.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
2543+
github.com/sony/gobreaker/v2 v2.0.0 h1:23AaR4JQ65y4rz8JWMzgXw2gKOykZ/qfqYunll4OwJ4=
2544+
github.com/sony/gobreaker/v2 v2.0.0/go.mod h1:8JnRUz80DJ1/ne8M8v7nmTs2713i58nIt4s7XcGe/DI=
25432545
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
25442546
github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
25452547
github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=

‎pkg/storage/chunk/cache/memcached_client.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/pkg/errors"
2020
"github.com/prometheus/client_golang/prometheus"
2121
"github.com/prometheus/client_golang/prometheus/promauto"
22-
"github.com/sony/gobreaker"
22+
"github.com/sony/gobreaker/v2"
2323

2424
"github.com/grafana/loki/v3/pkg/util/constants"
2525
"github.com/grafana/loki/v3/pkg/util/jumphash"
@@ -50,7 +50,7 @@ type memcachedClient struct {
5050
addresses []string
5151
provider *dns.Provider
5252

53-
cbs map[ /*address*/ string]*gobreaker.CircuitBreaker
53+
cbs map[string]*gobreaker.CircuitBreaker[interface{}]
5454
cbFailures uint
5555
cbTimeout time.Duration
5656
cbInterval time.Duration
@@ -152,7 +152,7 @@ func NewMemcachedClient(cfg MemcachedClientConfig, name string, r prometheus.Reg
152152
service: cfg.Service,
153153
logger: logger,
154154
provider: dns.NewProvider(logger, dnsProviderRegisterer, dns.GolangResolverType),
155-
cbs: make(map[string]*gobreaker.CircuitBreaker),
155+
cbs: make(map[string]*gobreaker.CircuitBreaker[interface{}]),
156156
cbFailures: cfg.CBFailures,
157157
cbInterval: cfg.CBInterval,
158158
cbTimeout: cfg.CBTimeout,
@@ -201,7 +201,7 @@ func (c *memcachedClient) dialViaCircuitBreaker(network, address string, timeout
201201
c.Lock()
202202
cb := c.cbs[address]
203203
if cb == nil {
204-
cb = gobreaker.NewCircuitBreaker(gobreaker.Settings{
204+
cb = gobreaker.NewCircuitBreaker[interface{}](gobreaker.Settings{
205205
Name: c.name + ":" + address,
206206
Interval: c.cbInterval,
207207
Timeout: c.cbTimeout,
@@ -295,7 +295,7 @@ func (c *memcachedClient) updateMemcacheServers() error {
295295
// Copy across circuit-breakers for current set of addresses, thus
296296
// leaving behind any for servers we won't talk to again
297297
c.Lock()
298-
newCBs := make(map[string]*gobreaker.CircuitBreaker, len(servers))
298+
newCBs := make(map[string]*gobreaker.CircuitBreaker[interface{}], len(servers))
299299
for _, address := range servers {
300300
if cb, exists := c.cbs[address]; exists {
301301
newCBs[address] = cb

‎vendor/github.com/sony/gobreaker/README.md

Lines changed: 0 additions & 132 deletions
This file was deleted.

‎vendor/github.com/sony/gobreaker/gobreaker.go renamed to ‎vendor/github.com/sony/gobreaker/v2/gobreaker.go

Lines changed: 25 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,9 +1533,9 @@ github.com/shurcooL/vfsgen
15331533
# github.com/sirupsen/logrus v1.9.3
15341534
## explicit; go 1.13
15351535
github.com/sirupsen/logrus
1536-
# github.com/sony/gobreaker v0.5.0
1537-
## explicit; go 1.12
1538-
github.com/sony/gobreaker
1536+
# github.com/sony/gobreaker/v2 v2.0.0
1537+
## explicit; go 1.21
1538+
github.com/sony/gobreaker/v2
15391539
# github.com/spaolacci/murmur3 v1.1.0
15401540
## explicit
15411541
github.com/spaolacci/murmur3

0 commit comments

Comments
 (0)