fix: Do not use directExecutor() for the publish callback when ordering is enabled (#2693)

michaelpri10 · web-flow · commit c7ecd2b5aac2 · 2026-02-17T11:27:17.000-05:00
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -66,6 +66,7 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -569,6 +570,7 @@ public void onFailure(Throwable t) {
         };
 
     ApiFuture<PublishResponse> future;
+    Executor callbackExecutor = directExecutor();
     if (outstandingBatch.orderingKey == null || outstandingBatch.orderingKey.isEmpty()) {
       future = publishCall(outstandingBatch);
     } else {
@@ -581,8 +583,9 @@ public ApiFuture<PublishResponse> call() {
                   return publishCall(outstandingBatch);
                 }
               });
+      callbackExecutor = this.executor;
     }
-    ApiFutures.addCallback(future, futureCallback, directExecutor());
+    ApiFutures.addCallback(future, futureCallback, callbackExecutor);
   }
 
   private final class OutstandingBatch {
