rename aibridge -> tracing

pawbana · pawbana · commit 1ac08c13fe8f · 2025-12-03T11:40:39.000Z
diff --git a/intercept_anthropic_messages_base.go b/intercept_anthropic_messages_base.go
@@ -14,8 +14,8 @@ import (
 	"github.com/anthropics/anthropic-sdk-go/option"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/credentials"
-	aibtrace "github.com/coder/aibridge/aibtrace"
 	"github.com/coder/aibridge/mcp"
+	"github.com/coder/aibridge/tracing"
 	"github.com/google/uuid"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
@@ -65,13 +65,13 @@ func (i *AnthropicMessagesInterceptionBase) Model() string {
 
 func (s *AnthropicMessagesInterceptionBase) baseTraceAttributes(r *http.Request, streaming bool) []attribute.KeyValue {
 	return []attribute.KeyValue{
-		attribute.String(aibtrace.RequestPath, r.URL.Path),
-		attribute.String(aibtrace.InterceptionID, s.id.String()),
-		attribute.String(aibtrace.InitiatorID, actorFromContext(r.Context()).id),
-		attribute.String(aibtrace.Provider, ProviderAnthropic),
-		attribute.String(aibtrace.Model, s.Model()),
-		attribute.Bool(aibtrace.Streaming, streaming),
-		attribute.Bool(aibtrace.IsBedrock, s.bedrockCfg != nil),
+		attribute.String(tracing.RequestPath, r.URL.Path),
+		attribute.String(tracing.InterceptionID, s.id.String()),
+		attribute.String(tracing.InitiatorID, actorFromContext(r.Context()).id),
+		attribute.String(tracing.Provider, ProviderAnthropic),
+		attribute.String(tracing.Model, s.Model()),
+		attribute.Bool(tracing.Streaming, streaming),
+		attribute.Bool(tracing.IsBedrock, s.bedrockCfg != nil),
 	}
 }
 
diff --git a/intercept_anthropic_messages_blocking.go b/intercept_anthropic_messages_blocking.go
@@ -14,8 +14,8 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 
-	aibtrace "github.com/coder/aibridge/aibtrace"
 	"github.com/coder/aibridge/mcp"
+	"github.com/coder/aibridge/tracing"
 
 	"cdr.dev/slog"
 )
@@ -53,8 +53,8 @@ func (i *AnthropicMessagesBlockingInterception) ProcessRequest(w http.ResponseWr
 		return fmt.Errorf("developer error: req is nil")
 	}
 
-	ctx, span := i.tracer.Start(r.Context(), "Intercept.ProcessRequest", trace.WithAttributes(aibtrace.InterceptionAttributesFromContext(r.Context())...))
-	defer aibtrace.EndSpanErr(span, &outErr)
+	ctx, span := i.tracer.Start(r.Context(), "Intercept.ProcessRequest", trace.WithAttributes(tracing.InterceptionAttributesFromContext(r.Context())...))
+	defer tracing.EndSpanErr(span, &outErr)
 
 	i.injectTools()
 
@@ -298,8 +298,8 @@ func (i *AnthropicMessagesBlockingInterception) ProcessRequest(w http.ResponseWr
 }
 
 func (i *AnthropicMessagesBlockingInterception) traceNewMessage(ctx context.Context, svc anthropic.MessageService, msgParams anthropic.MessageNewParams) (_ *anthropic.Message, outErr error) {
-	ctx, span := i.tracer.Start(ctx, "Intercept.ProcessRequest.Upstream", trace.WithAttributes(aibtrace.InterceptionAttributesFromContext(ctx)...))
-	defer aibtrace.EndSpanErr(span, &outErr)
+	ctx, span := i.tracer.Start(ctx, "Intercept.ProcessRequest.Upstream", trace.WithAttributes(tracing.InterceptionAttributesFromContext(ctx)...))
+	defer tracing.EndSpanErr(span, &outErr)
 
 	return svc.New(ctx, msgParams)
 }
diff --git a/intercept_anthropic_messages_streaming.go b/intercept_anthropic_messages_streaming.go
@@ -13,8 +13,8 @@ import (
 	"github.com/anthropics/anthropic-sdk-go"
 	"github.com/anthropics/anthropic-sdk-go/packages/ssestream"
 	"github.com/anthropics/anthropic-sdk-go/shared/constant"
-	aibtrace "github.com/coder/aibridge/aibtrace"
 	"github.com/coder/aibridge/mcp"
+	"github.com/coder/aibridge/tracing"
 	"github.com/google/uuid"
 	mcplib "github.com/mark3labs/mcp-go/mcp"
 	"go.opentelemetry.io/otel/attribute"
@@ -75,8 +75,8 @@ func (i *AnthropicMessagesStreamingInterception) ProcessRequest(w http.ResponseW
 		return fmt.Errorf("developer error: req is nil")
 	}
 
-	ctx, span := i.tracer.Start(r.Context(), "Intercept.ProcessRequest", trace.WithAttributes(aibtrace.InterceptionAttributesFromContext(r.Context())...))
-	defer aibtrace.EndSpanErr(span, &outErr)
+	ctx, span := i.tracer.Start(r.Context(), "Intercept.ProcessRequest", trace.WithAttributes(tracing.InterceptionAttributesFromContext(r.Context())...))
+	defer tracing.EndSpanErr(span, &outErr)
 
 	// Allow us to interrupt watch via cancel.
 	ctx, cancel := context.WithCancel(ctx)
@@ -523,7 +523,7 @@ func (s *AnthropicMessagesStreamingInterception) encodeForStream(payload []byte,
 }
 
 func (s *AnthropicMessagesStreamingInterception) traceNewStreaming(ctx context.Context, svc anthropic.MessageService, messages anthropic.MessageNewParams) *ssestream.Stream[anthropic.MessageStreamEventUnion] {
-	_, span := s.tracer.Start(ctx, "Intercept.ProcessRequest.Upstream", trace.WithAttributes(aibtrace.InterceptionAttributesFromContext(ctx)...))
+	_, span := s.tracer.Start(ctx, "Intercept.ProcessRequest.Upstream", trace.WithAttributes(tracing.InterceptionAttributesFromContext(ctx)...))
 	defer span.End()
 
 	return svc.NewStreaming(ctx, messages)
diff --git a/intercept_openai_chat_base.go b/intercept_openai_chat_base.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	aibtrace "github.com/coder/aibridge/aibtrace"
 	"github.com/coder/aibridge/mcp"
+	"github.com/coder/aibridge/tracing"
 	"github.com/google/uuid"
 	"github.com/openai/openai-go/v2"
 	"github.com/openai/openai-go/v2/option"
@@ -48,12 +48,12 @@ func (i *OpenAIChatInterceptionBase) Setup(logger slog.Logger, recorder Recorder
 
 func (s *OpenAIChatInterceptionBase) baseTraceAttributes(r *http.Request, streaming bool) []attribute.KeyValue {
 	return []attribute.KeyValue{
-		attribute.String(aibtrace.RequestPath, r.URL.Path),
-		attribute.String(aibtrace.InterceptionID, s.id.String()),
-		attribute.String(aibtrace.InitiatorID, actorFromContext(r.Context()).id),
-		attribute.String(aibtrace.Provider, ProviderOpenAI),
-		attribute.String(aibtrace.Model, s.Model()),
-		attribute.Bool(aibtrace.Streaming, streaming),
+		attribute.String(tracing.RequestPath, r.URL.Path),
+		attribute.String(tracing.InterceptionID, s.id.String()),
+		attribute.String(tracing.InitiatorID, actorFromContext(r.Context()).id),
+		attribute.String(tracing.Provider, ProviderOpenAI),
+		attribute.String(tracing.Model, s.Model()),
+		attribute.Bool(tracing.Streaming, streaming),
 	}
 }
 
diff --git a/intercept_openai_chat_blocking.go b/intercept_openai_chat_blocking.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	aibtrace "github.com/coder/aibridge/aibtrace"
 	"github.com/coder/aibridge/mcp"
+	"github.com/coder/aibridge/tracing"
 	"github.com/google/uuid"
 	"github.com/openai/openai-go/v2"
 	"github.com/openai/openai-go/v2/option"
@@ -52,8 +52,8 @@ func (i *OpenAIBlockingChatInterception) ProcessRequest(w http.ResponseWriter, r
 		return fmt.Errorf("developer error: req is nil")
 	}
 
-	ctx, span := i.tracer.Start(r.Context(), "Intercept.ProcessRequest", trace.WithAttributes(aibtrace.InterceptionAttributesFromContext(r.Context())...))
-	defer aibtrace.EndSpanErr(span, &outErr)
+	ctx, span := i.tracer.Start(r.Context(), "Intercept.ProcessRequest", trace.WithAttributes(tracing.InterceptionAttributesFromContext(r.Context())...))
+	defer tracing.EndSpanErr(span, &outErr)
 
 	svc := i.newCompletionsService(i.baseURL, i.key)
 	logger := i.logger.With(slog.F("model", i.req.Model))
@@ -233,8 +233,8 @@ func (i *OpenAIBlockingChatInterception) ProcessRequest(w http.ResponseWriter, r
 }
 
 func (i *OpenAIBlockingChatInterception) traceChatCompletionsNew(ctx context.Context, svc openai.ChatCompletionService, opts []option.RequestOption) (_ *openai.ChatCompletion, outErr error) {
-	ctx, span := i.tracer.Start(ctx, "Intercept.ProcessRequest.Upstream", trace.WithAttributes(aibtrace.InterceptionAttributesFromContext(ctx)...))
-	defer aibtrace.EndSpanErr(span, &outErr)
+	ctx, span := i.tracer.Start(ctx, "Intercept.ProcessRequest.Upstream", trace.WithAttributes(tracing.InterceptionAttributesFromContext(ctx)...))
+	defer tracing.EndSpanErr(span, &outErr)
 
 	return svc.New(ctx, i.req.ChatCompletionNewParams, opts...)
 }
diff --git a/intercept_openai_chat_streaming.go b/intercept_openai_chat_streaming.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	aibtrace "github.com/coder/aibridge/aibtrace"
 	"github.com/coder/aibridge/mcp"
+	"github.com/coder/aibridge/tracing"
 	"github.com/google/uuid"
 	"github.com/openai/openai-go/v2"
 	"github.com/openai/openai-go/v2/packages/ssestream"
@@ -67,8 +67,8 @@ func (i *OpenAIStreamingChatInterception) ProcessRequest(w http.ResponseWriter,
 		return fmt.Errorf("developer error: req is nil")
 	}
 
-	ctx, span := i.tracer.Start(r.Context(), "Intercept.ProcessRequest", trace.WithAttributes(aibtrace.InterceptionAttributesFromContext(r.Context())...))
-	defer aibtrace.EndSpanErr(span, &outErr)
+	ctx, span := i.tracer.Start(r.Context(), "Intercept.ProcessRequest", trace.WithAttributes(tracing.InterceptionAttributesFromContext(r.Context())...))
+	defer tracing.EndSpanErr(span, &outErr)
 
 	// Include token usage.
 	i.req.StreamOptions.IncludeUsage = openai.Bool(true)
@@ -347,7 +347,7 @@ func (i *OpenAIStreamingChatInterception) encodeForStream(payload []byte) []byte
 }
 
 func (i *OpenAIStreamingChatInterception) traceNewStreaming(ctx context.Context, svc openai.ChatCompletionService) *ssestream.Stream[openai.ChatCompletionChunk] {
-	_, span := i.tracer.Start(ctx, "Intercept.ProcessRequest.Upstream", trace.WithAttributes(aibtrace.InterceptionAttributesFromContext(ctx)...))
+	_, span := i.tracer.Start(ctx, "Intercept.ProcessRequest.Upstream", trace.WithAttributes(tracing.InterceptionAttributesFromContext(ctx)...))
 	defer span.End()
 
 	return svc.NewStreaming(ctx, i.req.ChatCompletionNewParams)
diff --git a/interception.go b/interception.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"cdr.dev/slog"
-	aibtrace "github.com/coder/aibridge/aibtrace"
 	"github.com/coder/aibridge/mcp"
+	"github.com/coder/aibridge/tracing"
 	"github.com/google/uuid"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
@@ -69,7 +69,7 @@ func newInterceptionProcessor(p Provider, logger slog.Logger, recorder Recorder,
 
 		traceAttrs := interceptor.TraceAttributes(r)
 		span.SetAttributes(traceAttrs...)
-		ctx = aibtrace.WithInterceptionAttributesInContext(ctx, traceAttrs)
+		ctx = tracing.WithInterceptionAttributesInContext(ctx, traceAttrs)
 		r = r.WithContext(ctx)
 
 		// Record usage in the background to not block request flow.
diff --git a/mcp/proxy_streamable_http.go b/mcp/proxy_streamable_http.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"cdr.dev/slog"
-	"github.com/coder/aibridge/aibtrace"
+	"github.com/coder/aibridge/tracing"
 	"github.com/mark3labs/mcp-go/client"
 	"github.com/mark3labs/mcp-go/client/transport"
 	"github.com/mark3labs/mcp-go/mcp"
@@ -60,7 +60,7 @@ func (p *StreamableHTTPServerProxy) Name() string {
 
 func (p *StreamableHTTPServerProxy) Init(ctx context.Context) (outErr error) {
 	ctx, span := p.tracer.Start(ctx, "StreamableHTTPServerProxy.Init", trace.WithAttributes(p.traceAttributes()...))
-	defer aibtrace.EndSpanErr(span, &outErr)
+	defer tracing.EndSpanErr(span, &outErr)
 
 	if err := p.client.Start(ctx); err != nil {
 		return fmt.Errorf("start client: %w", err)
@@ -134,7 +134,7 @@ func (p *StreamableHTTPServerProxy) CallTool(ctx context.Context, name string, i
 
 func (p *StreamableHTTPServerProxy) fetchTools(ctx context.Context) (_ map[string]*Tool, outErr error) {
 	ctx, span := p.tracer.Start(ctx, "StreamableHTTPServerProxy.Init.fetchTools", trace.WithAttributes(p.traceAttributes()...))
-	defer aibtrace.EndSpanErr(span, &outErr)
+	defer tracing.EndSpanErr(span, &outErr)
 
 	tools, err := p.client.ListTools(ctx, mcp.ListToolsRequest{})
 	if err != nil {
@@ -156,7 +156,7 @@ func (p *StreamableHTTPServerProxy) fetchTools(ctx context.Context) (_ map[strin
 			Logger:      p.logger,
 		}
 	}
-	span.SetAttributes(append(p.traceAttributes(), attribute.Int(aibtrace.MCPToolCount, len(out)))...)
+	span.SetAttributes(append(p.traceAttributes(), attribute.Int(tracing.MCPToolCount, len(out)))...)
 	return out, nil
 }
 
@@ -172,8 +172,8 @@ func (p *StreamableHTTPServerProxy) Shutdown(ctx context.Context) error {
 
 func (p *StreamableHTTPServerProxy) traceAttributes() []attribute.KeyValue {
 	return []attribute.KeyValue{
-		attribute.String(aibtrace.MCPProxyName, p.Name()),
-		attribute.String(aibtrace.MCPServerName, p.serverName),
-		attribute.String(aibtrace.MCPServerURL, p.serverURL),
+		attribute.String(tracing.MCPProxyName, p.Name()),
+		attribute.String(tracing.MCPServerName, p.serverName),
+		attribute.String(tracing.MCPServerURL, p.serverURL),
 	}
 }
diff --git a/mcp/server_proxy_manager.go b/mcp/server_proxy_manager.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/coder/aibridge/aibtrace"
+	"github.com/coder/aibridge/tracing"
 	"github.com/coder/aibridge/utils"
 	"github.com/mark3labs/mcp-go/mcp"
 	"go.opentelemetry.io/otel/trace"
@@ -50,7 +50,7 @@ func (s *ServerProxyManager) addTools(tools []*Tool) {
 // Init concurrently initializes all of its [ServerProxier]s.
 func (s *ServerProxyManager) Init(ctx context.Context) (outErr error) {
 	ctx, span := s.tracer.Start(ctx, "ServerProxyManager.Init")
-	defer aibtrace.EndSpanErr(span, &outErr)
+	defer tracing.EndSpanErr(span, &outErr)
 
 	cg := utils.NewConcurrentGroup()
 	for _, proxy := range s.proxiers {
diff --git a/mcp/tool.go b/mcp/tool.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"cdr.dev/slog"
-	"github.com/coder/aibridge/aibtrace"
+	"github.com/coder/aibridge/tracing"
 	"github.com/mark3labs/mcp-go/mcp"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
@@ -49,10 +49,10 @@ func (t *Tool) Call(ctx context.Context, tracer trace.Tracer, input any) (_ *mcp
 	}
 
 	spanAttrs := append(
-		aibtrace.InterceptionAttributesFromContext(ctx),
-		attribute.String(aibtrace.MCPToolName, t.Name),
-		attribute.String(aibtrace.MCPServerName, t.ServerName),
-		attribute.String(aibtrace.MCPServerURL, t.ServerURL),
+		tracing.InterceptionAttributesFromContext(ctx),
+		attribute.String(tracing.MCPToolName, t.Name),
+		attribute.String(tracing.MCPServerName, t.ServerName),
+		attribute.String(tracing.MCPServerURL, t.ServerURL),
 	)
 	inputJson, err := json.Marshal(input)
 	if err != nil {
@@ -62,11 +62,11 @@ func (t *Tool) Call(ctx context.Context, tracer trace.Tracer, input any) (_ *mcp
 		if len(strJson) > maxSpanInputAttrLen {
 			strJson = strJson[:100]
 		}
-		spanAttrs = append(spanAttrs, attribute.String(aibtrace.MCPInput, strJson))
+		spanAttrs = append(spanAttrs, attribute.String(tracing.MCPInput, strJson))
 	}
 
 	ctx, span := tracer.Start(ctx, "Intercept.ProcessRequest.ToolCall", trace.WithAttributes(spanAttrs...))
-	defer aibtrace.EndSpanErr(span, &outErr)
+	defer tracing.EndSpanErr(span, &outErr)
 
 	return t.Client.CallTool(ctx, mcp.CallToolRequest{
 		Params: mcp.CallToolParams{
diff --git a/passthrough.go b/passthrough.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"cdr.dev/slog"
-	"github.com/coder/aibridge/aibtrace"
+	"github.com/coder/aibridge/tracing"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 )
@@ -22,8 +22,8 @@ func newPassthroughRouter(provider Provider, logger slog.Logger, metrics *Metric
 		}
 
 		ctx, span := tracer.Start(r.Context(), "Passthrough", trace.WithAttributes(
-			attribute.String(aibtrace.PassthroughURL, r.URL.Path),
-			attribute.String(aibtrace.PassthroughMethod, r.Method),
+			attribute.String(tracing.PassthroughURL, r.URL.Path),
+			attribute.String(tracing.PassthroughMethod, r.Method),
 		))
 		defer span.End()
 
diff --git a/provider_anthropic.go b/provider_anthropic.go
@@ -11,7 +11,7 @@ import (
 	"github.com/anthropics/anthropic-sdk-go"
 	"github.com/anthropics/anthropic-sdk-go/shared"
 	"github.com/anthropics/anthropic-sdk-go/shared/constant"
-	aibtrace "github.com/coder/aibridge/aibtrace"
+	"github.com/coder/aibridge/tracing"
 	"github.com/google/uuid"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
@@ -64,7 +64,7 @@ func (p *AnthropicProvider) PassthroughRoutes() []string {
 func (p *AnthropicProvider) CreateInterceptor(tracer trace.Tracer, w http.ResponseWriter, r *http.Request) (_ Interceptor, outErr error) {
 	id := uuid.New()
 	_, span := tracer.Start(r.Context(), "Intercept.CreateInterceptor")
-	defer aibtrace.EndSpanErr(span, &outErr)
+	defer tracing.EndSpanErr(span, &outErr)
 
 	payload, err := io.ReadAll(r.Body)
 	if err != nil {
diff --git a/provider_openai.go b/provider_openai.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"os"
 
-	aibtrace "github.com/coder/aibridge/aibtrace"
+	"github.com/coder/aibridge/tracing"
 	"github.com/google/uuid"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
@@ -65,7 +65,7 @@ func (p *OpenAIProvider) CreateInterceptor(tracer trace.Tracer, w http.ResponseW
 	id := uuid.New()
 
 	_, span := tracer.Start(r.Context(), "Intercept.CreateInterceptor")
-	defer aibtrace.EndSpanErr(span, &outErr)
+	defer tracing.EndSpanErr(span, &outErr)
 
 	payload, err := io.ReadAll(r.Body)
 	if err != nil {
diff --git a/recorder.go b/recorder.go
diff --git a/trace_integration_test.go b/trace_integration_test.go
diff --git a/tracing/tracing.go b/tracing/tracing.go

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ import (`
`14`	`14`	`"go.opentelemetry.io/otel/attribute"`
`15`	`15`	`"go.opentelemetry.io/otel/trace"`
`16`	`16`
`17`		`- aibtrace "github.com/coder/aibridge/aibtrace"`
`18`	`17`	`"github.com/coder/aibridge/mcp"`
	`18`	`+ "github.com/coder/aibridge/tracing"`
`19`	`19`
`20`	`20`	`"cdr.dev/slog"`
`21`	`21`	`)`
`@@ -53,8 +53,8 @@ func (i *AnthropicMessagesBlockingInterception) ProcessRequest(w http.ResponseWr`
`53`	`53`	`return fmt.Errorf("developer error: req is nil")`
`54`	`54`	`}`
`55`	`55`
`56`		`- ctx, span := i.tracer.Start(r.Context(), "Intercept.ProcessRequest", trace.WithAttributes(aibtrace.InterceptionAttributesFromContext(r.Context())...))`
`57`		`- defer aibtrace.EndSpanErr(span, &outErr)`
	`56`	`+ ctx, span := i.tracer.Start(r.Context(), "Intercept.ProcessRequest", trace.WithAttributes(tracing.InterceptionAttributesFromContext(r.Context())...))`
	`57`	`+ defer tracing.EndSpanErr(span, &outErr)`
`58`	`58`
`59`	`59`	`i.injectTools()`
`60`	`60`
`@@ -298,8 +298,8 @@ func (i *AnthropicMessagesBlockingInterception) ProcessRequest(w http.ResponseWr`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`func (i AnthropicMessagesBlockingInterception) traceNewMessage(ctx context.Context, svc anthropic.MessageService, msgParams anthropic.MessageNewParams) (_ anthropic.Message, outErr error) {`
`301`		`- ctx, span := i.tracer.Start(ctx, "Intercept.ProcessRequest.Upstream", trace.WithAttributes(aibtrace.InterceptionAttributesFromContext(ctx)...))`
`302`		`- defer aibtrace.EndSpanErr(span, &outErr)`
	`301`	`+ ctx, span := i.tracer.Start(ctx, "Intercept.ProcessRequest.Upstream", trace.WithAttributes(tracing.InterceptionAttributesFromContext(ctx)...))`
	`302`	`+ defer tracing.EndSpanErr(span, &outErr)`
`303`	`303`
`304`	`304`	`return svc.New(ctx, msgParams)`
`305`	`305`	`}`