@@ -62,10 +62,9 @@ type ParquetBucketStores struct {
6262
6363 inflightRequests * cortex_util.InflightRequestTracker
6464
65- parquetBucketStoreMetrics * ParquetBucketStoreMetrics
66- cortexBucketStoreMetrics * CortexBucketStoreMetrics
67- userScanner users.Scanner
68- shardingStrategy ShardingStrategy
65+ cortexBucketStoreMetrics * CortexBucketStoreMetrics
66+ userScanner users.Scanner
67+ shardingStrategy ShardingStrategy
6968
7069 userTokenBucketsMu sync.RWMutex
7170 userTokenBuckets map [string ]* cortex_util.TokenBucket
@@ -80,18 +79,17 @@ func newParquetBucketStores(cfg tsdb.BlocksStorageConfig, shardingStrategy Shard
8079 }
8180
8281 u := & ParquetBucketStores {
83- logger : logger ,
84- cfg : cfg ,
85- limits : limits ,
86- bucket : cachingBucket ,
87- stores : map [string ]* parquetBucketStore {},
88- storesErrors : map [string ]error {},
89- chunksDecoder : schema .NewPrometheusParquetChunksDecoder (chunkenc .NewPool ()),
90- inflightRequests : cortex_util .NewInflightRequestTracker (),
91- cortexBucketStoreMetrics : NewCortexBucketStoreMetrics (reg ),
92- shardingStrategy : shardingStrategy ,
93- userTokenBuckets : make (map [string ]* cortex_util.TokenBucket ),
94- parquetBucketStoreMetrics : NewParquetBucketStoreMetrics (),
82+ logger : logger ,
83+ cfg : cfg ,
84+ limits : limits ,
85+ bucket : cachingBucket ,
86+ stores : map [string ]* parquetBucketStore {},
87+ storesErrors : map [string ]error {},
88+ chunksDecoder : schema .NewPrometheusParquetChunksDecoder (chunkenc .NewPool ()),
89+ inflightRequests : cortex_util .NewInflightRequestTracker (),
90+ cortexBucketStoreMetrics : NewCortexBucketStoreMetrics (reg ),
91+ shardingStrategy : shardingStrategy ,
92+ userTokenBuckets : make (map [string ]* cortex_util.TokenBucket ),
9593 }
9694 u .userScanner , err = users .NewScanner (cfg .UsersScanner , bucketClient , logger , reg )
9795 if err != nil {
@@ -415,7 +413,6 @@ func (u *ParquetBucketStores) closeEmptyBucketStore(userID string) error {
415413 u .userTokenBucketsMu .Unlock ()
416414 }
417415
418- u .parquetBucketStoreMetrics .RemoveUserRegistry (userID )
419416 return bs .Close ()
420417}
421418
@@ -482,8 +479,6 @@ func (u *ParquetBucketStores) getOrCreateStore(userID string) (*parquetBucketSto
482479 }
483480
484481 u .stores [userID ] = store
485- reg := prometheus .NewRegistry ()
486- u .parquetBucketStoreMetrics .AddUserRegistry (userID , reg )
487482 return store , nil
488483}
489484
0 commit comments