feat: build at-least once semantics into event hook delivery by (1) persisting events into a partitioned outbox table and (2) sourcing the events from this table thanks the new OutboxDrain class. To keep the implementation simple, the first failed event of an event hook is retried every so often: OutboxDrain will not progress onto the next event until the failed event is delivered (TODO: figure out what to do if the event backlog grows too big).

replace thread-per-request model with non-blocking event loop

deprecate all event hook targets except web given the absence of test coverage

Author: cjmamo

…/eventhook/ReloadEventHookListeners.java …sp/dhis/eventhook/OnEventHookChange.javadhis-2/dhis-api/src/main/java/org/hisp/dhis/eventhook/ReloadEventHookListeners.java renamed to dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventhook/OnEventHookChange.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventhook/ReloadEventHookListeners.java renamed to dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventhook/OnEventHookChange.java

@@ -35,4 +35,4 @@
  *
  * @author Morten Olav Hansen
  */
-public class ReloadEventHookListeners {}
+public class OnEventHookChange {}

…his/eventhook/targets/ConsoleTarget.java …a/org/hisp/dhis/eventhook/OutboxLog.javadhis-2/dhis-api/src/main/java/org/hisp/dhis/eventhook/targets/ConsoleTarget.java renamed to dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventhook/OutboxLog.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventhook/targets/ConsoleTarget.java renamed to dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventhook/OutboxLog.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2022, University of Oslo
+ * Copyright (c) 2004-2026, University of Oslo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,30 +27,27 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.hisp.dhis.eventhook.targets;
+package org.hisp.dhis.eventhook;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.EqualsAndHashCode;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
-import lombok.experimental.Accessors;
-import org.hisp.dhis.common.CodeGenerator;
-import org.hisp.dhis.eventhook.Target;
 
-/**
- * @author Morten Olav Hansen
- */
+@Entity
+@Table(name = "outboxlog")
+@NoArgsConstructor
 @Getter
 @Setter
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-public class ConsoleTarget extends Target {
-  public static final String TYPE = "console";
+public class OutboxLog {
 
-  @JsonProperty(required = true)
-  private String clientId = "dhis2-console-" + CodeGenerator.generateUid();
+  @Id
+  @Column(name = "outboxtablename")
+  private String outboxTableName;
 
-  public ConsoleTarget() {
-    super(TYPE);
-  }
+  @Column(name = "lastprocessedid")
+  private long lastProcessedId;
 }

dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventhook/Target.java

@@ -39,9 +39,6 @@
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import org.hisp.dhis.eventhook.targets.ConsoleTarget;
-import org.hisp.dhis.eventhook.targets.JmsTarget;
-import org.hisp.dhis.eventhook.targets.KafkaTarget;
 import org.hisp.dhis.eventhook.targets.WebhookTarget;
 
 /**
@@ -58,9 +55,6 @@
     property = "type")
 @JsonSubTypes({
   @JsonSubTypes.Type(value = WebhookTarget.class, name = WebhookTarget.TYPE),
-  @JsonSubTypes.Type(value = ConsoleTarget.class, name = ConsoleTarget.TYPE),
-  @JsonSubTypes.Type(value = JmsTarget.class, name = JmsTarget.TYPE),
-  @JsonSubTypes.Type(value = KafkaTarget.class, name = KafkaTarget.TYPE)
 })
 public abstract class Target implements Serializable {
   @JsonCreator

dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventhook/targets/KafkaTarget.java

@@ -35,7 +35,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import lombok.experimental.Accessors;
 import org.hisp.dhis.common.CodeGenerator;
 import org.hisp.dhis.common.auth.AuthScheme;
 import org.hisp.dhis.eventhook.Target;
@@ -46,7 +45,6 @@
 @Getter
 @Setter
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
 public class WebhookTarget extends Target {
   public static final String TYPE = "webhook";
 

dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventhook/targets/WebhookTarget.java

@@ -126,7 +126,8 @@ public enum JobType {
   REMOVE_USED_OR_EXPIRED_RESERVED_VALUES(
       daily2am("uwWCT2BMmlq", "Remove expired or used reserved values")),
   SYSTEM_VERSION_UPDATE_CHECK(
-      dailyRandomBetween3and5("vt21671bgno", "System version update check notification"));
+      dailyRandomBetween3and5("vt21671bgno", "System version update check notification")),
+  OUTBOX_ROTATION(every(1800, "zHKNyGk7zHl", "Outbox rotation"));
 
   /**
    * Any {@link JobType} which has a default will ensure that the {@link JobConfiguration} for that

dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/JobType.java

@@ -39,6 +39,7 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 
 /**
@@ -48,6 +49,7 @@
 public class ServiceConfig {
 
   @Bean("taskScheduler")
+  @Primary
   public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
     ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
     threadPoolTaskScheduler.setPoolSize(25);

dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/config/ServiceConfig.java

@@ -34,7 +34,7 @@
 import org.hisp.dhis.dxf2.metadata.objectbundle.ObjectBundle;
 import org.hisp.dhis.eventhook.EventHook;
 import org.hisp.dhis.eventhook.EventHookSecretManager;
-import org.hisp.dhis.eventhook.ReloadEventHookListeners;
+import org.hisp.dhis.eventhook.OnEventHookChange;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 
@@ -61,6 +61,6 @@ public void preUpdate(EventHook eventHook, EventHook persistedObject, ObjectBund
   @Override
   public <E extends EventHook> void postTypeImport(
       Class<E> klass, List<E> objects, ObjectBundle bundle) {
-    publisher.publishEvent(new ReloadEventHookListeners());
+    publisher.publishEvent(new OnEventHookChange());
   }
 }

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/EventHookObjectBundleHook.java

@@ -27,10 +27,6 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-field-filtering</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-system</artifactId>
-    </dependency>
     <!-- Application -->
     <dependency>
       <groupId>org.springframework</groupId>
@@ -50,11 +46,30 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-jms</artifactId>
+      <artifactId>spring-web</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
+      <artifactId>spring-jdbc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webflux</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.reactivestreams</groupId>
+      <artifactId>reactive-streams</artifactId>
+      <version>1.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>io.projectreactor</groupId>
+      <artifactId>reactor-core</artifactId>
+      <version>3.7.7</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.persistence</groupId>
+      <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -81,26 +96,10 @@
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>artemis-jakarta-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.kafka</groupId>
-      <artifactId>kafka-clients</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.jasypt</groupId>
       <artifactId>jasypt</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents.client5</groupId>
-      <artifactId>httpclient5</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents.core5</groupId>
-      <artifactId>httpcore5</artifactId>
-    </dependency>
 
     <!-- Test -->
     <dependency>

dhis-2/dhis-services/dhis-service-event-hook/pom.xml

@@ -42,19 +42,19 @@
 @Data
 @Builder
 public class EventHookContext {
-  @Builder.Default Map<String, List<Handler>> targets = new HashMap<>();
+  @Builder.Default Map<String, List<ReactiveHandler>> targets = new HashMap<>();
 
   @Builder.Default List<EventHook> eventHooks = new ArrayList<>();
 
   public boolean hasTarget(String uid) {
     return targets.containsKey(uid) || targets.get(uid).isEmpty();
   }
 
-  public List<Handler> getTarget(String uid) {
+  public List<ReactiveHandler> getTarget(String uid) {
     return targets.get(uid);
   }
 
   public void closeTargets() {
-    targets.values().forEach(handlers -> handlers.forEach(Handler::close));
+    targets.values().forEach(handlers -> handlers.forEach(ReactiveHandler::close));
   }
 }