From 3e2ba51e77367b2026a0dd0c20b944a8999b65ae Mon Sep 17 00:00:00 2001
From: Ben Ye <ben.ye@bytedance.com>
Date: Wed, 15 Jun 2022 18:14:31 -0700
Subject: [PATCH] lint

Signed-off-by: Ben Ye <ben.ye@bytedance.com>
---
 cmd/thanos/store.go              | 4 ++--
 cmd/thanos/tools_bucket.go       | 2 +-
 pkg/block/tombstone/tombstone.go | 2 +-
 pkg/compact/compact.go           | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cmd/thanos/store.go b/cmd/thanos/store.go
index cca15e60890..f44909892d3 100644
--- a/cmd/thanos/store.go
+++ b/cmd/thanos/store.go
@@ -125,7 +125,7 @@ func (sc *storeConfig) registerFlag(cmd extkingpin.FlagClause) {
 		Default("32").IntVar(&sc.blockMetaFetchConcurrency)
 
 	cmd.Flag("sync-tombstone-duration", "Repeat interval for syncing the tombstones between local and remote view.").
-		Default("3m").DurationVar(&sc.syncInterval)
+		Default("3m").DurationVar(&sc.syncTombstonesInterval)
 
 	sc.filterConf = &store.FilterConfig{}
 
@@ -407,7 +407,7 @@ func runStore(
 
 	{
 		g.Add(func() error {
-			return runutil.Repeat(time.Minute*3, ctx.Done(), func() error {
+			return runutil.Repeat(conf.syncTombstonesInterval, ctx.Done(), func() error {
 				return bs.SyncTombstones(ctx)
 			})
 		}, func(error) {
diff --git a/cmd/thanos/tools_bucket.go b/cmd/thanos/tools_bucket.go
index ddc1d695035..1f359b54784 100644
--- a/cmd/thanos/tools_bucket.go
+++ b/cmd/thanos/tools_bucket.go
@@ -9,7 +9,6 @@ import (
 	"encoding/csv"
 	"encoding/json"
 	"fmt"
-	"github.com/thanos-io/thanos/pkg/block/tombstone"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -46,6 +45,7 @@ import (
 	v1 "github.com/thanos-io/thanos/pkg/api/blocks"
 	"github.com/thanos-io/thanos/pkg/block"
 	"github.com/thanos-io/thanos/pkg/block/metadata"
+	"github.com/thanos-io/thanos/pkg/block/tombstone"
 	"github.com/thanos-io/thanos/pkg/compact"
 	"github.com/thanos-io/thanos/pkg/compact/downsample"
 	"github.com/thanos-io/thanos/pkg/compactv2"
diff --git a/pkg/block/tombstone/tombstone.go b/pkg/block/tombstone/tombstone.go
index 00738074965..9981c16d203 100644
--- a/pkg/block/tombstone/tombstone.go
+++ b/pkg/block/tombstone/tombstone.go
@@ -12,7 +12,7 @@ import (
 	"path"
 	"time"
 
-	"github.com/go-kit/kit/log"
+	"github.com/go-kit/log"
 	"github.com/oklog/ulid"
 	"github.com/prometheus/prometheus/model/timestamp"
 
diff --git a/pkg/compact/compact.go b/pkg/compact/compact.go
index 5e55262f5e7..b845efe3808 100644
--- a/pkg/compact/compact.go
+++ b/pkg/compact/compact.go
@@ -17,7 +17,6 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/oklog/ulid"
-	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"