Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove contexts #83

Merged
merged 5 commits into from
Dec 29, 2024
Merged

Remove contexts #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f37fb1
Remove contexts
YoshiyukiMineo Dec 29, 2024
72a8365
Update distributed_gobreaker_test.go
YoshiyukiMineo Dec 29, 2024
e8147a1
Update distributed_gobreaker.go
YoshiyukiMineo Dec 29, 2024
6cb61a5
Update distributed_gobreaker.go
YoshiyukiMineo Dec 29, 2024
ecf419c
Update distributed_gobreaker_test.go
YoshiyukiMineo Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions v2/distributed_gobreaker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package gobreaker

import (
"context"
"encoding/json"
"errors"
"time"
Expand All @@ -24,8 +23,8 @@ type SharedState struct {

// SharedDataStore stores the shared state of DistributedCircuitBreaker.
type SharedDataStore interface {
GetData(ctx context.Context, name string) ([]byte, error)
SetData(ctx context.Context, name string, data []byte) error
GetData(name string) ([]byte, error)
SetData(name string, data []byte) error
}

// DistributedCircuitBreaker extends CircuitBreaker with SharedDataStore.
Expand All @@ -35,7 +34,7 @@ type DistributedCircuitBreaker[T any] struct {
}

// NewDistributedCircuitBreaker returns a new DistributedCircuitBreaker.
func NewDistributedCircuitBreaker[T any](ctx context.Context, store SharedDataStore, settings Settings) (*DistributedCircuitBreaker[T], error) {
func NewDistributedCircuitBreaker[T any](store SharedDataStore, settings Settings) (*DistributedCircuitBreaker[T], error) {
if store == nil {
return nil, ErrNoSharedStore
}
Expand All @@ -45,9 +44,9 @@ func NewDistributedCircuitBreaker[T any](ctx context.Context, store SharedDataSt
store: store,
}

_, err := dcb.getSharedState(ctx)
_, err := dcb.getSharedState()
if err == ErrNoSharedState {
err = dcb.setSharedState(ctx, dcb.extract())
err = dcb.setSharedState(dcb.extract())
}
if err != nil {
return nil, err
Expand All @@ -60,13 +59,13 @@ func (dcb *DistributedCircuitBreaker[T]) sharedStateKey() string {
return "gobreaker:" + dcb.name
}

func (dcb *DistributedCircuitBreaker[T]) getSharedState(ctx context.Context) (SharedState, error) {
func (dcb *DistributedCircuitBreaker[T]) getSharedState() (SharedState, error) {
var state SharedState
if dcb.store == nil {
return state, ErrNoSharedStore
}

data, err := dcb.store.GetData(ctx, dcb.sharedStateKey())
data, err := dcb.store.GetData(dcb.sharedStateKey())
if len(data) == 0 {
return state, ErrNoSharedState
} else if err != nil {
Expand All @@ -77,7 +76,7 @@ func (dcb *DistributedCircuitBreaker[T]) getSharedState(ctx context.Context) (Sh
return state, err
}

func (dcb *DistributedCircuitBreaker[T]) setSharedState(ctx context.Context, state SharedState) error {
func (dcb *DistributedCircuitBreaker[T]) setSharedState(state SharedState) error {
if dcb.store == nil {
return ErrNoSharedStore
}
Expand All @@ -87,7 +86,7 @@ func (dcb *DistributedCircuitBreaker[T]) setSharedState(ctx context.Context, sta
return err
}

return dcb.store.SetData(ctx, dcb.sharedStateKey(), data)
return dcb.store.SetData(dcb.sharedStateKey(), data)
}

func (dcb *DistributedCircuitBreaker[T]) inject(shared SharedState) {
Expand All @@ -113,8 +112,8 @@ func (dcb *DistributedCircuitBreaker[T]) extract() SharedState {
}

// State returns the State of DistributedCircuitBreaker.
func (dcb *DistributedCircuitBreaker[T]) State(ctx context.Context) (State, error) {
shared, err := dcb.getSharedState(ctx)
func (dcb *DistributedCircuitBreaker[T]) State() (State, error) {
shared, err := dcb.getSharedState()
if err != nil {
return shared.State, err
}
Expand All @@ -123,13 +122,13 @@ func (dcb *DistributedCircuitBreaker[T]) State(ctx context.Context) (State, erro
state := dcb.CircuitBreaker.State()
shared = dcb.extract()

err = dcb.setSharedState(ctx, shared)
err = dcb.setSharedState(shared)
return state, err
}

// Execute runs the given request if the DistributedCircuitBreaker accepts it.
func (dcb *DistributedCircuitBreaker[T]) Execute(ctx context.Context, req func() (T, error)) (T, error) {
shared, err := dcb.getSharedState(ctx)
func (dcb *DistributedCircuitBreaker[T]) Execute(req func() (T, error)) (T, error) {
shared, err := dcb.getSharedState()
if err != nil {
var defaultValue T
return defaultValue, err
Expand All @@ -139,7 +138,7 @@ func (dcb *DistributedCircuitBreaker[T]) Execute(ctx context.Context, req func()
t, e := dcb.CircuitBreaker.Execute(req)
shared = dcb.extract()

err = dcb.setSharedState(ctx, shared)
err = dcb.setSharedState(shared)
if err != nil {
var defaultValue T
return defaultValue, err
Expand Down
Loading
Loading