fix label values query in stress; bump dependencies

Signed-off-by: Ben Ye <[email protected]>

Author: yeya24

cmd/thanosbench/stress.go

@@ -14,12 +14,18 @@ import (
 	"github.com/oklog/run"
 	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/pkg/labels"
+	"github.com/prometheus/prometheus/pkg/timestamp"
 	"github.com/thanos-io/thanos/pkg/store/storepb"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
+var (
+	minTime = timestamp.FromTime(time.Unix(math.MinInt64/1000+62135596801, 0))
+	maxTime = timestamp.FromTime(time.Unix(math.MaxInt64/1000-62135596801, 999999999))
+)
+
 func registerStress(m map[string]setupFunc, app *kingpin.Application) {
 	cmd := app.Command("stress", "Stress tests a remote StoreAPI.")
 	workers := cmd.Flag("workers", "Number of go routines for stress testing.").Required().Int()
@@ -42,7 +48,11 @@ func registerStress(m map[string]setupFunc, app *kingpin.Application) {
 			lblvlsCtx, lblvlsCancel := context.WithTimeout(mainCtx, *timeout)
 			defer lblvlsCancel()
 
-			labelvaluesResp, err := c.LabelValues(lblvlsCtx, &storepb.LabelValuesRequest{Label: labels.MetricName})
+			labelvaluesResp, err := c.LabelValues(lblvlsCtx, &storepb.LabelValuesRequest{
+				Label: labels.MetricName,
+				Start: minTime,
+				End:   maxTime,
+			})
 			if err != nil {
 				return err
 			}
@@ -76,7 +86,7 @@ func registerStress(m map[string]setupFunc, app *kingpin.Application) {
 							MinTime: min * 1000,
 							MaxTime: max * 1000,
 							Matchers: []storepb.LabelMatcher{
-								storepb.LabelMatcher{
+								{
 									Type:  storepb.LabelMatcher_EQ,
 									Name:  labels.MetricName,
 									Value: randomMetric,

go.mod

@@ -3,21 +3,21 @@ module github.com/thanos-io/thanosbench
 require (
 	github.com/bwplotka/mimic v0.0.0-20190730202618-06ab9976e8ef
 	github.com/fatih/structtag v1.1.0
-	github.com/go-kit/kit v0.9.0
-	github.com/go-openapi/swag v0.19.5
-	github.com/oklog/run v1.0.0
+	github.com/go-kit/kit v0.10.0
+	github.com/go-openapi/swag v0.19.9
+	github.com/oklog/run v1.1.0
 	github.com/oklog/ulid v1.3.1
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/common v0.9.1
-	github.com/prometheus/prometheus v1.8.2-0.20200213233353-b90be6f32a33
-	github.com/thanos-io/thanos v0.12.2
+	github.com/prometheus/common v0.11.1
+	github.com/prometheus/prometheus v1.8.2-0.20200811193703-869f1bc587e6
+	github.com/thanos-io/thanos v0.15.0
 	go.uber.org/automaxprocs v1.2.0
-	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
-	google.golang.org/grpc v1.25.1
+	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
+	google.golang.org/grpc v1.30.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
-	gopkg.in/yaml.v2 v2.2.7
-	k8s.io/api v0.0.0-20191115095533-47f6de673b26
-	k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2
+	gopkg.in/yaml.v2 v2.3.0
+	k8s.io/api v0.18.6
+	k8s.io/apimachinery v0.18.6
 )
 
 // We want to replace the client-go version with a specific commit hash,

go.sum

@@ -12,14 +12,14 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/oklog/ulid"
 	"github.com/prometheus/prometheus/pkg/labels"
-	"github.com/prometheus/prometheus/tsdb"
+	"github.com/prometheus/prometheus/storage"
 	"github.com/thanos-io/thanos/pkg/block/metadata"
 	"github.com/thanos-io/thanosbench/pkg/seriesgen"
 )
 
 // Writer is interface to write time series into Prometheus blocks.
 type Writer interface {
-	tsdb.Appendable
+	storage.Appendable
 
 	// Flush writes current block to disk.
 	// The block will contain values accumulated by `Write`.

pkg/blockgen/blockgen.go

@@ -12,6 +12,7 @@ import (
 	"github.com/go-kit/kit/log/level"
 	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/pkg/timestamp"
+	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/tsdb"
 	"github.com/prometheus/prometheus/tsdb/chunkenc"
 )
@@ -65,8 +66,8 @@ func NewTSDBBlockWriter(logger log.Logger, dir string) (*BlockWriter, error) {
 }
 
 // Appender is not thread-safe. Returned Appender is thread-save however..
-func (w *BlockWriter) Appender() tsdb.Appender {
-	return w.head.Appender()
+func (w *BlockWriter) Appender(ctx context.Context) storage.Appender {
+	return w.head.Appender(ctx)
 }
 
 // Flush implements Writer interface. This is where actual block writing
@@ -96,7 +97,7 @@ func (w *BlockWriter) initHeadAndAppender() error {
 	//    var w *wal.WAL = nil
 	// Put huge chunkRange; It has to be equal then expected block size.
 	// Since we don't have info about block size here, set it to large number.
-	h, err := tsdb.NewHead(nil, logger, nil, durToMilis(9999*time.Hour), tsdb.DefaultStripeSize)
+	h, err := tsdb.NewHead(nil, logger, nil, durToMilis(9999*time.Hour), "", nil, tsdb.DefaultStripeSize, nil)
 	if err != nil {
 		return errors.Wrap(err, "tsdb.NewHead")
 	}
@@ -108,7 +109,7 @@ func (w *BlockWriter) initHeadAndAppender() error {
 
 // writeHeadToDisk commits the appender and writes the head to disk.
 func (w *BlockWriter) writeHeadToDisk() (ulid.ULID, error) {
-	if err := w.Appender().Commit(); err != nil {
+	if err := w.Appender(context.TODO()).Commit(); err != nil {
 		return ulid.ULID{}, errors.Wrap(err, "appender.Commit")
 	}
 

pkg/blockgen/writer.go

@@ -4,17 +4,16 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
-
-	"github.com/prometheus/prometheus/tsdb"
+	"github.com/prometheus/prometheus/storage"
 	"golang.org/x/sync/errgroup"
 )
 
-func Append(ctx context.Context, goroutines int, appendable tsdb.Appendable, series SeriesSet) error {
+func Append(ctx context.Context, goroutines int, appendable storage.Appendable, series SeriesSet) error {
 	g, gctx := errgroup.WithContext(ctx)
 
 	workBuffer := make(chan Series)
 	for i := 0; i < goroutines; i++ {
-		app := appendable.Appender()
+		app := appendable.Appender(gctx)
 		g.Go(func() error {
 			var (
 				s   Series

pkg/seriesgen/append.go

@@ -48,25 +48,13 @@ func GenerateTSDBWAL(logger log.Logger, dir string, config Config) error {
 		config.ScrapeInterval = 15 * time.Second
 	}
 
-	// Same code as Prometheus for compaction levels and max block.
-	rngs := tsdb.ExponentialBlockRanges(int64(2*time.Hour.Seconds()*1000), 10, 3)
 	maxBlockDuration := config.Retention / 10
-	for i, v := range rngs {
-		if v > int64(maxBlockDuration.Seconds()*1000) {
-			rngs = rngs[:i]
-			break
-		}
-	}
-
-	if len(rngs) == 0 {
-		rngs = append(rngs, int64(2*time.Hour.Seconds()*1000))
-	}
-
 	// TODO(bwplotka): Moved to something like https://github.com/thanos-io/thanos/blob/master/pkg/testutil/prometheus.go#L289
 	//  to actually generate blocks! It will be fine for TSDB use cases as well.
 	db, err := tsdb.Open(dir, nil, nil, &tsdb.Options{
-		BlockRanges:       rngs,
-		RetentionDuration: uint64(config.Retention.Seconds() * 1000),
+		MinBlockDuration:  int64(2 * time.Hour / time.Millisecond),
+		MaxBlockDuration:  maxBlockDuration.Milliseconds(),
+		RetentionDuration: config.Retention.Milliseconds(),
 		NoLockfile:        true,
 	})
 	if err != nil {