From bd9580b4efe42244df7ae5762bc773487afe1ffa Mon Sep 17 00:00:00 2001
From: Vishal Egbert <vishal.egbert@thetradedesk.com>
Date: Tue, 19 Mar 2024 19:04:24 +1100
Subject: [PATCH 1/5] Add debug logs

---
 .../com/uid2/optout/vertx/OptOutSender.java   | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/uid2/optout/vertx/OptOutSender.java b/src/main/java/com/uid2/optout/vertx/OptOutSender.java
index 81e08c8..cd7fe26 100644
--- a/src/main/java/com/uid2/optout/vertx/OptOutSender.java
+++ b/src/main/java/com/uid2/optout/vertx/OptOutSender.java
@@ -404,11 +404,29 @@ private void deltaReplay(Promise<Void> promise, OptOutCollection store, List<Str
             String filenames = String.join(",", fileList);
 
             // sequentially send each entry
-            Future<Void> lastOp = Future.succeededFuture();
+            var ref = new Object() {
+                Future<Void> lastOp = Future.succeededFuture();
+            };
+
+            List<Future<Void>> sendOps = new ArrayList<Future<Void>>();
+
+            long periodicId = this.vertx.setPeriodic(1000, l -> {
+                int completeSendOps = 0;
+                for (Future<Void> sendOp : sendOps) {
+                    if (sendOp.isComplete()) {
+                        completeSendOps++;
+                    }
+                }
+
+                this.logger.info("Completed " + completeSendOps + " send ops out of " + sendOps.size());
+                this.logger.info("LastOp is complete: " + ref.lastOp.isComplete());
+            });
+
             for (int i = 0; i < store.size(); ++i) {
                 final OptOutEntry entry = store.get(i);
-                lastOp = lastOp.compose(ar -> {
+                ref.lastOp = ref.lastOp.compose(ar -> {
                     Future<Void> sendOp = this.remotePartner.send(entry);
+                    sendOps.add(sendOp);
                     return sendOp.onComplete(v -> {
                         if (v.succeeded()) {
                             recordEntryReplayStatus("success");
@@ -428,7 +446,8 @@ private void deltaReplay(Promise<Void> promise, OptOutCollection store, List<Str
                 });
             }
 
-            lastOp.onComplete(ar -> {
+            ref.lastOp.onComplete(ar -> {
+                this.vertx.cancelTimer(periodicId);
                 if (ar.failed()) {
                     this.logger.error("deltaReplay failed sending delta " + filenames + " to remote: " + this.remotePartner.name(), ar.cause());
                     this.logger.error("deltaReplay has " + this.pendingFilesCount.get() + " pending file");

From 62d54a81c4c532af9b15370e6817905a007b31c4 Mon Sep 17 00:00:00 2001
From: Release Workflow <unifiedid-admin+release@thetradedesk.com>
Date: Tue, 19 Mar 2024 08:06:35 +0000
Subject: [PATCH 2/5] [CI Pipeline] Released Snapshot version: 2.9.3-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0def54a..20d3ae4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-optout</artifactId>
-    <version>2.9.0-685b9893b7</version>
+    <version>2.9.3-SNAPSHOT</version>
 
     <name>uid2-optout</name>
     <url>https://github.com/IABTechLab/uid2-optout</url>

From 104092b5d6c9de990bc417ae715f3759183eafa2 Mon Sep 17 00:00:00 2001
From: Release Workflow <unifiedid-admin+release@thetradedesk.com>
Date: Tue, 19 Mar 2024 08:10:57 +0000
Subject: [PATCH 3/5] [CI Pipeline] Released Snapshot version: 2.9.4-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 20d3ae4..2bfae2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-optout</artifactId>
-    <version>2.9.3-SNAPSHOT</version>
+    <version>2.9.4-SNAPSHOT</version>
 
     <name>uid2-optout</name>
     <url>https://github.com/IABTechLab/uid2-optout</url>

From 9e66be6c566093b14b01bd0f15b64542020470b6 Mon Sep 17 00:00:00 2001
From: Vishal Egbert <vishal.egbert@thetradedesk.com>
Date: Mon, 25 Mar 2024 10:10:15 +1100
Subject: [PATCH 4/5] Add timeout

---
 src/main/java/com/uid2/optout/vertx/OptOutSender.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/uid2/optout/vertx/OptOutSender.java b/src/main/java/com/uid2/optout/vertx/OptOutSender.java
index cd7fe26..fd4cb0d 100644
--- a/src/main/java/com/uid2/optout/vertx/OptOutSender.java
+++ b/src/main/java/com/uid2/optout/vertx/OptOutSender.java
@@ -29,6 +29,7 @@
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
@@ -426,6 +427,7 @@ private void deltaReplay(Promise<Void> promise, OptOutCollection store, List<Str
                 final OptOutEntry entry = store.get(i);
                 ref.lastOp = ref.lastOp.compose(ar -> {
                     Future<Void> sendOp = this.remotePartner.send(entry);
+                    sendOp.timeout(1, TimeUnit.MINUTES);
                     sendOps.add(sendOp);
                     return sendOp.onComplete(v -> {
                         if (v.succeeded()) {

From 9b8f18c20115fb2853115a8543972b7fd5288a13 Mon Sep 17 00:00:00 2001
From: Release Workflow <unifiedid-admin+release@thetradedesk.com>
Date: Sun, 24 Mar 2024 23:13:17 +0000
Subject: [PATCH 5/5] [CI Pipeline] Released Snapshot version: 2.9.6-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2bfae2e..a08f8bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-optout</artifactId>
-    <version>2.9.4-SNAPSHOT</version>
+    <version>2.9.6-SNAPSHOT</version>
 
     <name>uid2-optout</name>
     <url>https://github.com/IABTechLab/uid2-optout</url>