From 6131e19500b0545113663c7c0e7a86127982146b Mon Sep 17 00:00:00 2001 From: Bisakh Mondal Date: Thu, 17 Mar 2022 01:33:28 +0530 Subject: [PATCH] chore: update existing errors import (small subset) --- cmd/thanos/compact.go | 2 +- cmd/thanos/downsample.go | 2 +- cmd/thanos/main.go | 2 +- cmd/thanos/query.go | 2 +- pkg/receive/hashring.go | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/thanos/compact.go b/cmd/thanos/compact.go index b8f95498d30..2a0fc67e940 100644 --- a/cmd/thanos/compact.go +++ b/cmd/thanos/compact.go @@ -19,7 +19,6 @@ import ( "github.com/go-kit/log/level" "github.com/oklog/run" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/common/model" @@ -34,6 +33,7 @@ import ( "github.com/thanos-io/thanos/pkg/compact/downsample" "github.com/thanos-io/thanos/pkg/component" "github.com/thanos-io/thanos/pkg/dedup" + "github.com/thanos-io/thanos/pkg/errors" "github.com/thanos-io/thanos/pkg/extkingpin" "github.com/thanos-io/thanos/pkg/extprom" extpromhttp "github.com/thanos-io/thanos/pkg/extprom/http" diff --git a/cmd/thanos/downsample.go b/cmd/thanos/downsample.go index bd299c1e3e3..27bbc32a1f0 100644 --- a/cmd/thanos/downsample.go +++ b/cmd/thanos/downsample.go @@ -16,7 +16,6 @@ import ( "github.com/go-kit/log/level" "github.com/oklog/run" "github.com/oklog/ulid" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/prometheus/tsdb" @@ -26,6 +25,7 @@ import ( "github.com/thanos-io/thanos/pkg/block/metadata" "github.com/thanos-io/thanos/pkg/compact/downsample" "github.com/thanos-io/thanos/pkg/component" + "github.com/thanos-io/thanos/pkg/errors" "github.com/thanos-io/thanos/pkg/errutil" "github.com/thanos-io/thanos/pkg/extprom" "github.com/thanos-io/thanos/pkg/objstore" diff --git a/cmd/thanos/main.go b/cmd/thanos/main.go index 4a83107d768..ffd8a18e10b 100644 --- a/cmd/thanos/main.go +++ b/cmd/thanos/main.go @@ -18,13 +18,13 @@ import ( "github.com/go-kit/log/level" "github.com/oklog/run" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/common/version" "go.uber.org/automaxprocs/maxprocs" "gopkg.in/alecthomas/kingpin.v2" + "github.com/thanos-io/thanos/pkg/errors" "github.com/thanos-io/thanos/pkg/extkingpin" "github.com/thanos-io/thanos/pkg/logging" "github.com/thanos-io/thanos/pkg/tracing/client" diff --git a/cmd/thanos/query.go b/cmd/thanos/query.go index 25f7c611333..34aa96167b7 100644 --- a/cmd/thanos/query.go +++ b/cmd/thanos/query.go @@ -18,7 +18,6 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/tags" "github.com/oklog/run" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/common/route" @@ -32,6 +31,7 @@ import ( "github.com/thanos-io/thanos/pkg/component" "github.com/thanos-io/thanos/pkg/discovery/cache" "github.com/thanos-io/thanos/pkg/discovery/dns" + "github.com/thanos-io/thanos/pkg/errors" "github.com/thanos-io/thanos/pkg/exemplars" "github.com/thanos-io/thanos/pkg/extgrpc" "github.com/thanos-io/thanos/pkg/extkingpin" diff --git a/pkg/receive/hashring.go b/pkg/receive/hashring.go index 520a610d0fe..0d43fb9a417 100644 --- a/pkg/receive/hashring.go +++ b/pkg/receive/hashring.go @@ -8,7 +8,7 @@ import ( "fmt" "sync" - "github.com/pkg/errors" + "github.com/thanos-io/thanos/pkg/errors" "github.com/thanos-io/thanos/pkg/store/labelpb" "github.com/thanos-io/thanos/pkg/store/storepb/prompb" @@ -168,12 +168,12 @@ func HashringFromConfigWatcher(ctx context.Context, updates chan<- Hashring, cw func HashringFromConfig(content string) (Hashring, error) { config, err := parseConfig([]byte(content)) if err != nil { - return nil, errors.Wrapf(err, "failed to parse configuration") + return nil, errors.Wrap(err, "failed to parse configuration") } // If hashring is empty, return an error. if len(config) == 0 { - return nil, errors.Wrapf(err, "failed to load configuration") + return nil, errors.Wrap(err, "failed to load configuration") } return newMultiHashring(config), err