chore: test and protos

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

Author: javier-aliaga

client/build.gradle

@@ -38,7 +38,10 @@ dependencies {
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}"
 
     testImplementation(platform('org.junit:junit-bom:5.7.2'))
-    testImplementation('org.junit.jupiter:junit-jupiter')
+    testImplementation(platform('org.junit:junit-bom:5.13.3'))
+	testImplementation('org.junit.jupiter:junit-jupiter')
+	testRuntimeOnly('org.junit.platform:junit-platform-launcher')
+
 
     // Netty dependencies for TLS
     implementation "io.grpc:grpc-netty-shaded:${grpcVersion}"

client/src/test/java/io/dapr/durabletask/ErrorHandlingIntegrationTests.java

@@ -13,7 +13,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.jupiter.api.BeforeEach;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**

client/src/test/java/io/dapr/durabletask/IntegrationTests.java

@@ -33,7 +33,6 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -1062,7 +1061,6 @@ void purgeInstanceFilter() throws TimeoutException {
 
         DurableTaskClient client = new DurableTaskGrpcClientBuilder().build();
         try (worker; client) {
-            client.createTaskHub(true);
             Instant startTime = Instant.now();
 
             String instanceId = client.scheduleNewOrchestrationInstance(orchestratorName, 0);
@@ -1616,7 +1614,6 @@ public void taskExecutionIdTest() {
         DurableTaskClient client = new DurableTaskGrpcClientBuilder().build();
 
         try(worker; client) {
-            client.createTaskHub(true);
             String instanceId = client.scheduleNewOrchestrationInstance(orchestratorName);
             OrchestrationMetadata instance = client.waitForInstanceCompletion(instanceId, defaultTimeout, true);
             assertNotNull(instance);

internal/durabletask-protobuf/PROTO_SOURCE_COMMIT_HASH

@@ -1 +1 @@
-cc00765eeb3307f8fdac7da610915d3a0757702b
+545663a4db0040bb02c642c27010e337b9be8d31

internal/durabletask-protobuf/protos/orchestrator_service.proto

@@ -3,7 +3,7 @@
 
 syntax = "proto3";
 
-option csharp_namespace = "Microsoft.DurableTask.Protobuf";
+option csharp_namespace = "Dapr.DurableTask.Protobuf";
 option java_package = "io.dapr.durabletask.implementation.protobuf";
 option go_package = "/api/protos";
 
@@ -12,6 +12,11 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/wrappers.proto";
 import "google/protobuf/empty.proto";
 
+message TaskRouter {
+    string source = 1; // orchestrationAppID
+    optional string target = 2; // appID
+}
+
 message OrchestrationInstance {
     string instanceId = 1;
     google.protobuf.StringValue executionId = 2;
@@ -24,6 +29,7 @@ message ActivityRequest {
     OrchestrationInstance orchestrationInstance = 4;
     int32 taskId = 5;
     TraceContext parentTraceContext = 6;
+    string taskExecutionId = 7;
 }
 
 message ActivityResponse {
@@ -94,16 +100,19 @@ message TaskScheduledEvent {
     google.protobuf.StringValue version = 2;
     google.protobuf.StringValue input = 3;
     TraceContext parentTraceContext = 4;
+    string taskExecutionId = 5;
 }
 
 message TaskCompletedEvent {
     int32 taskScheduledId = 1;
     google.protobuf.StringValue result = 2;
+    string taskExecutionId = 3;
 }
 
 message TaskFailedEvent {
     int32 taskScheduledId = 1;
     TaskFailureDetails failureDetails = 2;
+    string taskExecutionId = 3;
 }
 
 message SubOrchestrationInstanceCreatedEvent {
@@ -192,10 +201,10 @@ message EntityOperationCalledEvent {
 }
 
 message EntityLockRequestedEvent {
-    string criticalSectionId = 1;  
+    string criticalSectionId = 1;
     repeated string lockSet = 2;
     int32 position = 3;
-    google.protobuf.StringValue parentInstanceId = 4; // used only within messages, null in histories 
+    google.protobuf.StringValue parentInstanceId = 4; // used only within messages, null in histories
 }
 
 message EntityOperationCompletedEvent {
@@ -210,14 +219,14 @@ message EntityOperationFailedEvent {
 
 message EntityUnlockSentEvent {
     string criticalSectionId = 1;
-    google.protobuf.StringValue parentInstanceId = 2;  // used only within messages, null in histories 
+    google.protobuf.StringValue parentInstanceId = 2;  // used only within messages, null in histories
     google.protobuf.StringValue targetInstanceId = 3;  // used only within histories, null in messages
 }
 
 message EntityLockGrantedEvent {
     string criticalSectionId = 1;
 }
- 
+
 message HistoryEvent {
     int32 eventId = 1;
     google.protobuf.Timestamp timestamp = 2;
@@ -244,25 +253,29 @@ message HistoryEvent {
         ExecutionResumedEvent executionResumed = 22;
         EntityOperationSignaledEvent entityOperationSignaled = 23;
         EntityOperationCalledEvent entityOperationCalled = 24;
-        EntityOperationCompletedEvent entityOperationCompleted = 25; 
-        EntityOperationFailedEvent entityOperationFailed = 26; 
+        EntityOperationCompletedEvent entityOperationCompleted = 25;
+        EntityOperationFailedEvent entityOperationFailed = 26;
         EntityLockRequestedEvent entityLockRequested = 27;
         EntityLockGrantedEvent entityLockGranted = 28;
         EntityUnlockSentEvent entityUnlockSent = 29;
     }
+    optional TaskRouter router = 30;
 }
 
 message ScheduleTaskAction {
     string name = 1;
     google.protobuf.StringValue version = 2;
     google.protobuf.StringValue input = 3;
+    optional TaskRouter router = 4;
+    string taskExecutionId = 5;
 }
 
 message CreateSubOrchestrationAction {
     string instanceId = 1;
     string name = 2;
     google.protobuf.StringValue version = 3;
     google.protobuf.StringValue input = 4;
+    optional TaskRouter router = 5;
 }
 
 message CreateTimerAction {
@@ -311,6 +324,7 @@ message OrchestratorAction {
         TerminateOrchestrationAction terminateOrchestration = 7;
         SendEntityMessageAction sendEntityMessage = 8;
     }
+    optional TaskRouter router = 9;
 }
 
 message OrchestratorRequest {
@@ -320,6 +334,7 @@ message OrchestratorRequest {
     repeated HistoryEvent newEvents = 4;
     OrchestratorEntityParameters entityParameters = 5;
     bool requiresHistoryStreaming = 6;
+    optional TaskRouter router = 7;
 }
 
 message OrchestratorResponse {