Review fix: rename new bucket store constructor; deprecated the old one

Signed-off-by: Max Neverov <[email protected]>

cmd/thanos/store.go

@@ -297,7 +297,7 @@ func runStore(
 		store.WithChunksSizeLimit(store.NewChunksLimiterFactory(maxSampleSize)),
 	}
 
-	bs, err := store.New(
+	bs, err := store.NewBucketStoreWithOptions(
 		logger,
 		reg,
 		bkt,

pkg/store/bucket.go

@@ -326,6 +326,7 @@ var defaultBucketStoreOptions = bucketStoreOptions{
 	chunksSizeLimitFactory: NewChunksLimiterFactory(noChunksSizeLimit),
 }
 
+// Deprecated. Use NewBucketStoreWithOptions instead.
 // NewBucketStore creates a new bucket backed store that implements the store API against
 // an object store bucket. It is optimized to work against high latency backends.
 func NewBucketStore(
@@ -350,7 +351,7 @@ func NewBucketStore(
 		WithChunksLimit(chunksLimiterFactory),
 		WithChunksSizeLimit(NewChunksLimiterFactory(noChunksSizeLimit)),
 	}
-	return New(logger,
+	return NewBucketStoreWithOptions(logger,
 		reg,
 		bkt,
 		fetcher,
@@ -369,9 +370,9 @@ func NewBucketStore(
 	)
 }
 
-// New creates a new bucket backed store that implements the store API against
+// NewBucketStoreWithOptions creates a new bucket backed store that implements the store API against
 // an object store bucket. It is optimized to work against high latency backends.
-func New(
+func NewBucketStoreWithOptions(
 	logger log.Logger,
 	reg prometheus.Registerer,
 	bkt objstore.InstrumentedBucketReader,

pkg/store/bucket_e2e_test.go

@@ -155,7 +155,7 @@ func prepareStoreWithTestBlocks(t testing.TB, dir string, bkt objstore.Bucket, m
 	}, nil)
 	testutil.Ok(t, err)
 
-	store, err := New(
+	store, err := NewBucketStoreWithOptions(
 		s.logger,
 		nil,
 		objstore.WithNoopInstr(bkt),

pkg/store/bucket_test.go

@@ -563,7 +563,7 @@ func TestBucketStore_Info(t *testing.T) {
 
 	defer testutil.Ok(t, os.RemoveAll(dir))
 
-	bucketStore, err := New(
+	bucketStore, err := NewBucketStoreWithOptions(
 		nil,
 		nil,
 		nil,
@@ -598,7 +598,7 @@ func TestSeries_ErrorInvalidLimiter(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	dir := t.TempDir()
-	store, err := New(
+	store, err := NewBucketStoreWithOptions(
 		nil,
 		nil,
 		nil,
@@ -855,7 +855,7 @@ func testSharding(t *testing.T, reuseDisk string, bkt objstore.Bucket, all ...ul
 			}, nil)
 			testutil.Ok(t, err)
 
-			bucketStore, err := New(
+			bucketStore, err := NewBucketStoreWithOptions(
 				logger,
 				nil,
 				objstore.WithNoopInstr(rec),
@@ -1610,7 +1610,7 @@ func TestSeries_RequestAndResponseHints(t *testing.T) {
 	indexCache, err := storecache.NewInMemoryIndexCacheWithConfig(logger, nil, storecache.InMemoryIndexCacheConfig{})
 	testutil.Ok(tb, err)
 
-	store, err := New(
+	store, err := NewBucketStoreWithOptions(
 		logger,
 		nil,
 		instrBkt,
@@ -1719,7 +1719,7 @@ func TestSeries_ErrorUnmarshallingRequestHints(t *testing.T) {
 	indexCache, err := storecache.NewInMemoryIndexCacheWithConfig(logger, nil, storecache.InMemoryIndexCacheConfig{})
 	testutil.Ok(tb, err)
 
-	store, err := New(
+	store, err := NewBucketStoreWithOptions(
 		logger,
 		nil,
 		instrBkt,
@@ -1822,7 +1822,7 @@ func TestBlockWithLargeChunks(t *testing.T) {
 	indexCache, err := storecache.NewInMemoryIndexCacheWithConfig(logger, nil, storecache.InMemoryIndexCacheConfig{})
 	testutil.Ok(t, err)
 
-	store, err := New(
+	store, err := NewBucketStoreWithOptions(
 		logger,
 		nil,
 		instrBkt,