Skip to content

Commit e103c22

Browse files
committed
chore: Add back taskId method to context
Signed-off-by: Javier Aliaga <[email protected]>
1 parent 59d500b commit e103c22

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ public void startAndBlock() {
185185
output = taskActivityExecutor.execute(
186186
activityRequest.getName(),
187187
activityRequest.getInput().getValue(),
188-
activityRequest.getTaskExecutionId());
188+
activityRequest.getTaskExecutionId(),
189+
activityRequest.getTaskId());
189190
} catch (Throwable e) {
190191
failureDetails = TaskFailureDetails.newBuilder()
191192
.setErrorType(e.getClass().getName())

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,10 @@ public interface TaskActivityContext {
2828
* @return the execution id of the current task activity
2929
*/
3030
String getTaskExecutionId();
31+
32+
/**
33+
* Gets the task id of the current task activity.
34+
* @return the task id of the current task activity
35+
*/
36+
int getTaskId();
3137
}

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public TaskActivityExecutor(
1919
this.logger = logger;
2020
}
2121

22-
public String execute(String taskName, String input, String taskExecutionId) throws Throwable {
22+
public String execute(String taskName, String input, String taskExecutionId, int taskId) throws Throwable {
2323
TaskActivityFactory factory = this.activityFactories.get(taskName);
2424
if (factory == null) {
2525
throw new IllegalStateException(
@@ -32,7 +32,7 @@ public String execute(String taskName, String input, String taskExecutionId) thr
3232
String.format("The task factory '%s' returned a null TaskActivity object.", taskName));
3333
}
3434

35-
TaskActivityContextImpl context = new TaskActivityContextImpl(taskName, input, taskExecutionId);
35+
TaskActivityContextImpl context = new TaskActivityContextImpl(taskName, input, taskExecutionId, taskId);
3636

3737
// Unhandled exceptions are allowed to escape
3838
Object output = activity.run(context);
@@ -47,13 +47,15 @@ private class TaskActivityContextImpl implements TaskActivityContext {
4747
private final String name;
4848
private final String rawInput;
4949
private final String taskExecutionId;
50+
private final int taskId;
5051

5152
private final DataConverter dataConverter = TaskActivityExecutor.this.dataConverter;
5253

53-
public TaskActivityContextImpl(String activityName, String rawInput, String taskExecutionId) {
54+
public TaskActivityContextImpl(String activityName, String rawInput, String taskExecutionId, int taskId) {
5455
this.name = activityName;
5556
this.rawInput = rawInput;
5657
this.taskExecutionId = taskExecutionId;
58+
this.taskId = taskId;
5759
}
5860

5961
@Override
@@ -74,5 +76,10 @@ public <T> T getInput(Class<T> targetType) {
7476
public String getTaskExecutionId() {
7577
return this.taskExecutionId;
7678
}
79+
80+
@Override
81+
public int getTaskId() {
82+
return this.taskId;
83+
}
7784
}
7885
}

0 commit comments

Comments
 (0)