Skip to content

Commit

Permalink
Dependency: Update to failsafe version 0.3.1 (#6123)
Browse files Browse the repository at this point in the history
  • Loading branch information
ying-jeanne authored Sep 25, 2023
1 parent 7f28f84 commit 48fe3c5
Show file tree
Hide file tree
Showing 15 changed files with 182 additions and 111 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137
github.com/dustin/go-humanize v1.0.1
github.com/edsrzf/mmap-go v1.1.0
github.com/failsafe-go/failsafe-go v0.0.0-20230918014924-ee2f3b27e8d7
github.com/failsafe-go/failsafe-go v0.3.1
github.com/felixge/fgprof v0.9.3
github.com/go-kit/log v0.2.1
github.com/go-openapi/strfmt v0.21.7
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBF
github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE=
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb h1:IT4JYU7k4ikYg1SCxNI1/Tieq/NFvh6dzLdgi7eu0tM=
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb/go.mod h1:bH6Xx7IW64qjjJq8M2u4dxNaBiDfKK+z/3eGDpXEQhc=
github.com/failsafe-go/failsafe-go v0.0.0-20230918014924-ee2f3b27e8d7 h1:UB/Ct5D2Q6/7dCjeR5+jLpAbr1lb4hWksEu7Uyfr0T8=
github.com/failsafe-go/failsafe-go v0.0.0-20230918014924-ee2f3b27e8d7/go.mod h1:sOb0hHPaCwa2RpftMLFdV28No/2vcesSRGvf13YvKQU=
github.com/failsafe-go/failsafe-go v0.3.1 h1:2Zb9E8zRTJeaFU+sfWybYaPbVwU94My9TetC/NFbvlc=
github.com/failsafe-go/failsafe-go v0.3.1/go.mod h1:m5us3Ow4Q5S7q6Gg0G2MQ/cEM5CKHeFQtYIUuOB/i3M=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
Expand Down
6 changes: 3 additions & 3 deletions pkg/ingester/client/circuitbreaker.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ func NewCircuitBreaker(addr string, cfg CircuitBreakerConfig, metrics *Metrics,
}).
OnClose(func(event circuitbreaker.StateChangedEvent) {
metrics.circuitBreakerTransitions.WithLabelValues(circuitbreaker.ClosedState.String()).Inc()
level.Info(logger).Log("msg", "circuit breaker is closed", "addr", addr, "previous", event.PreviousState, "current", circuitbreaker.ClosedState)
level.Info(logger).Log("msg", "circuit breaker is closed", "addr", addr, "previous", event.OldState, "current", circuitbreaker.ClosedState)
}).
OnOpen(func(event circuitbreaker.StateChangedEvent) {
metrics.circuitBreakerTransitions.WithLabelValues(circuitbreaker.OpenState.String()).Inc()
level.Info(logger).Log("msg", "circuit breaker is open", "addr", addr, "previous", event.PreviousState, "current", circuitbreaker.OpenState)
level.Info(logger).Log("msg", "circuit breaker is open", "addr", addr, "previous", event.OldState, "current", circuitbreaker.OpenState)
}).
OnHalfOpen(func(event circuitbreaker.StateChangedEvent) {
metrics.circuitBreakerTransitions.WithLabelValues(circuitbreaker.HalfOpenState.String()).Inc()
level.Info(logger).Log("msg", "circuit breaker is half-open", "addr", addr, "previous", event.PreviousState, "current", circuitbreaker.HalfOpenState)
level.Info(logger).Log("msg", "circuit breaker is half-open", "addr", addr, "previous", event.OldState, "current", circuitbreaker.HalfOpenState)
}).
HandleIf(func(r any, err error) bool { return isFailure(err) }).
Build()
Expand Down
13 changes: 11 additions & 2 deletions vendor/github.com/failsafe-go/failsafe-go/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions vendor/github.com/failsafe-go/failsafe-go/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/github.com/failsafe-go/failsafe-go/codecov.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

85 changes: 65 additions & 20 deletions vendor/github.com/failsafe-go/failsafe-go/execution.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 48fe3c5

Please sign in to comment.