Address a review comment

Signed-off-by: 🌲 Harry 🌊 John 🏔 <[email protected]>

Author: harry671003

pkg/distributor/distributor.go

@@ -1027,11 +1027,11 @@ func (d *Distributor) MetricsForLabelMatchers(ctx context.Context, from, through
 			if err != nil {
 				return nil, err
 			}
+			if err := queryLimiter.AddDataBytes(resp.Size()); err != nil {
+				return nil, err
+			}
 			ms := ingester_client.FromMetricsForLabelMatchersResponse(resp)
 			for _, m := range ms {
-				if err := queryLimiter.AddDataBytes(resp.Size()); err != nil {
-					return nil, err
-				}
 				if err := queryLimiter.AddSeries(cortexpb.FromMetricsToLabelAdapters(m)); err != nil {
 					return nil, err
 				}
@@ -1058,6 +1058,9 @@ func (d *Distributor) MetricsForLabelMatchersStream(ctx context.Context, from, t
 			defer stream.CloseSend() //nolint:errcheck
 			for {
 				resp, err := stream.Recv()
+				if err := queryLimiter.AddDataBytes(resp.Size()); err != nil {
+					return nil, err
+				}
 
 				if err == io.EOF {
 					break
@@ -1068,9 +1071,6 @@ func (d *Distributor) MetricsForLabelMatchersStream(ctx context.Context, from, t
 				for _, metric := range resp.Metric {
 					m := cortexpb.FromLabelAdaptersToMetricWithCopy(metric.Labels)
 
-					if err := queryLimiter.AddDataBytes(resp.Size()); err != nil {
-						return nil, err
-					}
 					if err := queryLimiter.AddSeries(metric.Labels); err != nil {
 						return nil, err
 					}

pkg/querier/blocks_store_queryable.go

@@ -691,8 +691,7 @@ func (q *blocksStoreQuerier) fetchSeriesFromStores(
 
 			numSeries := len(mySeries)
 			chunkBytes := countChunkBytes(mySeries...)
-			labelBytes := countDataBytes(mySeries...)
-			dataBytes := labelBytes + chunkBytes
+			dataBytes := countDataBytes(mySeries...)
 
 			reqStats.AddFetchedSeries(uint64(numSeries))
 			reqStats.AddFetchedChunkBytes(uint64(chunkBytes))
@@ -1008,7 +1007,7 @@ func countChunkBytes(series ...*storepb.Series) (count int) {
 	return count
 }
 
-// countChunkBytes returns the size of the chunks making up the provided series in bytes
+// countDataBytes returns the combined size of the all the series
 func countDataBytes(series ...*storepb.Series) (count int) {
 	for _, s := range series {
 		count += s.Size()

pkg/util/limiter/query_limiter.go

@@ -102,7 +102,7 @@ func (ql *QueryLimiter) AddChunkBytes(chunkSizeInBytes int) error {
 	return nil
 }
 
-// AddDataBytes adds the input label size in bytes and returns an error if the limit is reached.
+// AddDataBytes adds the queried data bytes and returns an error if the limit is reached.
 func (ql *QueryLimiter) AddDataBytes(dataSizeInBytes int) error {
 	if ql.maxDataBytesPerQuery == 0 {
 		return nil