diff --git a/pkg/distributor/distributor.go b/pkg/distributor/distributor.go index c596ca15b34..01f0838a7f2 100644 --- a/pkg/distributor/distributor.go +++ b/pkg/distributor/distributor.go @@ -445,6 +445,7 @@ func New(cfg Config, clientConfig ingester_client.Config, limits *validation.Ove // newRingAndLifecycler creates a new distributor ring and lifecycler with all required lifecycler delegates func newRingAndLifecycler(cfg RingConfig, instanceCount *atomic.Uint32, logger log.Logger, reg prometheus.Registerer) (*ring.Ring, *ring.BasicLifecycler, error) { + reg = prometheus.WrapRegistererWithPrefix("cortex_", reg) kvStore, err := kv.NewClient(cfg.KVStore, ring.GetCodec(), kv.RegistererWithKVName(reg, "distributor-lifecycler"), logger) if err != nil { return nil, nil, errors.Wrap(err, "failed to initialize distributors' KV store") @@ -461,12 +462,12 @@ func newRingAndLifecycler(cfg RingConfig, instanceCount *atomic.Uint32, logger l delegate = ring.NewLeaveOnStoppingDelegate(delegate, logger) delegate = ring.NewAutoForgetDelegate(ringAutoForgetUnhealthyPeriods*cfg.HeartbeatTimeout, delegate, logger) - distributorsLifecycler, err := ring.NewBasicLifecycler(lifecyclerCfg, "distributor", distributorRingKey, kvStore, delegate, logger, prometheus.WrapRegistererWithPrefix("cortex_", reg)) + distributorsLifecycler, err := ring.NewBasicLifecycler(lifecyclerCfg, "distributor", distributorRingKey, kvStore, delegate, logger, reg) if err != nil { return nil, nil, errors.Wrap(err, "failed to initialize distributors' lifecycler") } - distributorsRing, err := ring.New(cfg.ToRingConfig(), "distributor", distributorRingKey, logger, prometheus.WrapRegistererWithPrefix("cortex_", reg)) + distributorsRing, err := ring.New(cfg.ToRingConfig(), "distributor", distributorRingKey, logger, reg) if err != nil { return nil, nil, errors.Wrap(err, "failed to initialize distributors' ring client") } diff --git a/pkg/scheduler/schedulerdiscovery/ring.go b/pkg/scheduler/schedulerdiscovery/ring.go index 5a5bc61619a..2264f9f4a5d 100644 --- a/pkg/scheduler/schedulerdiscovery/ring.go +++ b/pkg/scheduler/schedulerdiscovery/ring.go @@ -113,6 +113,7 @@ func (cfg *RingConfig) ToRingConfig() ring.Config { // NewRingLifecycler creates a new query-scheduler ring lifecycler with all required lifecycler delegates. func NewRingLifecycler(cfg RingConfig, logger log.Logger, reg prometheus.Registerer) (*ring.BasicLifecycler, error) { + reg = prometheus.WrapRegistererWithPrefix("cortex_", reg) kvStore, err := kv.NewClient(cfg.KVStore, ring.GetCodec(), kv.RegistererWithKVName(reg, "query-scheduler-lifecycler"), logger) if err != nil { return nil, errors.Wrap(err, "failed to initialize query-schedulers' KV store") @@ -128,7 +129,7 @@ func NewRingLifecycler(cfg RingConfig, logger log.Logger, reg prometheus.Registe delegate = ring.NewLeaveOnStoppingDelegate(delegate, logger) delegate = ring.NewAutoForgetDelegate(ringAutoForgetUnhealthyPeriods*cfg.HeartbeatTimeout, delegate, logger) - lifecycler, err := ring.NewBasicLifecycler(lifecyclerCfg, "query-scheduler", ringKey, kvStore, delegate, logger, prometheus.WrapRegistererWithPrefix("cortex_", reg)) + lifecycler, err := ring.NewBasicLifecycler(lifecyclerCfg, "query-scheduler", ringKey, kvStore, delegate, logger, reg) if err != nil { return nil, errors.Wrap(err, "failed to initialize query-schedulers' lifecycler") }