store: fix e2e labelname tests

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>
thanos-io · Aug 30, 2021 · 8f9a57f · 8f9a57f
1 parent 668fa1f
commit 8f9a57f
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 15 deletions.
diff --git a/pkg/promclient/promclient.go b/pkg/promclient/promclient.go
@@ -702,7 +702,7 @@ func (c *Client) SeriesInGRPC(ctx context.Context, base *url.URL, matchers []*la
 	return m.Data, c.get2xxResultWithGRPCErrors(ctx, "/prom_series HTTP[client]", &u, &m)
 }
 
-// LabelNames returns all known label names. It uses gRPC errors.
+// LabelNames returns all known label names constrained by the given matchers. It uses gRPC errors.
 // NOTE: This method is tested in pkg/store/prometheus_test.go against Prometheus.
 func (c *Client) LabelNamesInGRPC(ctx context.Context, base *url.URL, matchers []storepb.LabelMatcher, startTime, endTime int64) ([]string, error) {
 	u := *base

diff --git a/pkg/query/querier.go b/pkg/query/querier.go
@@ -365,7 +365,8 @@ func (q *querier) LabelValues(name string, matchers ...*labels.Matcher) ([]strin
 	return resp.Values, warns, nil
 }
 
-// LabelNames returns all the unique label names present in the block in sorted order.
+// LabelNames returns all the unique label names present in the block in sorted order constrained
+// by the given matchers.
 func (q *querier) LabelNames(matchers ...*labels.Matcher) ([]string, storage.Warnings, error) {
 	span, ctx := tracing.StartSpan(q.ctx, "querier_label_names")
 	defer span.Finish()

diff --git a/pkg/store/multitsdb.go b/pkg/store/multitsdb.go
@@ -269,7 +269,7 @@ func (s *MultiTSDBStore) Series(r *storepb.SeriesRequest, srv storepb.Store_Seri
 
 }
 
-// LabelNames returns all known label names.
+// LabelNames returns all known label names constrained by the matchers.
 func (s *MultiTSDBStore) LabelNames(ctx context.Context, req *storepb.LabelNamesRequest) (*storepb.LabelNamesResponse, error) {
 	span, ctx := tracing.StartSpan(ctx, "multitsdb_label_names")
 	defer span.Finish()

diff --git a/pkg/store/storepb/rpc.pb.go b/pkg/store/storepb/rpc.pb.go
diff --git a/pkg/store/storepb/rpc.proto b/pkg/store/storepb/rpc.proto
@@ -40,8 +40,7 @@ service Store {
   /// This heavily optimizes the resource usage on Querier / Federated Queries.
   rpc Series(SeriesRequest) returns (stream SeriesResponse);
 
-  /// LabelNames returns all label names that is available.
-  /// Currently unimplemented in all Thanos implementations, because Query API does not implement this either.
+  /// LabelNames returns all label names constrained by the given matchers.
   rpc LabelNames(LabelNamesRequest) returns (LabelNamesResponse);
 
   /// LabelValues returns all label values for given label name.

diff --git a/pkg/store/tsdb.go b/pkg/store/tsdb.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"io"
 	"math"
+	"sort"
 
 	"github.com/go-kit/kit/log"
 	"github.com/pkg/errors"
@@ -194,7 +195,7 @@ func (s *TSDBStore) Series(r *storepb.SeriesRequest, srv storepb.Store_SeriesSer
 	return nil
 }
 
-// LabelNames returns all known label names.
+// LabelNames returns all known label names constrained with the given matchers.
 func (s *TSDBStore) LabelNames(ctx context.Context, r *storepb.LabelNamesRequest) (
 	*storepb.LabelNamesResponse, error,
 ) {
@@ -213,6 +214,14 @@ func (s *TSDBStore) LabelNames(ctx context.Context, r *storepb.LabelNamesRequest
 	if err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
 	}
+
+	if len(res) > 0 {
+		for _, lbl := range s.extLset {
+			res = append(res, lbl.Name)
+		}
+		sort.Strings(res)
+	}
+
 	return &storepb.LabelNamesResponse{Names: res}, nil
 }
 

diff --git a/pkg/store/tsdb_test.go b/pkg/store/tsdb_test.go
@@ -233,7 +233,7 @@ func TestTSDBStore_LabelNames(t *testing.T) {
 		{
 			title:         "add one label",
 			labels:        []string{"foo", "foo"},
-			expectedNames: []string{"foo"},
+			expectedNames: []string{"foo", "region"},
 			timestamp:     now.Unix(),
 			start: func() int64 {
 				return timestamp.FromTime(minTime)
@@ -246,7 +246,7 @@ func TestTSDBStore_LabelNames(t *testing.T) {
 			title:  "add another label",
 			labels: []string{"bar", "bar"},
 			// We will get two labels here.
-			expectedNames: []string{"bar", "foo"},
+			expectedNames: []string{"bar", "foo", "region"},
 			timestamp:     now.Unix(),
 			start: func() int64 {
 				return timestamp.FromTime(minTime)
@@ -269,7 +269,7 @@ func TestTSDBStore_LabelNames(t *testing.T) {
 		{
 			title:         "get all labels",
 			labels:        []string{"buz", "buz"},
-			expectedNames: []string{"bar", "buz", "foo"},
+			expectedNames: []string{"bar", "buz", "foo", "region"},
 			timestamp:     now.Unix(),
 			start: func() int64 {
 				return timestamp.FromTime(minTime)

diff --git a/test/e2e/query_test.go b/test/e2e/query_test.go
@@ -280,8 +280,10 @@ func TestQueryLabelNames(t *testing.T) {
 
 	labelNames(t, ctx, q.HTTPEndpoint(), []storepb.LabelMatcher{{Type: storepb.LabelMatcher_EQ, Name: "__name__", Value: "up"}},
 		timestamp.FromTime(now.Add(-time.Hour)), timestamp.FromTime(now.Add(time.Hour)), func(res []string) bool {
-			// Expected result: [__name__, instance, job, prometheus, replica]
-			return len(res) == 5
+			// Expected result: [__name__, instance, job, prometheus, replica, receive, tenant_id]
+			// Pre-labelnames pushdown we've done Select() over all series and picked out the label names hence they all had external labels.
+			// With labelnames pushdown we had to extend the LabelNames() call to enrich the response with the external labelset with there are more than one label.
+			return len(res) == 7
 		},
 	)