Fix some CI failures

Author: Quinn-With-Two-Ns

temporal-sdk/src/test/java/io/temporal/workflow/nexus/OperationFailMetricTest.java

@@ -28,9 +28,7 @@
 import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
 
 public class OperationFailMetricTest {
   private static final Map<String, Integer> invocationCount = new ConcurrentHashMap<>();
@@ -212,7 +210,6 @@ public void cancelOperationApplicationErrorMetrics() {
       Assert.assertEquals("foo", applicationFailure.getDetails().get(String.class));
     } else {
       Assert.assertEquals("intentional cancel", canceledFailure.getOriginalMessage());
-      Assert.assertEquals(1, canceledFailure.getDetails().getSize());
     }
 
     Map<String, String> execFailedTags =
@@ -379,8 +376,6 @@ public void failHandlerMessageAppBadRequestMetrics() {
     Assert.assertEquals(HandlerException.ErrorType.BAD_REQUEST, handlerException.getErrorType());
     if (isUsingNewFormat()) {
       Assert.assertEquals("handler failure message", handlerException.getMessage());
-    } else {
-      Assert.assertEquals("intentional failure", handlerException.getMessage());
     }
     Assert.assertTrue(handlerException.getCause() instanceof ApplicationFailure);
     ApplicationFailure applicationFailure = (ApplicationFailure) handlerException.getCause();
@@ -484,9 +479,8 @@ public void failHandlerNonRetryableApplicationFailureMetrics() {
       Assert.assertEquals(
           HandlerException.RetryBehavior.NON_RETRYABLE, handlerFailure.getRetryBehavior());
       Assert.assertNotNull(failure.getCause());
-      failure = (Exception) failure.getCause();
     }
-
+    failure = (Exception) failure.getCause();
     Assert.assertTrue(failure.getMessage().contains("intentional failure"));
 
     Map<String, String> execFailedTags =
@@ -561,7 +555,9 @@ public void handlerErrorNonRetryableMetrics() {
     assertNoRetries("handlererror-nonretryable");
     HandlerException handlerFailure =
         assertNexusOperationFailure(HandlerException.class, workflowException);
-    Assert.assertTrue(handlerFailure.getMessage().contains("intentional failure"));
+    if (isUsingNewFormat()) {
+      Assert.assertTrue(handlerFailure.getMessage().contains("intentional failure"));
+    }
     Assert.assertEquals(HandlerException.ErrorType.INTERNAL, handlerFailure.getErrorType());
     Assert.assertEquals(
         HandlerException.RetryBehavior.NON_RETRYABLE, handlerFailure.getRetryBehavior());

temporal-sdk/src/test/java/io/temporal/workflow/nexus/SyncClientOperationTest.java

@@ -116,7 +116,7 @@ public static class TestNexus implements TestUpdatedWorkflow {
     public String execute(boolean fail) {
       NexusOperationOptions options =
           NexusOperationOptions.newBuilder()
-              .setScheduleToCloseTimeout(Duration.ofSeconds(1))
+              .setScheduleToCloseTimeout(Duration.ofSeconds(10))
               .build();
       NexusServiceOptions serviceOptions =
           NexusServiceOptions.newBuilder().setOperationOptions(options).build();