Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 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
6d98675
Merge branch 'main' into kacpersaw/aibridge-circuit-breaker
kacpersaw Jan 7, 2026
24784c7
Apply review suggestions
kacpersaw Jan 7, 2026
44cfa79
Fix test
kacpersaw Jan 7, 2026
b92ff62
Add TestCircuitBreaker_HalfOpenMaxRequests test and add Retry-After h…
kacpersaw Jan 8, 2026
8dd5622
Apply review suggestions
kacpersaw Jan 13, 2026
ec19ad9
Apply review suggestions
kacpersaw Jan 14, 2026
5461d44
Update provider/anthropic.go
kacpersaw Jan 15, 2026
9ac8a1e
Merge remote-tracking branch 'origin/main' into kacpersaw/aibridge-ci…
kacpersaw Jan 15, 2026
49d199e
Fix tests
kacpersaw Jan 15, 2026
2d09b79
Fix fmt
kacpersaw Jan 15, 2026
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
50 changes: 41 additions & 9 deletions bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ import (
"time"

"cdr.dev/slog/v3"
"github.com/coder/aibridge/circuitbreaker"
aibcontext "github.com/coder/aibridge/context"
"github.com/coder/aibridge/mcp"
"github.com/coder/aibridge/metrics"
"github.com/coder/aibridge/provider"
"github.com/coder/aibridge/recorder"
"github.com/coder/aibridge/tracing"
"github.com/hashicorp/go-multierror"
"github.com/sony/gobreaker/v2"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/trace"

"github.com/hashicorp/go-multierror"
)

// RequestBridge is an [http.Handler] which is capable of masquerading as AI providers' APIs;
Expand Down Expand Up @@ -59,22 +60,53 @@ const recordingTimeout = time.Second * 5
// A [intercept.Recorder] is also required to record prompt, tool, and token use.
//
// mcpProxy will be closed when the [RequestBridge] is closed.
//
// Circuit breaker configuration is obtained from each provider's CircuitBreakerConfig() method.
// Providers returning nil will not have circuit breaker protection.
func NewRequestBridge(ctx context.Context, providers []provider.Provider, rec recorder.Recorder, mcpProxy mcp.ServerProxier, logger slog.Logger, m *metrics.Metrics, tracer trace.Tracer) (*RequestBridge, error) {
mux := http.NewServeMux()

for _, provider := range providers {
for _, prov := range providers {
// Create per-provider circuit breaker if configured
cfg := prov.CircuitBreakerConfig()
providerName := prov.Name()
onChange := func(endpoint string, from, to gobreaker.State) {
logger.Info(context.Background(), "circuit breaker state change",
slog.F("provider", providerName),
slog.F("endpoint", endpoint),
slog.F("from", from.String()),
slog.F("to", to.String()),
)
if m != nil {
m.CircuitBreakerState.WithLabelValues(providerName, endpoint).Set(circuitbreaker.StateToGaugeValue(to))
if to == gobreaker.StateOpen {
m.CircuitBreakerTrips.WithLabelValues(providerName, endpoint).Inc()
}
}
}
cbs := circuitbreaker.NewProviderCircuitBreakers(providerName, cfg, onChange)

// Add the known provider-specific routes which are bridged (i.e. intercepted and augmented).
for _, path := range provider.BridgedRoutes() {
mux.HandleFunc(path, newInterceptionProcessor(provider, rec, mcpProxy, logger, m, tracer))
for _, path := range prov.BridgedRoutes() {
// Initialize circuit breaker state metric to closed (0) for known routes
if m != nil && cbs != nil {
endpoint := strings.TrimPrefix(path, "/"+providerName)
m.CircuitBreakerState.WithLabelValues(providerName, endpoint).Set(0)
}

handler := newInterceptionProcessor(prov, rec, mcpProxy, logger, m, tracer)
// Wrap with circuit breaker middleware (nil cbs passes through)
wrapped := circuitbreaker.Middleware(cbs, m, logger)(handler)
mux.Handle(path, wrapped)
}

// Any requests which passthrough to this will be reverse-proxied to the upstream.
//
// We have to whitelist the known-safe routes because an API key with elevated privileges (i.e. admin) might be
// configured, so we should just reverse-proxy known-safe routes.
ftr := newPassthroughRouter(provider, logger.Named(fmt.Sprintf("passthrough.%s", provider.Name())), m, tracer)
for _, path := range provider.PassthroughRoutes() {
prefix := fmt.Sprintf("/%s", provider.Name())
ftr := newPassthroughRouter(prov, logger.Named(fmt.Sprintf("passthrough.%s", prov.Name())), m, tracer)
for _, path := range prov.PassthroughRoutes() {
prefix := fmt.Sprintf("/%s", prov.Name())
route := fmt.Sprintf("%s%s", prefix, path)
mux.HandleFunc(route, http.StripPrefix(prefix, ftr).ServeHTTP)
}
Expand All @@ -100,7 +132,7 @@ func NewRequestBridge(ctx context.Context, providers []provider.Provider, rec re

// newInterceptionProcessor returns an [http.HandlerFunc] which is capable of creating a new interceptor and processing a given request
// using [Provider] p, recording all usage events using [Recorder] rec.
func newInterceptionProcessor(p Provider, rec recorder.Recorder, mcpProxy mcp.ServerProxier, logger slog.Logger, m *metrics.Metrics, tracer trace.Tracer) http.HandlerFunc {
func newInterceptionProcessor(p provider.Provider, rec recorder.Recorder, mcpProxy mcp.ServerProxier, logger slog.Logger, m *metrics.Metrics, tracer trace.Tracer) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
ctx, span := tracer.Start(r.Context(), "Intercept")
defer span.End()
Expand Down
Loading