query-frontend: make POST-request to downstream url for labels and se…

…ries api endpoints

Signed-off-by: Alexander Tunik <[email protected]>

pkg/queryfrontend/labels_codec.go

@@ -83,14 +83,14 @@ func (c labelsCodec) MergeResponse(responses ...queryrange.Response) (queryrange
 			Data:   lbls,
 		}, nil
 	case *ThanosSeriesResponse:
-		seriesData := make([]labelpb.LabelSet, 0)
+		seriesData := make([]labelpb.ZLabelSet, 0)
 
 		// seriesString is used in soring so we don't have to calculate the string of label sets again.
 		seriesString := make([]string, 0)
 		uniqueSeries := make(map[string]struct{})
 		for _, res := range responses {
 			for _, series := range res.(*ThanosSeriesResponse).Data {
-				s := labelpb.LabelsToPromLabels(series.Labels).String()
+				s := series.PromLabels().String()
 				if _, ok := uniqueSeries[s]; !ok {
 					seriesData = append(seriesData, series)
 					seriesString = append(seriesString, s)
@@ -134,7 +134,8 @@ func (c labelsCodec) DecodeRequest(_ context.Context, r *http.Request) (queryran
 }
 
 func (c labelsCodec) EncodeRequest(ctx context.Context, r queryrange.Request) (*http.Request, error) {
-	var u *url.URL
+	var req *http.Request
+	var err error
 	switch thanosReq := r.(type) {
 	case *ThanosLabelsRequest:
 		var params = url.Values{
@@ -145,10 +146,28 @@ func (c labelsCodec) EncodeRequest(ctx context.Context, r queryrange.Request) (*
 		if len(thanosReq.StoreMatchers) > 0 {
 			params[queryv1.StoreMatcherParam] = matchersToStringSlice(thanosReq.StoreMatchers)
 		}
-		u = &url.URL{
-			Path:     thanosReq.Path,
-			RawQuery: params.Encode(),
+
+		if strings.HasPrefix(thanosReq.Path, "/api/v1/label/") {
+			u := &url.URL{
+				Path:     thanosReq.Path,
+				RawQuery: params.Encode(),
+			}
+
+			req = &http.Request{
+				Method:     http.MethodGet,
+				RequestURI: u.String(), // This is what the httpgrpc code looks at.
+				URL:        u,
+				Body:       http.NoBody,
+				Header:     http.Header{},
+			}
+		} else {
+			req, err = http.NewRequest(http.MethodPost, thanosReq.Path, bytes.NewBufferString(params.Encode()))
+			if err != nil {
+				return nil, httpgrpc.Errorf(http.StatusBadRequest, "error creating request: %s", err.Error())
+			}
+			req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 		}
+
 	case *ThanosSeriesRequest:
 		var params = url.Values{
 			"start":                      []string{encodeTime(thanosReq.Start)},
@@ -163,22 +182,17 @@ func (c labelsCodec) EncodeRequest(ctx context.Context, r queryrange.Request) (*
 		if len(thanosReq.StoreMatchers) > 0 {
 			params[queryv1.StoreMatcherParam] = matchersToStringSlice(thanosReq.StoreMatchers)
 		}
-		u = &url.URL{
-			Path:     thanosReq.Path,
-			RawQuery: params.Encode(),
+
+		req, err = http.NewRequest(http.MethodPost, thanosReq.Path, bytes.NewBufferString(params.Encode()))
+		if err != nil {
+			return nil, httpgrpc.Errorf(http.StatusBadRequest, "error creating request: %s", err.Error())
 		}
+		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+
 	default:
 		return nil, httpgrpc.Errorf(http.StatusInternalServerError, "invalid request format")
 	}
 
-	req := &http.Request{
-		Method:     "GET",
-		RequestURI: u.String(), // This is what the httpgrpc code looks at.
-		URL:        u,
-		Body:       http.NoBody,
-		Header:     http.Header{},
-	}
-
 	return req.WithContext(ctx), nil
 }
 

pkg/queryfrontend/labels_codec_test.go

@@ -227,8 +227,8 @@ func TestLabelsCodec_EncodeRequest(t *testing.T) {
 			name: "thanos labels names request",
 			req:  &ThanosLabelsRequest{Start: 123000, End: 456000, Path: "/api/v1/labels"},
 			checkFunc: func(r *http.Request) bool {
-				return r.URL.Query().Get(start) == startTime &&
-					r.URL.Query().Get(end) == endTime &&
+				return r.FormValue(start) == startTime &&
+					r.FormValue(end) == endTime &&
 					r.URL.Path == "/api/v1/labels"
 			},
 		},
@@ -255,8 +255,8 @@ func TestLabelsCodec_EncodeRequest(t *testing.T) {
 			name: "thanos series request with empty matchers",
 			req:  &ThanosSeriesRequest{Start: 123000, End: 456000, Path: "/api/v1/series"},
 			checkFunc: func(r *http.Request) bool {
-				return r.URL.Query().Get(start) == startTime &&
-					r.URL.Query().Get(end) == endTime &&
+				return r.FormValue(start) == startTime &&
+					r.FormValue(end) == endTime &&
 					r.URL.Path == "/api/v1/series"
 			},
 		},
@@ -269,9 +269,9 @@ func TestLabelsCodec_EncodeRequest(t *testing.T) {
 				Matchers: [][]*labels.Matcher{{labels.MustNewMatcher(labels.MatchEqual, "cluster", "test")}},
 			},
 			checkFunc: func(r *http.Request) bool {
-				return r.URL.Query().Get(start) == startTime &&
-					r.URL.Query().Get(end) == endTime &&
-					r.URL.Query().Get(queryv1.MatcherParam) == `{cluster="test"}` &&
+				return r.FormValue(start) == startTime &&
+					r.FormValue(end) == endTime &&
+					r.FormValue(queryv1.MatcherParam) == `{cluster="test"}` &&
 					r.URL.Path == "/api/v1/series"
 			},
 		},
@@ -284,9 +284,9 @@ func TestLabelsCodec_EncodeRequest(t *testing.T) {
 				Dedup: true,
 			},
 			checkFunc: func(r *http.Request) bool {
-				return r.URL.Query().Get(start) == startTime &&
-					r.URL.Query().Get(end) == endTime &&
-					r.URL.Query().Get(queryv1.DedupParam) == "true" &&
+				return r.FormValue(start) == startTime &&
+					r.FormValue(end) == endTime &&
+					r.FormValue(queryv1.DedupParam) == "true" &&
 					r.URL.Path == "/api/v1/series"
 			},
 		},
@@ -315,7 +315,7 @@ func TestLabelsCodec_DecodeResponse(t *testing.T) {
 
 	seriesResponse := &ThanosSeriesResponse{
 		Status: "success",
-		Data:   []labelpb.LabelSet{{Labels: []labelpb.Label{{Name: "foo", Value: "bar"}}}},
+		Data:   []labelpb.ZLabelSet{{Labels: []labelpb.ZLabel{{Name: "foo", Value: "bar"}}}},
 	}
 	seriesData, err := json.Marshal(seriesResponse)
 	testutil.Ok(t, err)

pkg/queryfrontend/response.proto

@@ -30,8 +30,7 @@ message ThanosLabelsResponse {
 
 message ThanosSeriesResponse {
   string Status = 1 [(gogoproto.jsontag) = "status"];
-  // TODO(bwplotka): Experiment with ZLabelSet here.
-  repeated thanos.LabelSet Data = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "data"];
+  repeated thanos.ZLabelSet Data = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "data"];
   string ErrorType = 3 [(gogoproto.jsontag) = "errorType,omitempty"];
   string Error = 4 [(gogoproto.jsontag) = "error,omitempty"];
   repeated ResponseHeader Headers = 5 [(gogoproto.jsontag) = "-"];

pkg/queryfrontend/roundtrip_test.go

@@ -749,7 +749,7 @@ func seriesResults(fail bool) (*int, http.Handler) {
 	var lock sync.Mutex
 	q := ThanosSeriesResponse{
 		Status: "success",
-		Data:   []labelpb.LabelSet{{Labels: []labelpb.Label{{Name: "__name__", Value: "up"}, {Name: "foo", Value: "bar"}}}},
+		Data:   []labelpb.ZLabelSet{{Labels: []labelpb.ZLabel{{Name: "__name__", Value: "up"}, {Name: "foo", Value: "bar"}}}},
 	}
 
 	return &count, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {