Fix timeout calculation for operation-timeout header

Author: bergundy

temporal-sdk/src/test/java/io/temporal/workflow/updateTest/UpdateWithStartTest.java

@@ -645,7 +645,8 @@ public void failWhenUpdateNamesDoNotMatch() {
     }
   }
 
-  @SuppressWarnings("deprecation") // Backwards compatibility for WORKFLOW_ID_REUSE_POLICY_TERMINATE_IF_RUNNING
+  @SuppressWarnings(
+      "deprecation") // Backwards compatibility for WORKFLOW_ID_REUSE_POLICY_TERMINATE_IF_RUNNING
   @Test
   public void failServerSideWhenStartIsInvalid() {
     WorkflowClient workflowClient = testWorkflowRule.getWorkflowClient();

temporal-test-server/src/main/java/io/temporal/internal/testservice/TestWorkflowService.java

@@ -978,39 +978,27 @@ public void pollNexusTaskQueue(
 
         Timestamp scheduledTime = req.getScheduledTime();
         Timestamp currentTime = store.currentTime();
-        long elapsedSeconds = Timestamps.between(scheduledTime, currentTime).getSeconds();
-        long elapsedMillis = elapsedSeconds * 1000;
+        long elapsedMillis =
+            com.google.protobuf.util.Durations.toMillis(
+                Timestamps.between(scheduledTime, currentTime));
 
         // Calculate minimum of all applicable timeouts
         Long remainingMillis = null;
 
-        if (!isStarted && scheduledEvent.hasScheduleToStartTimeout()) {
-          long scheduleToStartMillis =
-              com.google.protobuf.util.Durations.toMillis(
-                  scheduledEvent.getScheduleToStartTimeout());
-          if (scheduleToStartMillis > 0) {
-            long remaining = scheduleToStartMillis - elapsedMillis;
-            remainingMillis =
-                (remainingMillis == null) ? remaining : Math.min(remainingMillis, remaining);
-          }
-        }
-
         if (scheduledEvent.hasStartToCloseTimeout()) {
           long startToCloseMillis =
               com.google.protobuf.util.Durations.toMillis(scheduledEvent.getStartToCloseTimeout());
           if (startToCloseMillis > 0) {
-            long remaining = startToCloseMillis - elapsedMillis;
-            remainingMillis =
-                (remainingMillis == null) ? remaining : Math.min(remainingMillis, remaining);
+            remainingMillis = startToCloseMillis;
           }
         }
-
         if (scheduledEvent.hasScheduleToCloseTimeout()) {
           long scheduleToCloseMillis =
               com.google.protobuf.util.Durations.toMillis(
                   scheduledEvent.getScheduleToCloseTimeout());
           if (scheduleToCloseMillis > 0) {
-            long remaining = scheduleToCloseMillis - elapsedMillis;
+            // Ensure the value is positive.
+            long remaining = Math.max(1, scheduleToCloseMillis - elapsedMillis);
             remainingMillis =
                 (remainingMillis == null) ? remaining : Math.min(remainingMillis, remaining);
           }

temporal-test-server/src/test/java/io/temporal/testserver/functional/NexusWorkflowTest.java

@@ -742,9 +742,10 @@ public void testNexusOperationScheduleToStartTimeout() {
           "OPERATION_TIMEOUT should end with 'ms'", operationTimeoutHeader.endsWith("ms"));
       long operationTimeoutMs =
           Long.parseLong(operationTimeoutHeader.substring(0, operationTimeoutHeader.length() - 2));
-      // Should be <= schedule-to-start timeout (1 second = 1000ms)
+      // Should be <= schedule-to-close timeout (30 seconds = 30000ms)
+      // Note: schedule-to-start timeout is not reflected in the operation-timeout header
       Assert.assertTrue(
-          "OPERATION_TIMEOUT should be <= schedule-to-start timeout", operationTimeoutMs <= 1000);
+          "OPERATION_TIMEOUT should be <= schedule-to-close timeout", operationTimeoutMs <= 30000);
       Assert.assertTrue("OPERATION_TIMEOUT should be positive", operationTimeoutMs > 0);
 
       // Sleep longer than schedule-to-start timeout to trigger the timeout