Skip to content

Commit 8e86447

Browse files
committed
wip: manual changes of protos, revert
Signed-off-by: Javier Aliaga <[email protected]>
1 parent 36b506a commit 8e86447

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

client/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}"
3939

4040
testImplementation(platform('org.junit:junit-bom:5.7.2'))
41-
testImplementation('org.junit.jupiter:junit-jupiter')
41+
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
4242

4343
// Netty dependencies for TLS
4444
implementation "io.grpc:grpc-netty-shaded:${grpcVersion}"
@@ -73,7 +73,7 @@ task downloadProtoFiles {
7373
protoDir.mkdirs()
7474

7575
// Download the proto file
76-
new URL("https://raw.githubusercontent.com/dapr/durabletask-protobuf/${ext.branch}/protos/orchestrator_service.proto")
76+
new URL("https://raw.githubusercontent.com/javier-aliaga/durabletask-protobuf/refs/heads/javi-add-activity-execution-id/protos/orchestrator_service.proto")
7777
.withInputStream { i ->
7878
new File(protoDir, 'orchestrator_service.proto').withOutputStream { it << i }
7979
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cc00765eeb3307f8fdac7da610915d3a0757702b
1+
ce184193bcf2d4dcf643bcc934d3ea897c4c8c5c

internal/durabletask-protobuf/protos/orchestrator_service.proto

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
syntax = "proto3";
55

6-
option csharp_namespace = "Microsoft.DurableTask.Protobuf";
6+
option csharp_namespace = "Dapr.DurableTask.Protobuf";
77
option java_package = "io.dapr.durabletask.implementation.protobuf";
88
option go_package = "/api/protos";
99

@@ -24,6 +24,7 @@ message ActivityRequest {
2424
OrchestrationInstance orchestrationInstance = 4;
2525
int32 taskId = 5;
2626
TraceContext parentTraceContext = 6;
27+
string taskExecutionId = 7;
2728
}
2829

2930
message ActivityResponse {
@@ -94,16 +95,19 @@ message TaskScheduledEvent {
9495
google.protobuf.StringValue version = 2;
9596
google.protobuf.StringValue input = 3;
9697
TraceContext parentTraceContext = 4;
98+
string taskExecutionId = 5;
9799
}
98100

99101
message TaskCompletedEvent {
100102
int32 taskScheduledId = 1;
101103
google.protobuf.StringValue result = 2;
104+
string taskExecutionId = 3;
102105
}
103106

104107
message TaskFailedEvent {
105108
int32 taskScheduledId = 1;
106109
TaskFailureDetails failureDetails = 2;
110+
string taskExecutionId = 3;
107111
}
108112

109113
message SubOrchestrationInstanceCreatedEvent {
@@ -256,6 +260,7 @@ message ScheduleTaskAction {
256260
string name = 1;
257261
google.protobuf.StringValue version = 2;
258262
google.protobuf.StringValue input = 3;
263+
string taskExecutionId = 4;
259264
}
260265

261266
message CreateSubOrchestrationAction {

0 commit comments

Comments
 (0)