Make sure workflow options from proxy call are propagated (#2310)

temporalio · Nov 12, 2024 · 83f47ef · 83f47ef
1 parent 24990db
commit 83f47ef
Show file tree

Hide file tree

Showing 3 changed files with 200 additions and 159 deletions.
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/common/InternalUtils.java b/temporal-sdk/src/main/java/io/temporal/internal/common/InternalUtils.java
@@ -75,7 +75,7 @@ public static WorkflowStub createNexusBoundStub(
     }
     WorkflowOptions options = stub.getOptions().get();
     WorkflowOptions.Builder nexusWorkflowOptions =
-        WorkflowOptions.newBuilder()
+        WorkflowOptions.newBuilder(options)
             .setRequestId(request.getRequestId())
             .setCompletionCallbacks(
                 Arrays.asList(

diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/nexus/AsyncWorkflowOperationTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/nexus/AsyncWorkflowOperationTest.java
@@ -35,6 +35,8 @@
 import org.junit.Test;
 
 public class AsyncWorkflowOperationTest extends BaseNexusTest {
+  private static final String WORKFLOW_ID_PREFIX = "test-prefix";
+
   @Rule
   public SDKTestWorkflowRule testWorkflowRule =
       SDKTestWorkflowRule.newBuilder()
@@ -86,6 +88,7 @@ public String execute(String input) {
       Assert.assertTrue("Operation id should be present", asyncExec.getOperationId().isPresent());
       // Result should only be completed if the operation is completed
       Assert.assertFalse("Result should not be completed", asyncOpHandle.getResult().isCompleted());
+      Assert.assertTrue(asyncExec.getOperationId().get().startsWith(WORKFLOW_ID_PREFIX));
       // Unblock the operation
       Workflow.newExternalWorkflowStub(OperationWorkflow.class, asyncExec.getOperationId().get())
           .unblock();
@@ -129,7 +132,9 @@ public OperationHandler<String, String> operation() {
           (context, details, client, input) ->
               client.newWorkflowStub(
                       OperationWorkflow.class,
-                      WorkflowOptions.newBuilder().setWorkflowId(details.getRequestId()).build())
+                      WorkflowOptions.newBuilder()
+                          .setWorkflowId(WORKFLOW_ID_PREFIX + details.getRequestId())
+                          .build())
                   ::execute);
     }
   }