Skip to content

Improve response handling issues. #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2025
Merged

Improve response handling issues. #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions pkg/epp/handlers/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,14 @@ func (s *Server) Process(srv extProcPb.ExternalProcessor_ProcessServer) error {
resp, err = s.HandleResponseHeaders(ctx, reqCtx, req)
loggerVerbose.Info("Request context after HandleResponseHeaders", "context", reqCtx)
case *extProcPb.ProcessingRequest_ResponseBody:
resp, err = s.HandleResponseBody(ctx, reqCtx, req)
if err == nil && reqCtx.ResponseComplete {
// Don't send a 500 on a response error. Just let the message passthrough and log our error for debugging purposes.
// We assume the body is valid JSON, err messages are not guaranteed to be json, and so capturing and sending a 500 obfuscates the response message.
// using the standard 'err' var will send an immediate error response back to the caller.
var responseErr error
resp, responseErr = s.HandleResponseBody(ctx, reqCtx, req)
if responseErr != nil {
logger.V(logutil.DEFAULT).Error(responseErr, "Failed to process response body", "request", req)
} else if reqCtx.ResponseComplete {
reqCtx.ResponseCompleteTimestamp = time.Now()
metrics.RecordRequestLatencies(ctx, reqCtx.Model, reqCtx.ResolvedTargetModel, reqCtx.RequestReceivedTimestamp, reqCtx.ResponseCompleteTimestamp)
metrics.RecordResponseSizes(reqCtx.Model, reqCtx.ResolvedTargetModel, reqCtx.ResponseSize)
Expand Down
16 changes: 11 additions & 5 deletions pkg/epp/handlers/streamingserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,15 +192,21 @@ func (s *StreamingServer) Process(srv extProcPb.ExternalProcessor_ProcessServer)

// Message is buffered, we can read and decode.
if v.ResponseBody.EndOfStream {
err = decoder.Decode(&responseBody)
if err != nil {
logger.V(logutil.DEFAULT).Error(err, "Error unmarshaling request body")
// Don't send a 500 on a response error. Just let the message passthrough and log our error for debugging purposes.
// We assume the body is valid JSON, err messages are not guaranteed to be json, and so capturing and sending a 500 obfuscates the response message.
// using the standard 'err' var will send an immediate error response back to the caller.
var responseErr error
responseErr = decoder.Decode(&responseBody)
if responseErr != nil {
logger.V(logutil.DEFAULT).Error(responseErr, "Error unmarshaling request body")
}
// Body stream complete. Close the reader pipe.
reader.Close()

reqCtx, err = s.HandleResponseBody(ctx, reqCtx, responseBody)
if err == nil && reqCtx.ResponseComplete {
reqCtx, responseErr = s.HandleResponseBody(ctx, reqCtx, responseBody)
if responseErr != nil {
logger.V(logutil.DEFAULT).Error(responseErr, "Failed to process response body", "request", req)
} else if reqCtx.ResponseComplete {
reqCtx.ResponseCompleteTimestamp = time.Now()
metrics.RecordRequestLatencies(ctx, reqCtx.Model, reqCtx.ResolvedTargetModel, reqCtx.RequestReceivedTimestamp, reqCtx.ResponseCompleteTimestamp)
metrics.RecordResponseSizes(reqCtx.Model, reqCtx.ResolvedTargetModel, reqCtx.ResponseSize)
Expand Down