updates

Signed-off-by: Tihomir Surdilovic <tihomir@temporal.io>

Author: tsurdilo

core/src/main/java/io/temporal/samples/autoheartbeat/Starter.java

@@ -91,6 +91,24 @@ public static void main(String[] args) {
     } catch (Exception e) {
       System.out.println("Second run - Workflow exec exception: " + e.getClass().getName());
     }
+
+    System.out.println("\n\n**** Third Run: cause heartbeat timeout");
+    // we disable autoheartbeat via env var
+    System.setProperty("sample.disableAutoHeartbeat", "true");
+    AutoWorkflow thirdRun =
+        client.newWorkflowStub(
+            AutoWorkflow.class,
+            WorkflowOptions.newBuilder()
+                .setWorkflowId(WORKFLOW_ID)
+                .setTaskQueue(TASK_QUEUE)
+                .build());
+
+    try {
+      String thirdRunResult = thirdRun.exec("Auto heartbeating is cool");
+      System.out.println("Third run result: " + thirdRunResult);
+    } catch (Exception e) {
+      System.out.println("Third run - Workflow exec exception: " + e.getClass().getName());
+    }
   }
 
   private static void doSleeps(int seconds) {

core/src/main/java/io/temporal/samples/autoheartbeat/interceptor/AutoHeartbeatActivityInboundCallsInterceptor.java

@@ -36,11 +36,8 @@ public class AutoHeartbeatActivityInboundCallsInterceptor
   private ActivityExecutionContext activityExecutionContext;
   private Duration activityHeartbeatTimeout;
   private AutoHeartbeatUtil autoHeartbeater;
-  //  private CompletableFuture autoHeartbeatFuture;
   private ScheduledFuture scheduledFuture;
 
-  //  private ScheduledFuture scheduledFuture;
-
   public AutoHeartbeatActivityInboundCallsInterceptor(ActivityInboundCallsInterceptor next) {
     super(next);
   }
@@ -56,7 +53,10 @@ public void init(ActivityExecutionContext context) {
   @SuppressWarnings({"FutureReturnValueIgnored", "CatchAndPrintStackTrace"})
   public ActivityOutput execute(ActivityInput input) {
     // If activity has heartbeat timeout defined we want to apply auto-heartbeter
-    if (activityHeartbeatTimeout != null && activityHeartbeatTimeout.getSeconds() > 0) {
+    // Unless we explicitly disabled autoheartbeating via system property
+    if (activityHeartbeatTimeout != null
+        && activityHeartbeatTimeout.getSeconds() > 0
+        && !Boolean.parseBoolean(System.getProperty("sample.disableAutoHeartbeat"))) {
       System.out.println(
           "Auto heartbeating applied for activity: "
               + activityExecutionContext.getInfo().getActivityType());
@@ -82,7 +82,8 @@ public ActivityOutput execute(ActivityInput input) {
                 }
               });
       try {
-        CompletableFuture.anyOf(autoHeartbeatFuture, activityExecFuture).get();
+        return (ActivityOutput)
+            CompletableFuture.anyOf(autoHeartbeatFuture, activityExecFuture).get();
       } catch (Exception e) {
         if (e instanceof ExecutionException) {
           ExecutionException ee = (ExecutionException) e;
@@ -96,8 +97,9 @@ public ActivityOutput execute(ActivityInput input) {
           autoHeartbeater.stop();
         }
       }
+    } else {
+      return super.execute(input);
     }
-    return super.execute(input);
   }
 
   public interface AutoHeartbeaterCancellationCallback {

core/src/main/java/io/temporal/samples/autoheartbeat/workflows/AutoWorkflowImpl.java

@@ -21,8 +21,10 @@
 
 import io.temporal.activity.ActivityCancellationType;
 import io.temporal.activity.ActivityOptions;
+import io.temporal.common.RetryOptions;
 import io.temporal.failure.ActivityFailure;
 import io.temporal.failure.CanceledFailure;
+import io.temporal.failure.TimeoutFailure;
 import io.temporal.samples.autoheartbeat.activities.AutoActivities;
 import io.temporal.workflow.CancellationScope;
 import io.temporal.workflow.Workflow;
@@ -40,6 +42,8 @@ public String exec(String input) {
                 .setStartToCloseTimeout(Duration.ofSeconds(22))
                 .setHeartbeatTimeout(Duration.ofSeconds(8))
                 .setCancellationType(ActivityCancellationType.WAIT_CANCELLATION_COMPLETED)
+                // for sample purposes
+                .setRetryOptions(RetryOptions.newBuilder().setMaximumAttempts(3).build())
                 .build());
 
     AutoActivities activitiesTwo =
@@ -49,6 +53,8 @@ public String exec(String input) {
                 .setStartToCloseTimeout(Duration.ofSeconds(20))
                 .setHeartbeatTimeout(Duration.ofSeconds(7))
                 .setCancellationType(ActivityCancellationType.WAIT_CANCELLATION_COMPLETED)
+                // for sample purposes
+                .setRetryOptions(RetryOptions.newBuilder().setMaximumAttempts(3).build())
                 .build());
 
     // Start our activity in CancellationScope so we can cancel it if needed
@@ -65,6 +71,9 @@ public String exec(String input) {
       if (e.getCause() instanceof CanceledFailure) {
         // We dont want workflow to fail in we canceled our scope, just log and return
         return "Workflow result after activity cancellation";
+      } else if (e.getCause() instanceof TimeoutFailure) {
+        return "Workflow result after activity timeout of type: "
+            + ((TimeoutFailure) e.getCause()).getTimeoutType().name();
       } else {
         throw e;
       }