Set LastHeartbeatDetails on activity failure (#2354)

Author: Quinn-With-Two-Ns

temporal-sdk/src/main/java/io/temporal/internal/activity/ActivityExecutionContextFactory.java

@@ -21,8 +21,7 @@
 package io.temporal.internal.activity;
 
 import com.uber.m3.tally.Scope;
-import io.temporal.activity.ActivityExecutionContext;
 
 public interface ActivityExecutionContextFactory {
-  ActivityExecutionContext createContext(ActivityInfoInternal info, Scope metricsScope);
+  InternalActivityExecutionContext createContext(ActivityInfoInternal info, Scope metricsScope);
 }

temporal-sdk/src/main/java/io/temporal/internal/activity/ActivityExecutionContextFactoryImpl.java

@@ -21,7 +21,6 @@
 package io.temporal.internal.activity;
 
 import com.uber.m3.tally.Scope;
-import io.temporal.activity.ActivityExecutionContext;
 import io.temporal.common.converter.DataConverter;
 import io.temporal.internal.client.external.ManualActivityCompletionClientFactory;
 import io.temporal.serviceclient.WorkflowServiceStubs;
@@ -61,7 +60,8 @@ public ActivityExecutionContextFactoryImpl(
   }
 
   @Override
-  public ActivityExecutionContext createContext(ActivityInfoInternal info, Scope metricsScope) {
+  public InternalActivityExecutionContext createContext(
+      ActivityInfoInternal info, Scope metricsScope) {
     return new ActivityExecutionContextImpl(
         service,
         namespace,

temporal-sdk/src/main/java/io/temporal/internal/activity/ActivityExecutionContextImpl.java

@@ -45,7 +45,7 @@
  * @see ActivityExecutionContext
  */
 @ThreadSafe
-class ActivityExecutionContextImpl implements ActivityExecutionContext {
+class ActivityExecutionContextImpl implements InternalActivityExecutionContext {
   private final Lock lock = new ReentrantLock();
   private final ManualActivityCompletionClientFactory manualCompletionClientFactory;
   private final Functions.Proc completionHandle;
@@ -165,4 +165,9 @@ public Scope getMetricsScope() {
   public ActivityInfo getInfo() {
     return info;
   }
+
+  @Override
+  public Object getLastHeartbeatValue() {
+    return heartbeatContext.getLastHeartbeatDetails();
+  }
 }

temporal-sdk/src/main/java/io/temporal/internal/activity/ActivityTaskExecutors.java

@@ -23,7 +23,6 @@
 import static io.temporal.internal.activity.ActivityTaskHandlerImpl.mapToActivityFailure;
 
 import com.uber.m3.tally.Scope;
-import io.temporal.activity.ActivityExecutionContext;
 import io.temporal.activity.ActivityInfo;
 import io.temporal.activity.DynamicActivity;
 import io.temporal.api.common.v1.Payload;
@@ -76,7 +75,8 @@ public BaseActivityTaskExecutor(
 
     @Override
     public ActivityTaskHandler.Result execute(ActivityInfoInternal info, Scope metricsScope) {
-      ActivityExecutionContext context = executionContextFactory.createContext(info, metricsScope);
+      InternalActivityExecutionContext context =
+          executionContextFactory.createContext(info, metricsScope);
       ActivityInfo activityInfo = context.getInfo();
       ActivitySerializationContext serializationContext =
           new ActivitySerializationContext(
@@ -133,7 +133,12 @@ public ActivityTaskHandler.Result execute(ActivityInfoInternal info, Scope metri
         }
 
         return mapToActivityFailure(
-            ex, info.getActivityId(), metricsScope, local, dataConverterWithActivityContext);
+            ex,
+            info.getActivityId(),
+            context.getLastHeartbeatValue(),
+            metricsScope,
+            local,
+            dataConverterWithActivityContext);
       }
     }
 

temporal-sdk/src/main/java/io/temporal/internal/activity/ActivityTaskHandlerImpl.java

@@ -137,7 +137,12 @@ public Result handle(ActivityTask activityTask, Scope metricsScope, boolean loca
               + knownTypes);
     } catch (Exception exception) {
       return mapToActivityFailure(
-          exception, pollResponse.getActivityId(), metricsScope, localActivity, dataConverter);
+          exception,
+          pollResponse.getActivityId(),
+          null,
+          metricsScope,
+          localActivity,
+          dataConverter);
     }
   }
 
@@ -186,6 +191,7 @@ private void registerActivityImplementation(Object activity) {
   static ActivityTaskHandler.Result mapToActivityFailure(
       Throwable exception,
       String activityId,
+      @Nullable Object lastHeartbeatDetails,
       Scope metricsScope,
       boolean isLocalActivity,
       DataConverter dataConverter) {
@@ -212,6 +218,9 @@ static ActivityTaskHandler.Result mapToActivityFailure(
     Failure failure = dataConverter.exceptionToFailure(exception);
     RespondActivityTaskFailedRequest.Builder result =
         RespondActivityTaskFailedRequest.newBuilder().setFailure(failure);
+    if (lastHeartbeatDetails != null) {
+      dataConverter.toPayloads(lastHeartbeatDetails).ifPresent(result::setLastHeartbeatDetails);
+    }
     return new ActivityTaskHandler.Result(
         activityId,
         null,

temporal-sdk/src/main/java/io/temporal/internal/activity/HeartbeatContext.java

@@ -35,4 +35,6 @@ interface HeartbeatContext {
    * @see io.temporal.activity.ActivityExecutionContext#getHeartbeatDetails(Class, Type)
    */
   <V> Optional<V> getHeartbeatDetails(Class<V> detailsClass, Type detailsGenericType);
+
+  Object getLastHeartbeatDetails();
 }

temporal-sdk/src/main/java/io/temporal/internal/activity/HeartbeatContextImpl.java

@@ -150,6 +150,19 @@ public <V> Optional<V> getHeartbeatDetails(Class<V> detailsClass, Type detailsGe
     }
   }
 
+  @Override
+  public Object getLastHeartbeatDetails() {
+    lock.lock();
+    try {
+      if (receivedAHeartbeat) {
+        return this.lastDetails;
+      }
+      return null;
+    } finally {
+      lock.unlock();
+    }
+  }
+
   private void doHeartBeatLocked(Object details) {
     long nextHeartbeatDelay;
     try {

temporal-sdk/src/main/java/io/temporal/internal/activity/InternalActivityExecutionContext.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2022 Temporal Technologies, Inc. All Rights Reserved.
+ *
+ * Copyright (C) 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Modifications copyright (C) 2017 Uber Technologies, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this material except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.temporal.internal.activity;
+
+import io.temporal.activity.ActivityExecutionContext;
+
+/**
+ * Internal context object passed to an Activity implementation, providing more internal details
+ * than the user facing {@link ActivityExecutionContext}.
+ */
+public interface InternalActivityExecutionContext extends ActivityExecutionContext {
+  /** Get the latest value of {@link ActivityExecutionContext#heartbeat(Object)}. */
+  Object getLastHeartbeatValue();
+}

temporal-sdk/src/main/java/io/temporal/internal/activity/LocalActivityExecutionContextFactoryImpl.java

@@ -21,14 +21,14 @@
 package io.temporal.internal.activity;
 
 import com.uber.m3.tally.Scope;
-import io.temporal.activity.ActivityExecutionContext;
 
 public class LocalActivityExecutionContextFactoryImpl implements ActivityExecutionContextFactory {
 
   public LocalActivityExecutionContextFactoryImpl() {}
 
   @Override
-  public ActivityExecutionContext createContext(ActivityInfoInternal info, Scope metricsScope) {
+  public InternalActivityExecutionContext createContext(
+      ActivityInfoInternal info, Scope metricsScope) {
     return new LocalActivityExecutionContextImpl(info, metricsScope);
   }
 }

temporal-sdk/src/main/java/io/temporal/internal/activity/LocalActivityExecutionContextImpl.java

@@ -21,14 +21,13 @@
 package io.temporal.internal.activity;
 
 import com.uber.m3.tally.Scope;
-import io.temporal.activity.ActivityExecutionContext;
 import io.temporal.activity.ActivityInfo;
 import io.temporal.activity.ManualActivityCompletionClient;
 import io.temporal.client.ActivityCompletionException;
 import java.lang.reflect.Type;
 import java.util.Optional;
 
-class LocalActivityExecutionContextImpl implements ActivityExecutionContext {
+class LocalActivityExecutionContextImpl implements InternalActivityExecutionContext {
   private final ActivityInfo info;
   private final Scope metricsScope;
 
@@ -88,4 +87,9 @@ public ManualActivityCompletionClient useLocalManualCompletion() {
   public Scope getMetricsScope() {
     return metricsScope;
   }
+
+  @Override
+  public Object getLastHeartbeatValue() {
+    return null;
+  }
 }