Fixed integ tests

Signed-off-by: Rohan Gupta <[email protected]>

Author: rohang98

pkg/ruler/manager.go

@@ -107,9 +107,7 @@ func (r *DefaultMultiTenantManager) SyncRuleGroups(ctx context.Context, ruleGrou
 			go mngr.Stop()
 			delete(r.userManagers, userID)
 
-			if n := r.removeNotifier(userID); n != nil {
-				n.stop()
-			}
+			r.removeNotifier(userID)
 			r.mapper.cleanupUser(userID)
 			r.lastReloadSuccessful.DeleteLabelValues(userID)
 			r.lastReloadSuccessfulTimestamp.DeleteLabelValues(userID)
@@ -171,27 +169,26 @@ func (r *DefaultMultiTenantManager) newManager(ctx context.Context, userID strin
 	reg := prometheus.NewRegistry()
 	r.userManagerMetrics.AddUserRegistry(userID, reg)
 
-	notifier, err := r.getOrCreateNotifier(userID, reg)
+	notifier, err := r.getOrCreateNotifier(userID)
 	if err != nil {
 		return nil, err
 	}
 
 	return r.managerFactory(ctx, userID, notifier, r.logger, reg), nil
 }
 
-func (r *DefaultMultiTenantManager) removeNotifier(userID string) *rulerNotifier {
+func (r *DefaultMultiTenantManager) removeNotifier(userID string) error {
 	r.notifiersMtx.Lock()
 	defer r.notifiersMtx.Unlock()
 
-	n, ok := r.notifiers[userID]
-	if !ok {
-		return nil
+	if n, ok := r.notifiers[userID]; ok {
+		n.stop()
 	}
 	delete(r.notifiers, userID)
-	return n
+	return nil
 }
 
-func (r *DefaultMultiTenantManager) getOrCreateNotifier(userID string, userManagerRegistry prometheus.Registerer) (*notifier.Manager, error) {
+func (r *DefaultMultiTenantManager) getOrCreateNotifier(userID string) (*notifier.Manager, error) {
 	r.notifiersMtx.Lock()
 	defer r.notifiersMtx.Unlock()
 
@@ -200,7 +197,7 @@ func (r *DefaultMultiTenantManager) getOrCreateNotifier(userID string, userManag
 		return n.notifier, nil
 	}
 
-	reg := prometheus.WrapRegistererWith(prometheus.Labels{"user": userID}, userManagerRegistry)
+	reg := prometheus.WrapRegistererWith(prometheus.Labels{"user": userID}, r.registry)
 	reg = prometheus.WrapRegistererWithPrefix("cortex_", reg)
 	n = newRulerNotifier(&notifier.Options{
 		QueueCapacity: r.cfg.NotificationQueueCapacity,

pkg/ruler/ruler_test.go

@@ -274,7 +274,7 @@ func TestNotifierSendsUserIDHeader(t *testing.T) {
 	defer rcleanup()
 	defer manager.Stop()
 
-	n, err := manager.getOrCreateNotifier("1", manager.registry)
+	n, err := manager.getOrCreateNotifier("1")
 	require.NoError(t, err)
 
 	// Loop until notifier discovery syncs up