Delete the unnecessary Marshal of processRequestBody (#1127)

Signed-off-by: weihuizhou <[email protected]>

Author: whzghb

pkg/bbr/handlers/request.go

@@ -32,16 +32,16 @@ import (
 const modelHeader = "X-Gateway-Model-Name"
 
 // HandleRequestBody handles request bodies.
-func (s *Server) HandleRequestBody(ctx context.Context, data map[string]any) ([]*eppb.ProcessingResponse, error) {
+func (s *Server) HandleRequestBody(ctx context.Context, requestBodyBytes []byte) ([]*eppb.ProcessingResponse, error) {
 	logger := log.FromContext(ctx)
 	var ret []*eppb.ProcessingResponse
 
-	requestBodyBytes, err := json.Marshal(data)
-	if err != nil {
+	var requestBody map[string]any
+	if err := json.Unmarshal(requestBodyBytes, &requestBody); err != nil {
 		return nil, err
 	}
 
-	modelVal, ok := data["model"]
+	modelVal, ok := requestBody["model"]
 	if !ok {
 		metrics.RecordModelNotInBodyCounter()
 		logger.V(logutil.DEFAULT).Info("Request body does not contain model parameter")

pkg/bbr/handlers/request_test.go

@@ -178,7 +178,8 @@ func TestHandleRequestBody(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			server := &Server{streaming: test.streaming}
-			resp, err := server.HandleRequestBody(ctx, test.body)
+			bodyBytes, _ := json.Marshal(test.body)
+			resp, err := server.HandleRequestBody(ctx, bodyBytes)
 			if err != nil {
 				if !test.wantErr {
 					t.Fatalf("HandleRequestBody returned unexpected error: %v, want %v", err, test.wantErr)

pkg/bbr/handlers/server.go

@@ -18,7 +18,6 @@ package handlers
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"io"
 
@@ -118,29 +117,19 @@ type streamedBody struct {
 func (s *Server) processRequestBody(ctx context.Context, body *extProcPb.HttpBody, streamedBody *streamedBody, logger logr.Logger) ([]*extProcPb.ProcessingResponse, error) {
 	loggerVerbose := logger.V(logutil.VERBOSE)
 
-	var requestBody map[string]any
+	var requestBodyBytes []byte
 	if s.streaming {
 		streamedBody.body = append(streamedBody.body, body.Body...)
 		// In the stream case, we can receive multiple request bodies.
 		if body.EndOfStream {
 			loggerVerbose.Info("Flushing stream buffer")
-			err := json.Unmarshal(streamedBody.body, &requestBody)
-			if err != nil {
-				logger.V(logutil.DEFAULT).Error(err, "Error unmarshaling request body")
-			}
+			requestBodyBytes = streamedBody.body
 		} else {
 			return nil, nil
 		}
 	} else {
-		if err := json.Unmarshal(body.GetBody(), &requestBody); err != nil {
-			return nil, err
-		}
-	}
-
-	requestBodyResp, err := s.HandleRequestBody(ctx, requestBody)
-	if err != nil {
-		return nil, err
+		requestBodyBytes = body.GetBody()
 	}
 
-	return requestBodyResp, nil
+	return s.HandleRequestBody(ctx, requestBodyBytes)
 }