Skip to content

Commit 25632e1

Browse files
committed
review 1: extract error mesdsage in slog error_payload field + shorthen comment
1 parent a41aa18 commit 25632e1

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

intercept/chatcompletions/base.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"encoding/json"
66
"errors"
7+
"fmt"
78
"net/http"
89
"strings"
910

@@ -183,7 +184,7 @@ func (i *interceptionBase) writeUpstreamError(w http.ResponseWriter, oaiErr *cha
183184

184185
out, err := json.Marshal(oaiErr)
185186
if err != nil {
186-
i.logger.Warn(context.Background(), "failed to marshal upstream error", slog.Error(err), slog.F("error_payload", oaiErr))
187+
i.logger.Warn(context.Background(), "failed to marshal upstream error", slog.Error(err), slog.F("error_payload", fmt.Sprintf("%+v", oaiErr)))
187188
// Response has to match expected format.
188189
_, _ = w.Write([]byte(`{
189190
"error": {

intercept/chatcompletions/streaming.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"bytes"
55
"context"
66
"encoding/json"
7+
"fmt"
78
"net/http"
89
"slices"
910
"strings"
@@ -245,7 +246,7 @@ func (i *StreamingInterception) ProcessRequest(w http.ResponseWriter, r *http.Re
245246
logger.Warn(ctx, "openai stream error", slog.Error(streamErr))
246247
interceptionErr = oaiErr
247248
} else {
248-
logger.Warn(ctx, "unknown stream error encountered", slog.Error(streamErr))
249+
logger.Warn(ctx, "unknown stream error", slog.Error(streamErr))
249250
// Unfortunately, the OpenAI SDK does not support parsing errors received in the stream
250251
// into known types (i.e. [shared.OverloadedError]).
251252
// See https://github.com/openai/openai-go/blob/v2.7.0/packages/ssestream/ssestream.go#L171
@@ -261,7 +262,7 @@ func (i *StreamingInterception) ProcessRequest(w http.ResponseWriter, r *http.Re
261262
if interceptionErr != nil {
262263
payload, err := i.marshalErr(interceptionErr)
263264
if err != nil {
264-
logger.Warn(ctx, "failed to marshal error", slog.Error(err), slog.F("error_payload", interceptionErr))
265+
logger.Warn(ctx, "failed to marshal error", slog.Error(err), slog.F("error_payload", fmt.Sprintf("%+v", interceptionErr)))
265266
} else if err := events.Send(streamCtx, payload); err != nil {
266267
logger.Warn(ctx, "failed to relay error", slog.Error(err), slog.F("payload", payload))
267268
}

intercept/messages/base.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ func (i *interceptionBase) writeUpstreamError(w http.ResponseWriter, antErr *mes
415415

416416
out, err := json.Marshal(antErr)
417417
if err != nil {
418-
i.logger.Warn(context.Background(), "failed to marshal upstream error", slog.Error(err), slog.F("error_payload", antErr))
418+
i.logger.Warn(context.Background(), "failed to marshal upstream error", slog.Error(err), slog.F("error_payload", fmt.Sprintf("%+v", antErr)))
419419
// Response has to match expected format.
420420
// See https://docs.claude.com/en/api/errors#error-shapes.
421421
_, _ = w.Write([]byte(fmt.Sprintf(`{

intercept/messages/streaming.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ newStream:
488488
logger.Warn(ctx, "anthropic stream error", slog.Error(streamErr))
489489
interceptionErr = antErr
490490
} else {
491-
logger.Warn(ctx, "unknown stream error encountered", slog.Error(streamErr))
491+
logger.Warn(ctx, "unknown stream error", slog.Error(streamErr))
492492
// Unfortunately, the Anthropic SDK does not support parsing errors received in the stream
493493
// into known types (i.e. [shared.OverloadedError]).
494494
// See https://github.com/anthropics/anthropic-sdk-go/blob/v1.12.0/packages/ssestream/ssestream.go#L172-L174
@@ -504,7 +504,7 @@ newStream:
504504
if interceptionErr != nil {
505505
payload, err := i.marshal(interceptionErr)
506506
if err != nil {
507-
logger.Warn(ctx, "failed to marshal error", slog.Error(err), slog.F("error_payload", interceptionErr))
507+
logger.Warn(ctx, "failed to marshal error", slog.Error(err), slog.F("error_payload", fmt.Sprintf("%+v", interceptionErr)))
508508
} else if err := events.Send(streamCtx, payload); err != nil {
509509
logger.Warn(ctx, "failed to relay error", slog.Error(err), slog.F("payload", payload))
510510
}

0 commit comments

Comments
 (0)