Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7700a8f
feat: add circuit breaker for upstream provider overload protection
kacpersaw Dec 11, 2025
aad288c
chore: apply make fmt
kacpersaw Dec 12, 2025
47253f1
refactor: use sony/gobreaker for circuit breakers with per-endpoint i…
kacpersaw Dec 16, 2025
8cf2d18
refactor: align CircuitBreakerConfig fields with gobreaker.Settings
kacpersaw Dec 16, 2025
8e44145
refactor: remove CircuitState, use gobreaker.State directly
kacpersaw Dec 16, 2025
7af3bc1
refactor: implement circuit breaker as middleware with per-provider c…
kacpersaw Dec 17, 2025
521df9b
docs: clarify noop behavior when provider not configured
kacpersaw Dec 17, 2025
c85b836
Update go.mod
kacpersaw Dec 17, 2025
e446954
fix: update metrics help text to reflect 0/0.5/1 gauge values
kacpersaw Dec 17, 2025
1d2315e
refactor: add CircuitBreaker interface with NoopCircuitBreaker
kacpersaw Dec 17, 2025
6994f89
refactor: use gobreaker Execute for proper half-open rejection handling
kacpersaw Dec 17, 2025
6a7d578
refactor: remove unused circuitBreakers field and getter from Request…
kacpersaw Dec 17, 2025
b0ff0eb
use per-provider maps for endpoints
kacpersaw Dec 17, 2025
bee7a4d
make fmt
kacpersaw Dec 17, 2025
98c7b7a
use mux.Handle for cb middleware
kacpersaw Dec 17, 2025
7733266
Move CircuitBreakerConfig to the Provider struct
kacpersaw Dec 17, 2025
7c7c85b
Update tests
kacpersaw Dec 17, 2025
8943ef0
default noop func for onChange
kacpersaw Dec 17, 2025
7d2dcb1
create CircuitBreakers per Provider instead of a global one and remov…
kacpersaw Dec 17, 2025
e3438f4
Update bridge.go
kacpersaw Dec 17, 2025
a32f246
fix format
kacpersaw Dec 17, 2025
e929098
Apply review suggestions
kacpersaw Dec 17, 2025
ab08de4
Apply review suggestions and add proper integration tests
kacpersaw Dec 18, 2025
161db92
Add test to check circuit breaker config
kacpersaw Dec 18, 2025
33ea4ae
Remove test
kacpersaw Dec 18, 2025
dbfab23
Remove TestCircuitBreaker_HalfOpenAndRecovery
kacpersaw Dec 18, 2025
2af2875
Apply review suggestions
kacpersaw Dec 23, 2025
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
45 changes: 39 additions & 6 deletions bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ type RequestBridge struct {

mcpProxy mcp.ServerProxier

// circuitBreakers manages circuit breakers for upstream providers.
// When enabled, it protects against cascading failures from upstream rate limits.
circuitBreakers *CircuitBreakerManager

inflightReqs atomic.Int32
inflightWG sync.WaitGroup // For graceful shutdown.

Expand All @@ -49,12 +53,34 @@ var _ http.Handler = &RequestBridge{}
//
// mcpProxy will be closed when the [RequestBridge] is closed.
func NewRequestBridge(ctx context.Context, providers []Provider, recorder Recorder, mcpProxy mcp.ServerProxier, logger slog.Logger, metrics *Metrics, tracer trace.Tracer) (*RequestBridge, error) {
return NewRequestBridgeWithCircuitBreaker(ctx, providers, recorder, mcpProxy, logger, metrics, tracer, DefaultCircuitBreakerConfig())
}

// NewRequestBridgeWithCircuitBreaker creates a new *[RequestBridge] with custom circuit breaker configuration.
// See [NewRequestBridge] for more details.
func NewRequestBridgeWithCircuitBreaker(ctx context.Context, providers []Provider, recorder Recorder, mcpProxy mcp.ServerProxier, logger slog.Logger, metrics *Metrics, tracer trace.Tracer, cbConfig CircuitBreakerConfig) (*RequestBridge, error) {
mux := http.NewServeMux()

// Create circuit breaker manager
cbManager := NewCircuitBreakerManager(cbConfig)

// Set up metrics callback if metrics are provided
if metrics != nil {
cbManager.SetStateChangeCallback(func(provider string, from, to CircuitState) {
metrics.CircuitBreakerState.WithLabelValues(provider).Set(float64(to))
if to == CircuitOpen {
metrics.CircuitBreakerTrips.WithLabelValues(provider).Inc()
}
})
}

for _, provider := range providers {
// Pre-create circuit breaker for this provider
cbManager.GetOrCreate(provider.Name())

// Add the known provider-specific routes which are bridged (i.e. intercepted and augmented).
for _, path := range provider.BridgedRoutes() {
mux.HandleFunc(path, newInterceptionProcessor(provider, recorder, mcpProxy, logger, metrics, tracer))
mux.HandleFunc(path, newInterceptionProcessor(provider, recorder, mcpProxy, logger, metrics, tracer, cbManager))
}

// Any requests which passthrough to this will be reverse-proxied to the upstream.
Expand All @@ -77,11 +103,12 @@ func NewRequestBridge(ctx context.Context, providers []Provider, recorder Record

inflightCtx, cancel := context.WithCancel(context.Background())
return &RequestBridge{
mux: mux,
logger: logger,
mcpProxy: mcpProxy,
inflightCtx: inflightCtx,
inflightCancel: cancel,
mux: mux,
logger: logger,
mcpProxy: mcpProxy,
circuitBreakers: cbManager,
inflightCtx: inflightCtx,
inflightCancel: cancel,

closed: make(chan struct{}, 1),
}, nil
Expand Down Expand Up @@ -153,6 +180,12 @@ func (b *RequestBridge) InflightRequests() int32 {
return b.inflightReqs.Load()
}

// CircuitBreakers returns the circuit breaker manager for this bridge.
// This can be used to query circuit breaker states or configure callbacks.
func (b *RequestBridge) CircuitBreakers() *CircuitBreakerManager {
return b.circuitBreakers
}

// mergeContexts merges two contexts together, so that if either is cancelled
// the returned context is cancelled. The context values will only be used from
// the first context.
Expand Down
Loading