chore: Add back taskId method to context

Signed-off-by: Javier Aliaga <javier@diagrid.io>

Author: javier-aliaga

client/src/main/java/io/dapr/durabletask/DurableTaskGrpcWorker.java

@@ -185,7 +185,8 @@ public void startAndBlock() {
                                 output = taskActivityExecutor.execute(
                                         activityRequest.getName(),
                                         activityRequest.getInput().getValue(),
-                                        activityRequest.getTaskExecutionId());
+                                        activityRequest.getTaskExecutionId(),
+                                        activityRequest.getTaskId());
                             } catch (Throwable e) {
                                 failureDetails = TaskFailureDetails.newBuilder()
                                         .setErrorType(e.getClass().getName())

client/src/main/java/io/dapr/durabletask/TaskActivityContext.java

@@ -28,4 +28,10 @@ public interface TaskActivityContext {
      * @return the execution id of the current task activity
      */
     String getTaskExecutionId();
+
+    /**
+     * Gets the task id of the current task activity.
+     * @return the task id of the current task activity
+     */
+    int getTaskId();
 }

client/src/main/java/io/dapr/durabletask/TaskActivityExecutor.java

@@ -19,7 +19,7 @@ public TaskActivityExecutor(
         this.logger = logger;
     }
 
-    public String execute(String taskName, String input, String taskExecutionId) throws Throwable {
+    public String execute(String taskName, String input, String taskExecutionId, int taskId) throws Throwable {
         TaskActivityFactory factory = this.activityFactories.get(taskName);
         if (factory == null) {
             throw new IllegalStateException(
@@ -32,7 +32,7 @@ public String execute(String taskName, String input, String taskExecutionId) thr
                     String.format("The task factory '%s' returned a null TaskActivity object.", taskName));
         }
 
-        TaskActivityContextImpl context = new TaskActivityContextImpl(taskName, input, taskExecutionId);
+        TaskActivityContextImpl context = new TaskActivityContextImpl(taskName, input, taskExecutionId, taskId);
 
         // Unhandled exceptions are allowed to escape
         Object output = activity.run(context);
@@ -47,13 +47,15 @@ private class TaskActivityContextImpl implements TaskActivityContext {
         private final String name;
         private final String rawInput;
         private final String taskExecutionId;
+        private final int taskId;
 
         private final DataConverter dataConverter = TaskActivityExecutor.this.dataConverter;
 
-        public TaskActivityContextImpl(String activityName, String rawInput, String taskExecutionId) {
+        public TaskActivityContextImpl(String activityName, String rawInput, String taskExecutionId, int taskId) {
             this.name = activityName;
             this.rawInput = rawInput;
             this.taskExecutionId = taskExecutionId;
+            this.taskId = taskId;
         }
 
         @Override
@@ -74,5 +76,10 @@ public <T> T getInput(Class<T> targetType) {
         public String getTaskExecutionId() {
             return this.taskExecutionId;
         }
+
+        @Override
+        public int getTaskId() {
+            return this.taskId;
+        }
     }
 }