Update Vendored Deps (#47)

* update vendored dependencies and fix issues

Signed-off-by: Jacob Lisi <[email protected]>

* update vendor changes after rebase

Signed-off-by: Jacob Lisi <[email protected]>

* fix lint issues

Signed-off-by: Jacob Lisi <[email protected]>

* correctly fix linting error

Signed-off-by: Jacob Lisi <[email protected]>

Author: jtlisi

go.mod

@@ -1,31 +1,38 @@
 module github.com/grafana/cortextool
 
-go 1.12
-
-replace github.com/hashicorp/consul => github.com/hashicorp/consul v1.5.1
+go 1.13
 
 require (
-	cloud.google.com/go v0.44.1
+	cloud.google.com/go/bigtable v1.2.0
+	cloud.google.com/go/storage v1.6.0
 	github.com/alecthomas/chroma v0.7.0
 	github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 // indirect
-	github.com/cortexproject/cortex v0.4.0
+	github.com/cortexproject/cortex v1.1.1-0.20200605125619-1406f60579d5
 	github.com/dlclark/regexp2 v1.2.0 // indirect
-	github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48
+	github.com/gogo/protobuf v1.3.1
 	github.com/golang/snappy v0.0.1
-	github.com/jpillora/backoff v1.0.0 // indirect
-	github.com/mattn/go-isatty v0.0.9 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
-	github.com/opentracing/opentracing-go v1.1.0
-	github.com/pkg/errors v0.8.1
+	github.com/opentracing/opentracing-go v1.1.1-0.20200124165624-2876d2018785
+	github.com/pkg/errors v0.9.1
 	github.com/prometheus/alertmanager v0.20.0
-	github.com/prometheus/client_golang v1.3.0
-	github.com/prometheus/common v0.7.0
-	github.com/prometheus/prometheus v1.8.2-0.20190918104050-8744afdd1ea0
-	github.com/sirupsen/logrus v1.4.2
-	github.com/stretchr/testify v1.4.0
-	google.golang.org/api v0.8.0
+	github.com/prometheus/client_golang v1.6.0
+	github.com/prometheus/common v0.10.0
+	github.com/prometheus/prometheus v1.8.2-0.20200605084833-6ff4814a492a
+	github.com/sirupsen/logrus v1.5.0
+	github.com/stretchr/testify v1.5.1
+	google.golang.org/api v0.26.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
-	gopkg.in/yaml.v2 v2.2.2
-	gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86
-	sigs.k8s.io/yaml v1.1.0
+	gopkg.in/yaml.v2 v2.3.0
+	gopkg.in/yaml.v3 v3.0.0-20200603094226-e3079894b1e8
 )
+
+// Cortex Overrides
+replace github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v36.2.0+incompatible
+
+replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.0+incompatible
+
+replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
+
+replace github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0
+
+replace k8s.io/client-go => k8s.io/client-go v0.18.3

go.sum

@@ -40,12 +40,12 @@ type Writer struct {
 
 // NewWriter returns a Writer object
 func NewWriter(cfg Config, mapper Mapper) (*Writer, error) {
-	overrides, err := validation.NewOverrides(validation.Limits{})
+	overrides, err := validation.NewOverrides(validation.Limits{}, nil)
 	if err != nil {
 		return nil, err
 	}
 
-	chunkStore, err := storage.NewStore(cfg.StorageConfig, chunk.StoreConfig{}, cfg.SchemaConfig, overrides)
+	chunkStore, err := storage.NewStore(cfg.StorageConfig, chunk.StoreConfig{}, cfg.SchemaConfig, overrides, nil, nil)
 	if err != nil {
 		return nil, err
 	}

pkg/chunk/migrate/writer/writer.go

@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"net/url"
 
+	rulefmt "github.com/cortexproject/cortex/pkg/ruler/legacy_rulefmt"
 	"github.com/pkg/errors"
-	"github.com/prometheus/prometheus/pkg/rulefmt"
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 )

pkg/client/rules.go

@@ -148,7 +148,8 @@ func (c *deleteChunkCommandOptions) run(k *kingpin.ParseContext) error {
 		return fmt.Errorf("no schema found for provided from timestamp")
 	}
 
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	fltr := filter.NewMetricFilter(c.FilterConfig)
 
 	var (
@@ -197,7 +198,23 @@ func (c *deleteChunkCommandOptions) run(k *kingpin.ParseContext) error {
 	wg.Add(1)
 
 	go func() {
-		schema := schemaConfig.CreateSchema()
+		defer func() {
+			cancel()
+			wg.Done()
+		}()
+
+		baseSchema, err := schemaConfig.CreateSchema()
+		if err != nil {
+			logrus.WithError(err).Errorln("unable to create schema")
+			return
+		}
+
+		schema, ok := baseSchema.(chunk.SeriesStoreSchema)
+		if !ok {
+			logrus.Errorln("unable to cast BaseSchema as SeriesStoreSchema")
+			return
+		}
+
 		for chk := range outChan {
 			logrus.WithFields(logrus.Fields{
 				"chunkID": chk.ExternalKey(),
@@ -249,7 +266,6 @@ func (c *deleteChunkCommandOptions) run(k *kingpin.ParseContext) error {
 			}
 
 		}
-		wg.Done()
 	}()
 
 	table := schemaConfig.ChunkTables.TableFor(fltr.From)
@@ -314,11 +330,21 @@ func (c *deleteSeriesCommandOptions) run(k *kingpin.ParseContext) error {
 		return fmt.Errorf("index store type %v not supported for deletes", schemaConfig.IndexType)
 	}
 
-	schema := schemaConfig.CreateSchema()
+	baseSchema, err := schemaConfig.CreateSchema()
+	if err != nil {
+		logrus.WithError(err).Errorln("unable to create schema")
+		return err
+	}
+
+	schema, ok := baseSchema.(chunk.SeriesStoreSchema)
+	if !ok {
+		logrus.Errorln("unable to cast BaseSchema as SeriesStoreSchema")
+		return errors.New("unable to cast BaseSchema as SeriesStoreSchema")
+	}
 
 	deleteMetricNameRows, err := schema.GetReadQueriesForMetric(fltr.From, fltr.To, fltr.User, fltr.Name)
 	if err != nil {
-		logrus.Errorln(err)
+		return err
 	}
 
 	start := time.Now()

pkg/commands/chunks.go

@@ -21,6 +21,7 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/prompb"
 	"github.com/prometheus/prometheus/storage/remote"
+	"github.com/sirupsen/logrus"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 
@@ -93,7 +94,7 @@ func (c *LoadgenCommand) run(k *kingpin.ParseContext) error {
 		return err
 	}
 
-	writeClient, err := remote.NewClient(0, &remote.ClientConfig{
+	writeClient, err := remote.NewClient("loadgen", &remote.ClientConfig{
 		URL:     &config.URL{URL: writeURL},
 		Timeout: model.Duration(c.writeTimeout),
 	})
@@ -111,7 +112,12 @@ func (c *LoadgenCommand) run(k *kingpin.ParseContext) error {
 	c.queryClient = v1.NewAPI(queryClient)
 
 	http.Handle("/metrics", promhttp.Handler())
-	go http.ListenAndServe(c.metricsListenAddress, nil)
+	go func() {
+		err := http.ListenAndServe(c.metricsListenAddress, nil)
+		if err != nil {
+			logrus.WithError(err).Errorln("metrics listener failed")
+		}
+	}()
 
 	c.wg.Add(c.parallelism)
 	c.wg.Add(c.queryParallelism)
@@ -181,10 +187,10 @@ func (c *LoadgenCommand) runBatch(from, to int) error {
 
 	start := time.Now()
 	if err := c.writeClient.Store(context.Background(), compressed); err != nil {
-		writeRequestDuration.WithLabelValues("error").Observe(time.Now().Sub(start).Seconds())
+		writeRequestDuration.WithLabelValues("error").Observe(time.Since(start).Seconds())
 		return err
 	}
-	writeRequestDuration.WithLabelValues("success").Observe(time.Now().Sub(start).Seconds())
+	writeRequestDuration.WithLabelValues("success").Observe(time.Since(start).Seconds())
 
 	return nil
 }
@@ -207,9 +213,9 @@ func (c *LoadgenCommand) runQuery() {
 	start := time.Now()
 	_, _, err := c.queryClient.QueryRange(ctx, c.query, r)
 	if err != nil {
-		queryRequestDuration.WithLabelValues("error").Observe(time.Now().Sub(start).Seconds())
+		queryRequestDuration.WithLabelValues("error").Observe(time.Since(start).Seconds())
 		log.Printf("error doing query: %v", err)
 		return
 	}
-	queryRequestDuration.WithLabelValues("success").Observe(time.Now().Sub(start).Seconds())
+	queryRequestDuration.WithLabelValues("success").Observe(time.Since(start).Seconds())
 }

pkg/commands/loadgen.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/alecthomas/chroma/quick"
+	rulefmt "github.com/cortexproject/cortex/pkg/ruler/legacy_rulefmt"
 	"github.com/mitchellh/colorstring"
-	"github.com/prometheus/prometheus/pkg/rulefmt"
 	"gopkg.in/yaml.v2"
 
 	"github.com/grafana/cortextool/pkg/rules"

pkg/printer/printer.go

@@ -6,9 +6,9 @@ import (
 	"reflect"
 	"strings"
 
+	rulefmt "github.com/cortexproject/cortex/pkg/ruler/legacy_rulefmt"
 	"github.com/mitchellh/colorstring"
-	"github.com/prometheus/prometheus/pkg/rulefmt"
-	"sigs.k8s.io/yaml"
+	yaml "gopkg.in/yaml.v2"
 )
 
 var (

pkg/rules/compare.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/prometheus/prometheus/pkg/rulefmt"
+	rulefmt "github.com/cortexproject/cortex/pkg/ruler/legacy_rulefmt"
 )
 
 func TestParseFiles(t *testing.T) {

pkg/rules/parser_test.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/prometheus/prometheus/pkg/rulefmt"
-	"github.com/prometheus/prometheus/promql"
+	rulefmt "github.com/cortexproject/cortex/pkg/ruler/legacy_rulefmt"
+	"github.com/prometheus/prometheus/promql/parser"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -29,7 +29,7 @@ func (r RuleNamespace) LintPromQLExpressions() (int, int, error) {
 	for i, group := range r.Groups {
 		for j, rule := range group.Rules {
 			log.WithFields(log.Fields{"rule": getRuleName(rule)}).Debugf("linting PromQL")
-			exp, err := promql.ParseExpr(rule.Expr)
+			exp, err := parser.ParseExpr(rule.Expr)
 			if err != nil {
 				return count, mod, err
 			}
@@ -61,7 +61,7 @@ func (r RuleNamespace) AggregateBy(label string) (int, int, error) {
 	for i, group := range r.Groups {
 		for j, rule := range group.Rules {
 			log.WithFields(log.Fields{"rule": getRuleName(rule)}).Debugf("evaluating...")
-			exp, err := promql.ParseExpr(rule.Expr)
+			exp, err := parser.ParseExpr(rule.Expr)
 			if err != nil {
 				return count, mod, err
 			}
@@ -70,7 +70,7 @@ func (r RuleNamespace) AggregateBy(label string) (int, int, error) {
 			// Given inspect will help us traverse every node in the AST, Let's create the
 			// function that will modify the labels.
 			f := exprNodeInspectorFunc(rule, label)
-			promql.Inspect(exp, f)
+			parser.Inspect(exp, f)
 
 			// Only modify the ones that actually changed.
 			if rule.Expr != exp.String() {
@@ -90,9 +90,9 @@ func (r RuleNamespace) AggregateBy(label string) (int, int, error) {
 
 // exprNodeInspectorFunc returns a PromQL inspector.
 // It modifies most PromQL aggregations to include a given label.
-func exprNodeInspectorFunc(rule rulefmt.Rule, label string) func(node promql.Node, path []promql.Node) error {
-	return func(node promql.Node, path []promql.Node) error {
-		aggregation, ok := node.(*promql.AggregateExpr)
+func exprNodeInspectorFunc(rule rulefmt.Rule, label string) func(node parser.Node, path []parser.Node) error {
+	return func(node parser.Node, path []parser.Node) error {
+		aggregation, ok := node.(*parser.AggregateExpr)
 		if !ok {
 			return nil
 		}