refactor: streamline dispatcher

goto · Jul 12, 2024 · c636f27 · c636f27
1 parent 49df13d
commit c636f27
Show file tree

Hide file tree

Showing 78 changed files with 1,310 additions and 2,587 deletions.
diff --git a/cli/deps.go b/cli/deps.go
@@ -165,30 +165,26 @@ func InitDeps(
 	routerRegistry := map[string]notification.Router{
 		notification.RouterReceiver: notification.NewRouterReceiverService(
 			notificationDeps,
-			notifierRegistry,
 		),
 		notification.RouterSubscriber: notification.NewRouterSubscriberService(
 			notificationDeps,
-			notifierRegistry,
-		),
-	}
-
-	dispatchServiceRegistry := map[string]notification.Dispatcher{
-		notification.DispatchKindBulkNotification: notification.NewDispatchBulkNotificationService(
-			notificationDeps,
-			notifierRegistry,
-			routerRegistry,
-		),
-		notification.DispatchKindSingleNotification: notification.NewDispatchSingleNotificationService(
-			notificationDeps,
-			notifierRegistry,
-			routerRegistry,
 		),
 	}
 
 	notificationService := notification.NewService(
 		notificationDeps,
-		dispatchServiceRegistry,
+		routerRegistry,
+		notifierRegistry,
+		// notification.NewDispatchBulkNotificationService(
+		// 	notificationDeps,
+		// 	notifierRegistry,
+		// 	routerRegistry,
+		// ),
+		// notification.NewDispatchSingleNotificationService(
+		// 	notificationDeps,
+		// 	notifierRegistry,
+		// 	routerRegistry,
+		// ),
 	)
 
 	alertService := alert.NewService(

diff --git a/cli/server.go b/cli/server.go
@@ -127,10 +127,6 @@ func StartServer(ctx context.Context, cfg config.Config) error {
 	if err != nil {
 		return err
 	}
-
-	// propagating the config explicitly
-	cfg.Notification.SubscriptionV2Enabled = cfg.Service.SubscriptionV2Enabled
-
 	defer cleanUpTelemetry()
 
 	var queue, dlq notification.Queuer

diff --git a/core/alert/mocks/alert_repository.go b/core/alert/mocks/alert_repository.go
diff --git a/core/alert/mocks/alert_transformer.go b/core/alert/mocks/alert_transformer.go
diff --git a/core/alert/mocks/log_service.go b/core/alert/mocks/log_service.go
diff --git a/core/alert/mocks/notification_service.go b/core/alert/mocks/notification_service.go
diff --git a/core/alert/service.go b/core/alert/service.go
@@ -20,7 +20,7 @@ type LogService interface {
 }
 
 type NotificationService interface {
-	Dispatch(context.Context, []notification.Notification, string) ([]string, error)
+	Dispatch(context.Context, []notification.Notification) ([]string, error)
 }
 
 // Service handles business logic
@@ -78,10 +78,8 @@ func (s *Service) CreateAlerts(ctx context.Context, providerType string, provide
 		}
 
 		// failure on dispatch won't rollback the db changes
-		for _, n := range ns {
-			if _, err := s.notificationService.Dispatch(ctx, []notification.Notification{n}, notification.DispatchKindSingleNotification); err != nil {
-				s.logger.Warn("failed to send alert as notification", "err", err, "notification", n)
-			}
+		if _, err := s.notificationService.Dispatch(ctx, ns); err != nil {
+			s.logger.Warn("failed to send alert as notification", "err", err, "notifications", ns)
 		}
 
 	} else {

diff --git a/core/alert/service_test.go b/core/alert/service_test.go
@@ -134,7 +134,7 @@ func TestService_CreateAlerts(t *testing.T) {
 				}, 1, nil)
 				ar.EXPECT().Create(mock.AnythingOfType("context.todoCtx"), mock.AnythingOfType("alert.Alert")).Return(alert.Alert{ID: 1, ProviderID: 1, ResourceName: "foo", Severity: "CRITICAL", MetricName: "lag", MetricValue: "20",
 					Rule: "lagHigh", TriggeredAt: timenow}, nil)
-				ns.EXPECT().Dispatch(mock.AnythingOfType("context.todoCtx"), mock.AnythingOfType("[]notification.Notification"), mock.AnythingOfType("string")).Return(nil, nil)
+				ns.EXPECT().Dispatch(mock.AnythingOfType("context.todoCtx"), mock.AnythingOfType("[]notification.Notification")).Return(nil, nil)
 			},
 			alertsToBeCreated: alertsToBeCreated,
 			expectedFiringLen: 1,

diff --git a/core/log/mocks/notification_log_repository.go b/core/log/mocks/notification_log_repository.go
diff --git a/core/namespace/mocks/config_syncer.go b/core/namespace/mocks/config_syncer.go
diff --git a/core/namespace/mocks/encryptor.go b/core/namespace/mocks/encryptor.go
diff --git a/core/namespace/mocks/namespace_repository.go b/core/namespace/mocks/namespace_repository.go
diff --git a/core/namespace/mocks/provider_service.go b/core/namespace/mocks/provider_service.go
diff --git a/core/namespace/mocks/transactor.go b/core/namespace/mocks/transactor.go
diff --git a/core/notification/config.go b/core/notification/config.go
@@ -14,9 +14,7 @@ type Config struct {
 	DLQHandler              HandlerConfig `mapstructure:"dlq_handler" yaml:"dlq_handler"`
 	GroupBy                 []string      `mapstructure:"group_by" yaml:"group_by"`
 
-	// experimental: derived from service.Config
-	SubscriptionV2Enabled bool
-	EnableSilenceFeature  bool
+	EnableSilenceFeature bool
 }
 
 type HandlerConfig struct {