stop using FromMetricsToLabelAdapters (#5078)

Author: yeya24

pkg/distributor/distributor.go

@@ -1036,11 +1036,11 @@ func (d *Distributor) MetricsForLabelMatchers(ctx context.Context, from, through
 			if err := queryLimiter.AddDataBytes(resp.Size()); err != nil {
 				return nil, err
 			}
-			ms := ingester_client.FromMetricsForLabelMatchersResponse(resp)
-			for _, m := range ms {
-				if err := queryLimiter.AddSeries(cortexpb.FromMetricsToLabelAdapters(m)); err != nil {
+			for _, m := range resp.Metric {
+				if err := queryLimiter.AddSeries(m.Labels); err != nil {
 					return nil, err
 				}
+				m := cortexpb.FromLabelAdaptersToMetric(m.Labels)
 				fingerprint := m.Fingerprint()
 				mutex.Lock()
 				(*metrics)[fingerprint] = m

pkg/querier/tripperware/instantquery/instant_query.go

@@ -17,6 +17,7 @@ import (
 	otlog "github.com/opentracing/opentracing-go/log"
 	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
+	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/timestamp"
 	"github.com/weaveworks/common/httpgrpc"
 	"google.golang.org/grpc/status"
@@ -422,13 +423,13 @@ func decorateWithParamName(err error, field string) error {
 // UnmarshalJSON implements json.Unmarshaler.
 func (s *Sample) UnmarshalJSON(data []byte) error {
 	var sample struct {
-		Metric model.Metric    `json:"metric"`
+		Metric labels.Labels   `json:"metric"`
 		Value  cortexpb.Sample `json:"value"`
 	}
 	if err := json.Unmarshal(data, &sample); err != nil {
 		return err
 	}
-	s.Labels = cortexpb.FromMetricsToLabelAdapters(sample.Metric)
+	s.Labels = cortexpb.FromLabelsToLabelAdapters(sample.Metric)
 	s.Sample = sample.Value
 	return nil
 }

pkg/querier/tripperware/query.go

@@ -17,6 +17,7 @@ import (
 	jsoniter "github.com/json-iterator/go"
 	"github.com/opentracing/opentracing-go"
 	"github.com/prometheus/common/model"
+	"github.com/prometheus/prometheus/model/labels"
 	"github.com/weaveworks/common/httpgrpc"
 
 	"github.com/cortexproject/cortex/pkg/cortexpb"
@@ -111,13 +112,13 @@ func encodeSampleStream(ptr unsafe.Pointer, stream *jsoniter.Stream) {
 // UnmarshalJSON implements json.Unmarshaler.
 func (s *SampleStream) UnmarshalJSON(data []byte) error {
 	var stream struct {
-		Metric model.Metric      `json:"metric"`
+		Metric labels.Labels     `json:"metric"`
 		Values []cortexpb.Sample `json:"values"`
 	}
 	if err := json.Unmarshal(data, &stream); err != nil {
 		return err
 	}
-	s.Labels = cortexpb.FromMetricsToLabelAdapters(stream.Metric)
+	s.Labels = cortexpb.FromLabelsToLabelAdapters(stream.Metric)
 	s.Samples = stream.Values
 	return nil
 }