Use 1.16 rc.3 (#1488)

* chore: Use dapr release 1.16-rc.3

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

* feat: Move field to top level request

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

* chore: Update mechanical markdown workflow timeouts

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

* chore: Run MM workflows tests in parallel

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

* fix: Fix tracing examples

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

* ci: Do not run tests during example validations

We have specifics jobs that runs tests. Do not run them as part as validations

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

* ci: Improve validate job

No need to run separate jobs for clean, compile and install

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

* ci: Run workflows examples sequentially

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

* ci: Add timeout to strem pubsub

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

* ci: Fix order of examples

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

* ci: Fix validation tests for sb workflows

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

* nit: Add copyright header

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

---------

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

Author: javier-aliaga

.github/workflows/build.yml

@@ -39,7 +39,7 @@ jobs:
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
       DAPR_CLI_VER: 1.15.0
-      DAPR_RUNTIME_VER: 1.16.0-rc.2
+      DAPR_RUNTIME_VER: 1.16.0-rc.3
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:

.github/workflows/validate.yml

@@ -38,7 +38,7 @@ jobs:
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
       DAPR_CLI_VER: 1.15.0
-      DAPR_RUNTIME_VER: 1.16.0-rc.2
+      DAPR_RUNTIME_VER: 1.16.0-rc.3
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
@@ -107,12 +107,26 @@ jobs:
           pip3 install mechanical-markdown
       - name: Verify scheduler is listening on port.
         run: sleep 30 && docker logs dapr_scheduler && nc -vz localhost 50006
-      - name: Clean up files
-        run: ./mvnw clean
-      - name: Build sdk
-        run: ./mvnw compile -q
       - name: Install jars
-        run: ./mvnw install -q
+        run: ./mvnw clean install -DskipTests -q
+        env:
+          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
+      - name: Validate workflows example
+        working-directory: ./examples
+        run: |
+          mm.py ./src/main/java/io/dapr/examples/workflows/README.md
+        env:
+          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
+      - name: Validate Spring Boot examples
+        working-directory: ./spring-boot-examples
+        run: |
+          mm.py README.md
+        env:
+          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
+      - name: Validate Spring Boot Workflow examples
+        working-directory: ./spring-boot-examples/workflows
+        run: |
+          mm.py README.md
         env:
           DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
       - name: Validate Jobs example
@@ -199,27 +213,10 @@ jobs:
             mm.py ./src/main/java/io/dapr/examples/querystate/README.md
         env:
           DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}    
-      - name: Validate workflows example
-        working-directory: ./examples
-        run: |
-          mm.py ./src/main/java/io/dapr/examples/workflows/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}  
       - name: Validate streaming subscription example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/pubsub/stream/README.md
         env:
           DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}  
-      - name: Validate Spring Boot examples
-        working-directory: ./spring-boot-examples
-        run: |
-          mm.py README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
-      - name: Validate Spring Boot Workflow examples
-        working-directory: ./spring-boot-examples/workflows
-        run: |
-          mm.py README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
+

daprdocs/content/en/java-sdk-docs/spring-boot/_index.md

@@ -95,7 +95,7 @@ public class DaprTestContainersConfig {
   @ServiceConnection
   public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer){
 
-    return new DaprContainer("daprio/daprd:1.16.0-rc.2")
+    return new DaprContainer("daprio/daprd:1.16.0-rc.3")
             .withAppName("producer-app")
             .withNetwork(daprNetwork)
             .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES))
@@ -250,7 +250,7 @@ Finally, because Dapr PubSub requires a bidirectional connection between your ap
 @ServiceConnection
 public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer, RabbitMQContainer rabbitMQContainer){
 
-    return new DaprContainer("daprio/daprd:1.16.0-rc.2")
+    return new DaprContainer("daprio/daprd:1.16.0-rc.3")
             .withAppName("producer-app")
             .withNetwork(daprNetwork)
             .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES))

examples/src/main/java/io/dapr/examples/pubsub/stream/README.md

@@ -93,7 +93,8 @@ expected_stdout_lines:
   - '== APP == Subscriber got: This is message #0'
   - '== APP == Subscriber got: This is message #1'
 background: true
-sleep: 30
+sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -111,6 +112,7 @@ expected_stdout_lines:
   - '== APP == Published message: This is message #1'
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash

examples/src/main/java/io/dapr/examples/tracing/InvokeClient.java

@@ -75,6 +75,7 @@ public static void main(String[] args) throws Exception {
       openTelemetrySdk.getSdkTracerProvider().shutdown();
       Validation.validate();
       System.out.println("Done");
+      System.exit(0);
     }
   }
 }

examples/src/main/java/io/dapr/examples/tracing/README.md

@@ -138,6 +138,7 @@ name: Run demo service
 expected_stdout_lines:
 background: true
 sleep: 20
+timeout_seconds: 40
 -->
 
 ```bash
@@ -225,6 +226,7 @@ name: Run proxy service
 expected_stdout_lines:
 background: true
 sleep: 20
+timeout_seconds: 40
 -->
 
 ```bash
@@ -284,6 +286,7 @@ expected_stdout_lines:
   - '== APP == Done'
 background: true
 sleep: 20
+timeout_seconds: 40
 -->
 
 ```bash

examples/src/main/java/io/dapr/examples/workflows/README.md

@@ -142,13 +142,12 @@ expected_stdout_lines:
   - 'Message Received from input: Seattle'
   - 'Sending message to output: SEATTLE'
   - 'Workflow finished with result: TOKYO, LONDON, SEATTLE'
+timeout_seconds: 20
 background: true
-sleep: 60
-timeout_seconds: 60
 -->
 Execute the following script in order to run DemoChainWorker:
 ```sh
-dapr run --app-id demoworkflowworker --resources-path ./components/workflows --dapr-grpc-port 50001 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.chain.DemoChainWorker
+dapr run --app-id demoworkflowworker --resources-path ./components/workflows --dapr-grpc-port 50001 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.chain.DemoChainWorker 50001
 ```
 
 Once running, the logs will start displaying the different steps: First, you can see workflow is starting:
@@ -158,9 +157,19 @@ Once running, the logs will start displaying the different steps: First, you can
 == APP == INFO: Durable Task worker is connecting to sidecar at 127.0.0.1:50001.
 ```
 
+<!-- END_STEP -->
+
+<!-- STEP
+name: Execute Chaining Pattern workflow
+match_order: none
+output_match_mode: substring
+expected_stdout_lines:
+  - 'completed with result: TOKYO, LONDON, SEATTLE'
+timeout_seconds: 20
+-->
 Then, execute the following script in order to run DemoChainClient:
 ```sh
-java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.chain.DemoChainClient
+sleep 10 && java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.chain.DemoChainClient 50001
 ```
 <!-- END_STEP -->
 
@@ -241,7 +250,7 @@ public class CountWordsActivity implements WorkflowActivity {
 }
 ```
 <!-- STEP
-name: Run Chaining Pattern workflow
+name: Run FanInOut Pattern workflow
 match_order: none
 output_match_mode: substring
 expected_stdout_lines:
@@ -251,20 +260,29 @@ expected_stdout_lines:
   - 'Activity returned: 17.'
   - 'Activity returned: 11.'
   - 'Workflow finished with result: 60'
+timeout_seconds: 20
 background: true
-sleep: 60
-timeout_seconds: 60
 -->
 
 Execute the following script in order to run DemoFanInOutWorker:
 ```sh
-dapr run --app-id demoworkflowworker --resources-path ./components/workflows --dapr-grpc-port 50001 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.faninout.DemoFanInOutWorker
+dapr run --app-id demoworkflowworker --resources-path ./components/workflows --dapr-grpc-port 50002 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.faninout.DemoFanInOutWorker 50002
 ```
 
+<!-- END_STEP -->
+
+<!-- STEP
+name: Execute FanInOut Pattern workflow
+match_order: none
+output_match_mode: substring
+expected_stdout_lines:
+  - 'completed with result: 60'
+timeout_seconds: 20
+-->
 Execute the following script in order to run DemoFanInOutClient:
 
 ```sh
-java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.faninout.DemoFanInOutClient
+sleep 10 && java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.faninout.DemoFanInOutClient 50002
 ```
 <!-- END_STEP -->
 
@@ -294,7 +312,6 @@ and the client:
 Started a new fan out/fan in model model workflow with instance ID: 092c1928-b5dd-4576-9468-300bf6aed986
 workflow instance with ID: 092c1928-b5dd-4576-9468-300bf6aed986 completed with result: 60
 ```
-
 ### Continue As New Pattern
 `ContinueAsNew` API allows you to restart the workflow with a new input.
 
@@ -606,8 +623,6 @@ expected_stdout_lines:
   - "Registered Activity: CancelCarActivity"
   - "Successfully built dapr workflow runtime"
   - "Start workflow runtime"
-  - "Durable Task worker is connecting to sidecar at 127.0.0.1:50001."
-
   - "Starting Workflow: io.dapr.examples.workflows.compensation.BookTripWorkflow"
   - "Starting Activity: io.dapr.examples.workflows.compensation.BookFlightActivity"
   - "Activity completed with result: Flight booked successfully"
@@ -625,18 +640,27 @@ expected_stdout_lines:
   - "Starting Activity: io.dapr.examples.workflows.compensation.CancelFlightActivity"
   - "Activity completed with result: Flight canceled successfully"
 background: true
-sleep: 60
-timeout_seconds: 60
+timeout_seconds: 30
 -->
 
 Execute the following script in order to run the BookTripWorker:
 ```sh
-dapr run --app-id book-trip-worker --resources-path ./components/workflows --dapr-grpc-port 50001 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.compensation.BookTripWorker
+dapr run --app-id book-trip-worker --resources-path ./components/workflows --dapr-grpc-port 50003 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.compensation.BookTripWorker 50003
 ```
 
+<!-- END_STEP -->
+
+<!-- STEP
+name: Execute Compensation Pattern workflow
+match_order: none
+output_match_mode: substring
+expected_stdout_lines:
+  - 'Workflow failed, compensation applied'
+timeout_seconds: 30
+-->
 Once running, execute the following script to run the BookTripClient:
 ```sh
-java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.compensation.BookTripClient
+sleep 15 && java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.compensation.BookTripClient 50003
 ```
 <!-- END_STEP -->
 
@@ -656,7 +680,7 @@ Key Points:
 
 ### Suspend/Resume Pattern
 
-Workflow instances can be suspended and resumed. This example shows how to use the suspend and resume commands. 
+Workflow instances can be suspended and resumed. This example shows how to use the suspend and resume commands.
 
 For testing the suspend and resume operations we will use the same workflow definition used by the DemoExternalEventWorkflow.
 
@@ -669,26 +693,34 @@ match_order: none
 output_match_mode: substring
 expected_stdout_lines:
   - "Waiting for approval..."
-  - "Suspending Workflow Instance"
-  - "Workflow Instance Status: SUSPENDED"
-  - "Let's resume the Workflow Instance before sending the external event"
-  - "Workflow Instance Status: RUNNING"
-  - "Now that the instance is RUNNING again, lets send the external event."
   - "approval granted - do the approved action"
   - "Starting Activity: io.dapr.examples.workflows.externalevent.ApproveActivity"
   - "Running approval activity..."
   - "approval-activity finished"
 background: true
-sleep: 60
-timeout_seconds: 60
+timeout_seconds: 30
 -->
 
 ```sh
-dapr run --app-id demoworkflowworker --resources-path ./components/workflows --dapr-grpc-port 50001 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.suspendresume.DemoSuspendResumeWorker
+dapr run --app-id demoworkflowworker --resources-path ./components/workflows --dapr-grpc-port 50004 -- java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.suspendresume.DemoSuspendResumeWorker 50004
 ```
 
+<!-- END_STEP -->
+
+<!-- STEP
+name: Execute Suspend/Resume workflow 
+match_order: none
+output_match_mode: substring
+expected_stdout_lines:
+  - "Suspending Workflow Instance"
+  - "Workflow Instance Status: SUSPENDED"
+  - "Let's resume the Workflow Instance before sending the external event"
+  - "Workflow Instance Status: RUNNING"
+  - "Now that the instance is RUNNING again, lets send the external event."
+timeout_seconds: 30
+-->
 ```sh
-java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.suspendresume.DemoSuspendResumeClient
+sleep 15 && java -jar target/dapr-java-sdk-examples-exec.jar io.dapr.examples.workflows.suspendresume.DemoSuspendResumeClient 50004
 ```
 
 <!-- END_STEP -->

examples/src/main/java/io/dapr/examples/workflows/chain/DemoChainClient.java

@@ -13,6 +13,7 @@
 
 package io.dapr.examples.workflows.chain;
 
+import io.dapr.examples.workflows.utils.PropertyUtils;
 import io.dapr.workflows.client.DaprWorkflowClient;
 import io.dapr.workflows.client.WorkflowInstanceStatus;
 
@@ -26,7 +27,7 @@ public class DemoChainClient {
    * @throws InterruptedException If program has been interrupted.
    */
   public static void main(String[] args) {
-    try (DaprWorkflowClient client = new DaprWorkflowClient()) {
+    try (DaprWorkflowClient client = new DaprWorkflowClient(PropertyUtils.getProperties(args))) {
       String instanceId = client.scheduleNewWorkflow(DemoChainWorkflow.class);
       System.out.printf("Started a new chaining model workflow with instance ID: %s%n", instanceId);
       WorkflowInstanceStatus workflowInstanceStatus =

examples/src/main/java/io/dapr/examples/workflows/chain/DemoChainWorker.java

@@ -13,6 +13,7 @@
 
 package io.dapr.examples.workflows.chain;
 
+import io.dapr.examples.workflows.utils.PropertyUtils;
 import io.dapr.workflows.runtime.WorkflowRuntime;
 import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
 
@@ -25,7 +26,7 @@ public class DemoChainWorker {
    */
   public static void main(String[] args) throws Exception {
     // Register the Workflow with the builder.
-    WorkflowRuntimeBuilder builder = new WorkflowRuntimeBuilder().registerWorkflow(DemoChainWorkflow.class);
+    WorkflowRuntimeBuilder builder = new WorkflowRuntimeBuilder(PropertyUtils.getProperties(args)).registerWorkflow(DemoChainWorkflow.class);
     builder.registerActivity(ToUpperCaseActivity.class);
 
     // Build and then start the workflow runtime pulling and executing tasks

examples/src/main/java/io/dapr/examples/workflows/childworkflow/DemoChildWorkerflowClient.java

@@ -13,6 +13,7 @@
 
 package io.dapr.examples.workflows.childworkflow;
 
+import io.dapr.examples.workflows.utils.PropertyUtils;
 import io.dapr.workflows.client.DaprWorkflowClient;
 import io.dapr.workflows.client.WorkflowInstanceStatus;
 
@@ -26,7 +27,7 @@ public class DemoChildWorkerflowClient {
    * @throws InterruptedException If program has been interrupted.
    */
   public static void main(String[] args) {
-    try (DaprWorkflowClient client = new DaprWorkflowClient()) {
+    try (DaprWorkflowClient client = new DaprWorkflowClient(PropertyUtils.getProperties(args))) {
       String instanceId = client.scheduleNewWorkflow(DemoWorkflow.class);
       System.out.printf("Started a new child-workflow model workflow with instance ID: %s%n", instanceId);
       WorkflowInstanceStatus workflowInstanceStatus =