Fix UnRegisterer creation

Signed-off-by: Douglas Camata <[email protected]>
thanos-io · Oct 6, 2022 · 634e2bb · 634e2bb
1 parent 8a5a6d9
commit 634e2bb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cmd/thanos/receive.go b/cmd/thanos/receive.go
@@ -329,7 +329,7 @@ func runReceive(
 			info.WithExemplarsInfoFunc(),
 		)
 
-		srv := grpcserver.New(logger, &receive.UnRegisterer{Registerer: reg}, tracer, grpcLogOpts, tagOpts, comp, grpcProbe,
+		srv := grpcserver.New(logger, receive.NewUnRegisterer(reg), tracer, grpcLogOpts, tagOpts, comp, grpcProbe,
 			grpcserver.WithServer(store.RegisterStoreServer(rw)),
 			grpcserver.WithServer(store.RegisterWritableStoreServer(rw)),
 			grpcserver.WithServer(exemplars.RegisterExemplarsServer(exemplars.NewMultiTSDB(dbs.TSDBExemplars))),

diff --git a/pkg/receive/multitsdb.go b/pkg/receive/multitsdb.go
@@ -490,7 +490,7 @@ func (t *MultiTSDB) TenantStats(statsByLabelName string, tenantIDs ...string) []
 
 func (t *MultiTSDB) startTSDB(logger log.Logger, tenantID string, tenant *tenant) error {
 	reg := prometheus.WrapRegistererWith(prometheus.Labels{"tenant": tenantID}, t.reg)
-	reg = &UnRegisterer{innerReg: reg}
+	reg = NewUnRegisterer(reg)
 
 	lset := labelpb.ExtendSortedLabels(t.labels, labels.FromStrings(t.tenantLabelName, tenantID))
 	dataDir := t.defaultTenantDataDir(tenantID)
@@ -691,6 +691,10 @@ type UnRegisterer struct {
 	innerReg prometheus.Registerer
 }
 
+func NewUnRegisterer(inner prometheus.Registerer) *UnRegisterer {
+	return &UnRegisterer{innerReg: inner}
+}
+
 // Register registers the given collector. If it's already registered, it will
 // be unregistered and registered.
 func (u *UnRegisterer) Register(c prometheus.Collector) error {