Rename tsdb_errors to tsdberrors

Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>
thanos-io · May 14, 2019 · 6cec9c1 · 6cec9c1
1 parent 9ccfea9
commit 6cec9c1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/pkg/compact/downsample/downsample.go b/pkg/compact/downsample/downsample.go
@@ -16,7 +16,7 @@ import (
 	"github.com/prometheus/tsdb"
 	"github.com/prometheus/tsdb/chunkenc"
 	"github.com/prometheus/tsdb/chunks"
-	tsdb_errors "github.com/prometheus/tsdb/errors"
+	tsdberrors "github.com/prometheus/tsdb/errors"
 	"github.com/prometheus/tsdb/index"
 	"github.com/prometheus/tsdb/labels"
 )
@@ -64,7 +64,7 @@ func Downsample(
 	// Remove blockDir in case of errors.
 	defer func() {
 		if err != nil {
-			var merr tsdb_errors.MultiError
+			var merr tsdberrors.MultiError
 			merr.Add(err)
 			merr.Add(os.RemoveAll(blockDir))
 			err = merr.Err()

diff --git a/pkg/compact/downsample/streamed_block_writer.go b/pkg/compact/downsample/streamed_block_writer.go
@@ -13,7 +13,7 @@ import (
 	"github.com/prometheus/tsdb"
 	"github.com/prometheus/tsdb/chunks"
 	"github.com/prometheus/tsdb/fileutil"
-	tsdb_errors "github.com/prometheus/tsdb/errors"
+	tsdberrors "github.com/prometheus/tsdb/errors"
 	"github.com/prometheus/tsdb/index"
 	"github.com/prometheus/tsdb/labels"
 )
@@ -84,7 +84,7 @@ func NewStreamedBlockWriter(
 	// We should close any opened Closer up to an error.
 	defer func() {
 		if err != nil {
-			var merr tsdb_errors.MultiError
+			var merr tsdberrors.MultiError
 			merr.Add(err)
 			for _, cl := range closers {
 				merr.Add(cl.Close())
@@ -170,7 +170,7 @@ func (w *streamedBlockWriter) Close() error {
 	}
 	w.finalized = true
 
-	merr := tsdb_errors.MultiError{}
+	merr := tsdberrors.MultiError{}
 
 	if w.ignoreFinalize {
 		// Close open file descriptors anyway.

diff --git a/pkg/rule/rule.go b/pkg/rule/rule.go
@@ -13,7 +13,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/pkg/rulefmt"
 	"github.com/prometheus/prometheus/rules"
-	tsdb_errors "github.com/prometheus/tsdb/errors"
+	tsdberrors "github.com/prometheus/tsdb/errors"
 	yaml "gopkg.in/yaml.v2"
 )
 
@@ -112,7 +112,7 @@ func (r RuleGroup) MarshalYAML() (interface{}, error) {
 // special field in RuleGroup file.
 func (m *Managers) Update(dataDir string, evalInterval time.Duration, files []string) error {
 	var (
-		errs     tsdb_errors.MultiError
+		errs     tsdberrors.MultiError
 		filesMap = map[storepb.PartialResponseStrategy][]string{}
 	)
 

diff --git a/pkg/runutil/runutil.go b/pkg/runutil/runutil.go
@@ -49,7 +49,7 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/pkg/errors"
-	tsdb_errors "github.com/prometheus/tsdb/errors"
+	tsdberrors "github.com/prometheus/tsdb/errors"
 )
 
 // Repeat executes f every interval seconds until stopc is closed.
@@ -111,7 +111,7 @@ func CloseWithLogOnErr(logger log.Logger, closer io.Closer, format string, a ...
 // CloseWithErrCapture runs function and on error return error by argument including the given error (usually
 // from caller function).
 func CloseWithErrCapture(err *error, closer io.Closer, format string, a ...interface{}) {
-	merr := tsdb_errors.MultiError{}
+	merr := tsdberrors.MultiError{}
 
 	merr.Add(*err)
 	merr.Add(errors.Wrapf(closer.Close(), format, a...))