vendor: update TSDB and Prometheus

Gopkg.toml

@@ -71,7 +71,7 @@
   name = "github.com/grpc-ecosystem/go-grpc-prometheus"
 
 [[constraint]]
-  branch = "fabxc"
+  branch = "master"
   name = "github.com/prometheus/tsdb"
 
 [[constraint]]

pkg/query/api/v1.go

@@ -336,7 +336,11 @@ func (api *API) series(r *http.Request) (interface{}, *apiError) {
 	var set storage.SeriesSet
 
 	for _, mset := range matcherSets {
-		set = storage.DeduplicateSeriesSet(set, q.Select(mset...))
+		s, err := q.Select(mset...)
+		if err != nil {
+			return nil, &apiError{errorExec, err}
+		}
+		set = storage.DeduplicateSeriesSet(set, s)
 	}
 
 	metrics := []labels.Labels{}

pkg/query/querier.go

@@ -123,7 +123,7 @@ func storeMatches(s StoreInfo, matchers ...*labels.Matcher) bool {
 	return true
 }
 
-func (q *querier) Select(ms ...*labels.Matcher) storage.SeriesSet {
+func (q *querier) Select(ms ...*labels.Matcher) (storage.SeriesSet, error) {
 	var (
 		mtx sync.Mutex
 		all []storepb.SeriesSet
@@ -134,7 +134,7 @@ func (q *querier) Select(ms ...*labels.Matcher) storage.SeriesSet {
 
 	sms, err := translateMatchers(ms...)
 	if err != nil {
-		return promSeriesSet{set: errSeriesSet{err: err}}
+		return nil, errors.Wrap(err, "convert matchers")
 	}
 	for _, s := range q.stores {
 		// We might be able to skip the store if its meta information indicates
@@ -157,7 +157,7 @@ func (q *querier) Select(ms ...*labels.Matcher) storage.SeriesSet {
 		})
 	}
 	if err := g.Wait(); err != nil {
-		return promSeriesSet{set: errSeriesSet{err: err}}
+		return nil, errors.Wrap(err, "query stores")
 	}
 	set := promSeriesSet{
 		mint: q.mint,
@@ -168,9 +168,9 @@ func (q *querier) Select(ms ...*labels.Matcher) storage.SeriesSet {
 	// of the same series into a single one. The series are ordered so that equal series
 	// from different replicas are sequential. We can now deduplicate those.
 	if q.replicaLabel == "" {
-		return set
+		return set, nil
 	}
-	return newDedupSeriesSet(set, q.replicaLabel)
+	return newDedupSeriesSet(set, q.replicaLabel), nil
 }
 
 func (q *querier) selectSingle(client storepb.StoreClient, ms ...storepb.LabelMatcher) (storepb.SeriesSet, error) {

pkg/query/querier_test.go

@@ -82,7 +82,8 @@ func TestQuerier_Series(t *testing.T) {
 	}, 1, 300, "")
 	defer q.Close()
 
-	res := q.Select()
+	res, err := q.Select()
+	testutil.Ok(t, err)
 
 	expected := []struct {
 		lset    labels.Labels