Revert "chore: Introduce new task execution key"

This reverts commit 85e0cac.

Signed-off-by: Javier Aliaga <[email protected]>

Author: javier-aliaga

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

@@ -160,13 +160,10 @@ public void startAndBlock() {
                             String output = null;
                             TaskFailureDetails failureDetails = null;
                             try {
-                                String instanceId = activityRequest.getOrchestrationInstance().getInstanceId();
-                                String taskName = activityRequest.getName();
-                                String taskExecutionKey = instanceId + "-" + taskName;
                                 output = taskActivityExecutor.execute(
                                         activityRequest.getName(),
                                         activityRequest.getInput().getValue(),
-                                        taskExecutionKey);
+                                        activityRequest.getTaskId());
                             } catch (Throwable e) {
                                 failureDetails = TaskFailureDetails.newBuilder()
                                         .setErrorType(e.getClass().getName())

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

@@ -7,18 +7,11 @@
  * its input.
  */
 public interface TaskActivityContext {
-        /**
-         * Gets the name of the current task activity.
-         * @return the name of the current task activity
-         */
-        String getName();
-
-        /**
-         * Gets the task execution key of the current task activity.
-         * This key is used to identify the task execution and is unique for each task execution.
-         * @return the task execution key of the current task activity
-         */
-        String getTaskExecutionKey();
+    /**
+     * Gets the name of the current task activity.
+     * @return the name of the current task activity
+     */
+    String getName();
 
     /**
      * Gets the deserialized activity input.

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 taskExecutionKey) throws Throwable {
+    public String execute(String taskName, String input, 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 taskExecutionKey) th
                     String.format("The task factory '%s' returned a null TaskActivity object.", taskName));
         }
 
-        TaskActivityContextImpl context = new TaskActivityContextImpl(taskName, input, taskExecutionKey);
+        TaskActivityContextImpl context = new TaskActivityContextImpl(taskName, input);
 
         // Unhandled exceptions are allowed to escape
         Object output = activity.run(context);
@@ -44,29 +44,21 @@ public String execute(String taskName, String input, String taskExecutionKey) th
     }
 
     private class TaskActivityContextImpl implements TaskActivityContext {
-        private final String taskExecutionKey;
         private final String name;
         private final String rawInput;
-                
 
         private final DataConverter dataConverter = TaskActivityExecutor.this.dataConverter;
 
-        public TaskActivityContextImpl(String activityName, String rawInput, String taskExecutionKey) {
+        public TaskActivityContextImpl(String activityName, String rawInput) {
             this.name = activityName;
             this.rawInput = rawInput;
-            this.taskExecutionKey = taskExecutionKey;
         }
 
         @Override
         public String getName() {
             return this.name;
         }
 
-        @Override
-        public String getTaskExecutionKey() {
-            return this.taskExecutionKey;
-        }
-
         @Override
         public <T> T getInput(Class<T> targetType) {
             if (this.rawInput == null) {