Fix deadlock detection error message to reflect user-configured timeout (#2934)

Author: dplyukhin

temporal-sdk/src/main/java/io/temporal/internal/sync/PotentialDeadlockException.java

@@ -26,17 +26,30 @@ public class PotentialDeadlockException extends RuntimeException {
    * @param threadName name of the thread that is in a potential deadlock state
    * @param workflowThreadContext context of the thread that is in a potential deadlock state
    * @param detectionTimestamp a timestamp the deadlock was detected
+   * @param timeoutMillis configured deadlock detection timeout in milliseconds
    */
   PotentialDeadlockException(
-      String threadName, WorkflowThreadContext workflowThreadContext, long detectionTimestamp) {
+      String threadName,
+      WorkflowThreadContext workflowThreadContext,
+      long detectionTimestamp,
+      long timeoutMillis) {
     super(
         "[TMPRL1101] Potential deadlock detected. Workflow thread \""
             + threadName
-            + "\" didn't yield control for over a second.");
+            + "\" didn't yield control for over "
+            + formatTimeout(timeoutMillis)
+            + ".");
     this.workflowThreadContext = workflowThreadContext;
     this.detectionTimestamp = detectionTimestamp;
   }
 
+  private static String formatTimeout(long timeoutMillis) {
+    if (timeoutMillis % 1000 == 0) {
+      return timeoutMillis / 1000 + "s";
+    }
+    return timeoutMillis + "ms";
+  }
+
   /**
    * @param triggerThreadStackTrace stacktrace of the thread that triggered the Deadlock Detector
    * @param otherThreadsDump stack dump of other threads of the workflow excluding the thread that

temporal-sdk/src/main/java/io/temporal/internal/sync/WorkflowThreadContext.java

@@ -238,14 +238,16 @@ public boolean runUntilBlocked(long deadlockDetectionTimeoutMs) {
       if (WorkflowThreadScheduler.WaitForYieldResult.DEADLOCK_DETECTED.equals(yieldResult)) {
         long detectionTimestamp = System.currentTimeMillis();
         if (currentThread != null) {
-          throw new PotentialDeadlockException(currentThread.getName(), this, detectionTimestamp);
+          throw new PotentialDeadlockException(
+              currentThread.getName(), this, detectionTimestamp, deadlockDetectionTimeoutMs);
         } else {
           // This should never happen.
           // We clear currentThread only after setting the status to DONE.
           // And we check for it by the status condition check after waking up on the condition
           // and acquiring the lock back
           log.warn("Illegal State: WorkflowThreadContext has no currentThread in {} state", status);
-          throw new PotentialDeadlockException("UnknownThread", this, detectionTimestamp);
+          throw new PotentialDeadlockException(
+              "UnknownThread", this, detectionTimestamp, deadlockDetectionTimeoutMs);
         }
       }
       Preconditions.checkState(

temporal-sdk/src/test/java/io/temporal/workflow/deadlockdetector/DeadlockDetectorTest.java

@@ -78,6 +78,7 @@ public void testDefaultDeadlockDetector() {
         failure = failure.getCause();
       }
       assertTrue(failure.getMessage().contains("Potential deadlock detected"));
+      assertTrue(failure.getMessage().contains("1s"));
       assertTrue(failure.getMessage().contains("Workflow.await"));
     }
   }
@@ -100,6 +101,7 @@ public void testSetDeadlockDetector() {
         failure = failure.getCause();
       }
       assertTrue(failure.getMessage().contains("Potential deadlock detected"));
+      assertTrue(failure.getMessage().contains("500ms"));
       assertTrue(failure.getMessage().contains("Workflow.await"));
     }
   }