From be09cfbdcdf0c31db24104b6b73f86f32529bdb0 Mon Sep 17 00:00:00 2001
From: Ben Clive <ben.clive@grafana.com>
Date: Wed, 22 Jan 2025 16:46:39 +0000
Subject: [PATCH] naming

---
 pkg/dataobj/consumer/partition_processor.go | 2 +-
 pkg/dataobj/reader.go                       | 4 +---
 pkg/loki/loki.go                            | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkg/dataobj/consumer/partition_processor.go b/pkg/dataobj/consumer/partition_processor.go
index 4c81f894e920e..fdd959a7f71b0 100644
--- a/pkg/dataobj/consumer/partition_processor.go
+++ b/pkg/dataobj/consumer/partition_processor.go
@@ -239,7 +239,7 @@ func (p *partitionProcessor) writeMetastores(backoff *backoff.Backoff, dataobjPa
 
 				if len(buf) > 0 {
 					replayStart := time.Now()
-					err = metastoreBuilder.FromObject(bytes.NewReader(buf))
+					err = metastoreBuilder.FromExisting(bytes.NewReader(buf))
 					if err != nil {
 						return nil, err
 					}
diff --git a/pkg/dataobj/reader.go b/pkg/dataobj/reader.go
index c1a6ac1461d51..aa5b02c2bc03e 100644
--- a/pkg/dataobj/reader.go
+++ b/pkg/dataobj/reader.go
@@ -25,9 +25,7 @@ type reader struct {
 }
 
 func newReader(bucket objstore.Bucket) *reader {
-	return &reader{
-		bucket: bucket,
-	}
+	return &reader{bucket: bucket}
 }
 
 // Objects returns an iterator over all data objects for the provided tenant.
diff --git a/pkg/loki/loki.go b/pkg/loki/loki.go
index b22f3151d5ae2..b615413994de7 100644
--- a/pkg/loki/loki.go
+++ b/pkg/loki/loki.go
@@ -754,7 +754,7 @@ func (t *Loki) setupModuleManager() error {
 		Write:   {Ingester, Distributor, PatternIngester},
 		Backend: {QueryScheduler, Ruler, Compactor, IndexGateway, BloomPlanner, BloomBuilder, BloomGateway},
 
-		All: {QueryScheduler, QueryFrontend, Querier, Ingester, PatternIngester, Distributor, Ruler, Compactor, DataObjConsumer},
+		All: {QueryScheduler, QueryFrontend, Querier, Ingester, PatternIngester, Distributor, Ruler, Compactor},
 	}
 
 	if t.Cfg.Querier.PerRequestLimitsEnabled {