refactor: chenge constructors

Author: evgeniy-scherbina

intercept/chatcompletions/blocking.go

@@ -36,15 +36,17 @@ func NewBlockingInterceptor(
 	clientHeaders http.Header,
 	authHeaderName string,
 	tracer trace.Tracer,
+	cred intercept.CredentialFields,
 ) *BlockingInterception {
 	return &BlockingInterception{interceptionBase: interceptionBase{
-		id:             id,
-		providerName:   providerName,
-		req:            req,
-		cfg:            cfg,
-		clientHeaders:  clientHeaders,
-		authHeaderName: authHeaderName,
-		tracer:         tracer,
+		id:               id,
+		providerName:     providerName,
+		req:              req,
+		cfg:              cfg,
+		clientHeaders:    clientHeaders,
+		authHeaderName:   authHeaderName,
+		tracer:           tracer,
+		CredentialFields: cred,
 	}}
 }
 

intercept/chatcompletions/streaming.go

@@ -41,15 +41,17 @@ func NewStreamingInterceptor(
 	clientHeaders http.Header,
 	authHeaderName string,
 	tracer trace.Tracer,
+	cred intercept.CredentialFields,
 ) *StreamingInterception {
 	return &StreamingInterception{interceptionBase: interceptionBase{
-		id:             id,
-		providerName:   providerName,
-		req:            req,
-		cfg:            cfg,
-		clientHeaders:  clientHeaders,
-		authHeaderName: authHeaderName,
-		tracer:         tracer,
+		id:               id,
+		providerName:     providerName,
+		req:              req,
+		cfg:              cfg,
+		clientHeaders:    clientHeaders,
+		authHeaderName:   authHeaderName,
+		tracer:           tracer,
+		CredentialFields: cred,
 	}}
 }
 

intercept/chatcompletions/streaming_test.go

@@ -86,7 +86,7 @@ func TestStreamingInterception_RelaysUpstreamErrorToClient(t *testing.T) {
 			httpReq := httptest.NewRequest(http.MethodPost, "/chat/completions", nil)
 
 			tracer := otel.Tracer("test")
-			interceptor := NewStreamingInterceptor(uuid.New(), req, config.ProviderOpenAI, cfg, httpReq.Header, "Authorization", tracer)
+			interceptor := NewStreamingInterceptor(uuid.New(), req, config.ProviderOpenAI, cfg, httpReq.Header, "Authorization", tracer, intercept.CredentialFields{Kind: intercept.CredentialKindCentralized})
 
 			logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: false}).Leveled(slog.LevelDebug)
 			interceptor.Setup(logger, &testutil.MockRecorder{}, nil)

intercept/credential.go

@@ -18,18 +18,14 @@ func MaskCredential(secret string) string {
 }
 
 // CredentialFields is an embeddable helper that implements the
-// SetCredential, CredentialKind, and CredentialHint methods of the
-// Interceptor interface.
+// CredentialKind and CredentialHint methods of the Interceptor
+// interface. Pass it as a constructor argument when creating
+// interceptors.
 type CredentialFields struct {
 	Kind string
 	Hint string
 }
 
-func (c *CredentialFields) SetCredential(kind, hint string) {
-	c.Kind = kind
-	c.Hint = hint
-}
-
 func (c *CredentialFields) CredentialKind() string {
 	return c.Kind
 }

intercept/interceptor.go

@@ -25,9 +25,6 @@ type Interceptor interface {
 	Streaming() bool
 	// TraceAttributes returns tracing attributes for this [Interceptor]
 	TraceAttributes(*http.Request) []attribute.KeyValue
-	// SetCredential sets the credential kind and hint for this
-	// interception. Called by the provider after construction.
-	SetCredential(kind, hint string)
 	// CredentialKind returns how the request was authenticated:
 	// centralized, personal_api_key, or subscription.
 	CredentialKind() string

intercept/messages/blocking.go

@@ -37,16 +37,18 @@ func NewBlockingInterceptor(
 	clientHeaders http.Header,
 	authHeaderName string,
 	tracer trace.Tracer,
+	cred intercept.CredentialFields,
 ) *BlockingInterception {
 	return &BlockingInterception{interceptionBase: interceptionBase{
-		id:             id,
-		providerName:   providerName,
-		reqPayload:     reqPayload,
-		cfg:            cfg,
-		bedrockCfg:     bedrockCfg,
-		clientHeaders:  clientHeaders,
-		authHeaderName: authHeaderName,
-		tracer:         tracer,
+		id:               id,
+		providerName:     providerName,
+		reqPayload:       reqPayload,
+		cfg:              cfg,
+		bedrockCfg:       bedrockCfg,
+		clientHeaders:    clientHeaders,
+		authHeaderName:   authHeaderName,
+		tracer:           tracer,
+		CredentialFields: cred,
 	}}
 }
 

intercept/messages/streaming.go

@@ -43,13 +43,15 @@ func NewStreamingInterceptor(
 	clientHeaders http.Header,
 	authHeaderName string,
 	tracer trace.Tracer,
+	cred intercept.CredentialFields,
 ) *StreamingInterception {
 	return &StreamingInterception{interceptionBase: interceptionBase{
-		id:             id,
-		providerName:   providerName,
-		reqPayload:     reqPayload,
-		cfg:            cfg,
-		bedrockCfg:     bedrockCfg,
+		id:               id,
+		providerName:     providerName,
+		reqPayload:       reqPayload,
+		cfg:              cfg,
+		bedrockCfg:       bedrockCfg,
+		CredentialFields: cred,
 		clientHeaders:  clientHeaders,
 		authHeaderName: authHeaderName,
 		tracer:         tracer,

intercept/responses/blocking.go

@@ -33,16 +33,18 @@ func NewBlockingInterceptor(
 	clientHeaders http.Header,
 	authHeaderName string,
 	tracer trace.Tracer,
+	cred intercept.CredentialFields,
 ) *BlockingResponsesInterceptor {
 	return &BlockingResponsesInterceptor{
 		responsesInterceptionBase: responsesInterceptionBase{
-			id:             id,
-			providerName:   providerName,
-			reqPayload:     reqPayload,
-			cfg:            cfg,
-			clientHeaders:  clientHeaders,
-			authHeaderName: authHeaderName,
-			tracer:         tracer,
+			id:               id,
+			providerName:     providerName,
+			reqPayload:       reqPayload,
+			cfg:              cfg,
+			clientHeaders:    clientHeaders,
+			authHeaderName:   authHeaderName,
+			tracer:           tracer,
+			CredentialFields: cred,
 		},
 	}
 }

intercept/responses/streaming.go

@@ -40,16 +40,18 @@ func NewStreamingInterceptor(
 	clientHeaders http.Header,
 	authHeaderName string,
 	tracer trace.Tracer,
+	cred intercept.CredentialFields,
 ) *StreamingResponsesInterceptor {
 	return &StreamingResponsesInterceptor{
 		responsesInterceptionBase: responsesInterceptionBase{
-			id:             id,
-			providerName:   providerName,
-			reqPayload:     reqPayload,
-			cfg:            cfg,
-			clientHeaders:  clientHeaders,
-			authHeaderName: authHeaderName,
-			tracer:         tracer,
+			id:               id,
+			providerName:     providerName,
+			reqPayload:       reqPayload,
+			cfg:              cfg,
+			clientHeaders:    clientHeaders,
+			authHeaderName:   authHeaderName,
+			tracer:           tracer,
+			CredentialFields: cred,
 		},
 	}
 }

provider/anthropic.go

@@ -143,18 +143,19 @@ func (p *Anthropic) CreateInterceptor(w http.ResponseWriter, r *http.Request, tr
 			credKind = intercept.CredentialKindPersonalAPIKey
 		}
 
-		var interceptor intercept.Interceptor
-		if reqPayload.Stream() {
-			interceptor = messages.NewStreamingInterceptor(id, reqPayload, p.Name(), cfg, p.bedrockCfg, r.Header, authHeaderName, tracer)
-		} else {
-			interceptor = messages.NewBlockingInterceptor(id, reqPayload, p.Name(), cfg, p.bedrockCfg, r.Header, authHeaderName, tracer)
-		}
 		// Determine the credential hint from the key actually used.
 		credHint := intercept.MaskCredential(cfg.Key)
 		if cfg.BYOKBearerToken != "" {
 			credHint = intercept.MaskCredential(cfg.BYOKBearerToken)
 		}
-		interceptor.SetCredential(credKind, credHint)
+		cred := intercept.CredentialFields{Kind: credKind, Hint: credHint}
+
+		var interceptor intercept.Interceptor
+		if reqPayload.Stream() {
+			interceptor = messages.NewStreamingInterceptor(id, reqPayload, p.Name(), cfg, p.bedrockCfg, r.Header, authHeaderName, tracer, cred)
+		} else {
+			interceptor = messages.NewBlockingInterceptor(id, reqPayload, p.Name(), cfg, p.bedrockCfg, r.Header, authHeaderName, tracer, cred)
+		}
 		span.SetAttributes(interceptor.TraceAttributes(r)...)
 		return interceptor, nil
 	}