change POST request content to encoded HTTP form format

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

Author: rubywtl

pkg/api/queryapi/query_api.go

@@ -3,7 +3,6 @@ package queryapi
 import (
 	"context"
 	"fmt"
-	"io"
 	"net/http"
 	"time"
 
@@ -111,11 +110,8 @@ func (q *QueryAPI) RangeQueryHandler(r *http.Request) (result apiFuncResult) {
 	endTime := convertMsToTime(end)
 	stepDuration := convertMsToDuration(step)
 
-	byteLP, err := io.ReadAll(r.Body)
 	if q.distributedExecEnabled {
-		if err != nil {
-			return apiFuncResult{nil, &apiError{errorBadData, err}, nil, nil}
-		}
+		byteLP := []byte(r.PostFormValue("plan"))
 		if len(byteLP) != 0 {
 			logicalPlan, err := logicalplan.Unmarshal(byteLP)
 			if err != nil {
@@ -205,10 +201,7 @@ func (q *QueryAPI) InstantQueryHandler(r *http.Request) (result apiFuncResult) {
 	tsTime := convertMsToTime(ts)
 
 	if q.distributedExecEnabled {
-		byteLP, err := io.ReadAll(r.Body)
-		if err != nil {
-			return apiFuncResult{nil, &apiError{errorBadData, err}, nil, nil}
-		}
+		byteLP := []byte(r.PostFormValue("plan"))
 		if len(byteLP) != 0 {
 			logicalPlan, err := logicalplan.Unmarshal(byteLP)
 			if err != nil {

pkg/api/queryapi/query_api_test.go

@@ -1,13 +1,14 @@
 package queryapi
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
+	"strings"
 	"testing"
 	"time"
 
@@ -457,8 +458,13 @@ func Test_Logicalplan_Requests(t *testing.T) {
 	}
 }
 
-func createTestRequest(path string, body []byte) *http.Request {
-	req := httptest.NewRequest(http.MethodPost, path, io.NopCloser(bytes.NewReader(body)))
+func createTestRequest(path string, planBytes []byte) *http.Request {
+	form := url.Values{}
+	form.Set("plan", string(planBytes))
+	req := httptest.NewRequest(http.MethodPost, path, io.NopCloser(strings.NewReader(form.Encode())))
+
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	
 	ctx := context.Background()
 	_, ctx = stats.ContextWithEmptyStats(ctx)
 	return req.WithContext(user.InjectOrgID(ctx, "user1"))

pkg/querier/tripperware/instantquery/instant_query.go

@@ -183,24 +183,27 @@ func (c instantQueryCodec) EncodeRequest(ctx context.Context, r tripperware.Requ
 		}
 	}
 
-	h.Add("Content-Type", "application/json")
+	h.Add("Content-Type", "application/x-www-form-urlencoded")
 
 	isSourceRuler := strings.Contains(h.Get("User-Agent"), tripperware.RulerUserAgent)
 	if !isSourceRuler {
 		// When the source is the Ruler, skip set header
 		tripperware.SetRequestHeaders(h, c.defaultCodecType, c.compression)
 	}
 
-	byteBody, err := c.getSerializedBody(promReq)
+	bodyBytes, err := c.getSerializedBody(promReq)
 	if err != nil {
 		return nil, err
 	}
+	form := url.Values{}
+	form.Set("plan", string(bodyBytes))
+	formEncoded := form.Encode()
 
 	req := &http.Request{
 		Method:     "POST",
 		RequestURI: u.String(), // This is what the httpgrpc code looks at.
 		URL:        u,
-		Body:       io.NopCloser(bytes.NewReader(byteBody)),
+		Body:       io.NopCloser(strings.NewReader(formEncoded)),
 		Header:     h,
 	}
 

pkg/querier/tripperware/instantquery/instant_query_middlewares_test.go

@@ -214,8 +214,7 @@ func TestRoundTripWithAndWithoutDistributedExec(t *testing.T) {
 			require.NoError(t, err)
 
 			// check request body
-			body, err := io.ReadAll(req.Body)
-			require.NoError(t, err)
+			body := []byte(req.PostFormValue("plan"))
 			if tc.expectEmptyBody {
 				require.Empty(t, body)
 			} else {

pkg/querier/tripperware/queryrange/query_range.go

@@ -189,8 +189,7 @@ func (c prometheusCodec) EncodeRequest(ctx context.Context, r tripperware.Reques
 			h.Add(n, v)
 		}
 	}
-
-	h.Add("Content-Type", "application/json")
+	h.Add("Content-Type", "application/x-www-form-urlencoded")
 
 	tripperware.SetRequestHeaders(h, c.defaultCodecType, c.compression)
 
@@ -199,11 +198,15 @@ func (c prometheusCodec) EncodeRequest(ctx context.Context, r tripperware.Reques
 		return nil, err
 	}
 
+	form := url.Values{}
+	form.Set("plan", string(bodyBytes))
+	formEncoded := form.Encode()
+
 	req := &http.Request{
 		Method:     "POST",
 		RequestURI: u.String(), // This is what the httpgrpc code looks at.
 		URL:        u,
-		Body:       io.NopCloser(bytes.NewReader(bodyBytes)),
+		Body:       io.NopCloser(strings.NewReader(formEncoded)),
 		Header:     h,
 	}
 

pkg/querier/tripperware/queryrange/query_range_middlewares_test.go

@@ -233,8 +233,7 @@ func TestRoundTripWithAndWithoutDistributedExec(t *testing.T) {
 			require.NoError(t, err)
 
 			// check request body
-			body, err := io.ReadAll(req.Body)
-			require.NoError(t, err)
+			body := []byte(req.PostFormValue("plan"))
 			if tc.expectEmptyBody {
 				require.Empty(t, body)
 			} else {