Merge branch 'main' into kacpersaw/aibridge-circuit-breaker

Resolve conflicts:
- Move circuit breaker code to circuitbreaker package
- Update imports to use new package structure (provider/, config/, metrics/, etc.)
- Update integration tests to use new imports

Author: kacpersaw

anthropic_internal_test.go

@@ -2,67 +2,57 @@ package aibridge
 
 import (
 	"context"
-	"time"
+
+	"cdr.dev/slog/v3"
+	"github.com/coder/aibridge/config"
+	aibcontext "github.com/coder/aibridge/context"
+	"github.com/coder/aibridge/metrics"
+	"github.com/coder/aibridge/provider"
+	"github.com/coder/aibridge/recorder"
+	"github.com/prometheus/client_golang/prometheus"
+	"go.opentelemetry.io/otel/trace"
 )
 
-type ToolArgs any
+// Const + Type + function aliases for backwards compatibility.
+const (
+	ProviderAnthropic = config.ProviderAnthropic
+	ProviderOpenAI    = config.ProviderOpenAI
+)
 
-type Metadata map[string]any
+type (
+	Metrics = metrics.Metrics
 
-type InterceptionRecord struct {
-	ID                           string
-	InitiatorID, Provider, Model string
-	Metadata                     Metadata
-	StartedAt                    time.Time
-}
+	Provider = provider.Provider
+
+	InterceptionRecord      = recorder.InterceptionRecord
+	InterceptionRecordEnded = recorder.InterceptionRecordEnded
+	TokenUsageRecord        = recorder.TokenUsageRecord
+	PromptUsageRecord       = recorder.PromptUsageRecord
+	ToolUsageRecord         = recorder.ToolUsageRecord
+	Recorder                = recorder.Recorder
+	Metadata                = recorder.Metadata
+
+	AnthropicConfig  = config.Anthropic
+	AWSBedrockConfig = config.AWSBedrock
+	OpenAIConfig     = config.OpenAI
+)
 
-type InterceptionRecordEnded struct {
-	ID      string
-	EndedAt time.Time
+func AsActor(ctx context.Context, actorID string, metadata recorder.Metadata) context.Context {
+	return aibcontext.AsActor(ctx, actorID, metadata)
 }
 
-type TokenUsageRecord struct {
-	InterceptionID string
-	MsgID          string
-	Input, Output  int64
-	// ExtraTokenTypes holds token types which *may* exist over and above input/output.
-	// These should ultimately get merged into [Metadata], but it's useful to keep these
-	// with their actual type (int64) since [Metadata] is a map[string]any.
-	ExtraTokenTypes map[string]int64
-	Metadata        Metadata
-	CreatedAt       time.Time
+func NewAnthropicProvider(cfg config.Anthropic, bedrockCfg *config.AWSBedrock) provider.Provider {
+	return provider.NewAnthropic(cfg, bedrockCfg)
 }
 
-type PromptUsageRecord struct {
-	InterceptionID string
-	MsgID, Prompt  string
-	Metadata       Metadata
-	CreatedAt      time.Time
+func NewOpenAIProvider(cfg config.OpenAI) provider.Provider {
+	return provider.NewOpenAI(cfg)
 }
 
-type ToolUsageRecord struct {
-	InterceptionID  string
-	MsgID, Tool     string
-	ServerURL       *string
-	Args            ToolArgs
-	Injected        bool
-	InvocationError error
-	Metadata        Metadata
-	CreatedAt       time.Time
+func NewMetrics(reg prometheus.Registerer) *metrics.Metrics {
+	return metrics.NewMetrics(reg)
 }
 
-// Recorder describes all the possible usage information we need to capture during interactions with AI providers.
-// Additionally, it introduces the concept of an "Interception", which includes information about which provider/model was
-// used and by whom. All usage records should reference this Interception by ID.
-type Recorder interface {
-	// RecordInterception records metadata about an interception with an upstream AI provider.
-	RecordInterception(ctx context.Context, req *InterceptionRecord) error
-	// RecordInterceptionEnded records that given interception has completed.
-	RecordInterceptionEnded(ctx context.Context, req *InterceptionRecordEnded) error
-	// RecordTokenUsage records the tokens used in an interception with an upstream AI provider.
-	RecordTokenUsage(ctx context.Context, req *TokenUsageRecord) error
-	// RecordPromptUsage records the prompts used in an interception with an upstream AI provider.
-	RecordPromptUsage(ctx context.Context, req *PromptUsageRecord) error
-	// RecordToolUsage records the tools used in an interception with an upstream AI provider.
-	RecordToolUsage(ctx context.Context, req *ToolUsageRecord) error
+func NewRecorder(logger slog.Logger, tracer trace.Tracer, clientFn func() (Recorder, error)) Recorder {
+	return recorder.NewRecorder(logger, tracer, clientFn)
 }