try adding waitforsidecar

Signed-off-by: Cassandra Coyle <[email protected]>

Author: cicoyle

sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java

@@ -15,6 +15,10 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.dapr.client.DaprClient;
+import io.dapr.client.DaprClientBuilder;
+import io.dapr.config.Properties;
+import io.dapr.config.Property;
 import io.dapr.testcontainers.Component;
 import io.dapr.testcontainers.DaprContainer;
 import io.dapr.testcontainers.DaprLogLevel;
@@ -90,7 +94,24 @@ static void daprProperties(DynamicPropertyRegistry registry) {
    * Initializes the test.
    */
   @BeforeEach
-  public void init() {
+  public void init() throws InterruptedException {
+    // Wait for Dapr sidecar to be ready before starting workflow runtime
+    Map<Property<?>, String> overrides = Map.of(
+        Properties.HTTP_ENDPOINT, DAPR_CONTAINER.getHttpEndpoint(),
+        Properties.GRPC_ENDPOINT, DAPR_CONTAINER.getGrpcEndpoint()
+    );
+    
+    while (true) {
+      try (DaprClient client = new DaprClientBuilder()
+              .withPropertyOverrides(overrides).build()) {
+        client.waitForSidecar(10000).block(); // 10 seconds
+          break;
+      } catch (Exception e) {
+          System.out.println("Sidecar not ready yet, retrying in 10 seconds...");
+          Thread.sleep(1000);
+      }
+  }
+    
     WorkflowRuntime runtime = workflowRuntimeBuilder.build();
     System.out.println("Start workflow runtime");
     runtime.start(false);

sdk-tests/src/test/java/io/dapr/it/testcontainers/WorkflowRetryCompensationIT.java

@@ -28,6 +28,10 @@
 import io.dapr.workflows.client.WorkflowFailureDetails;
 import io.dapr.workflows.runtime.WorkflowRuntime;
 import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
+import io.dapr.client.DaprClient;
+import io.dapr.client.DaprClientBuilder;
+import io.dapr.config.Properties;
+import io.dapr.config.Property;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -94,7 +98,7 @@ static void daprProperties(DynamicPropertyRegistry registry) {
     private WorkflowRuntime runtime;
 
     @BeforeEach
-    public void init() {
+    public void init() throws InterruptedException {
         // Reset attempt counts before each test
         BookFlightActivity.attemptCount = 0;
         BookHotelActivity.attemptCount = 0;
@@ -107,6 +111,23 @@ public void init() {
         BookCarActivity.alwaysFail = false;
         CancelHotelActivity.shouldFail = false;
 
+        // Wait for Dapr sidecar to be ready before starting workflow runtime
+        Map<Property<?>, String> overrides = Map.of(
+            Properties.HTTP_ENDPOINT, DAPR_CONTAINER.getHttpEndpoint(),
+            Properties.GRPC_ENDPOINT, DAPR_CONTAINER.getGrpcEndpoint()
+        );
+        
+        while (true) {
+            try (DaprClient client = new DaprClientBuilder()
+                    .withPropertyOverrides(overrides).build()) {
+                client.waitForSidecar(10000).block(); // 10 seconds
+                break;
+            } catch (Exception e) {
+                System.out.println("Sidecar not ready yet, retrying in 10 seconds...");
+                Thread.sleep(1000);
+            }
+        }
+        
         runtime = workflowRuntimeBuilder.build();
         System.out.println("Starting new workflow runtime for test");
         runtime.start(false);

sdk-tests/src/test/java/io/dapr/it/testcontainers/WorkflowRetryIT.java

@@ -28,6 +28,10 @@
 import io.dapr.workflows.client.WorkflowFailureDetails;
 import io.dapr.workflows.runtime.WorkflowRuntime;
 import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
+import io.dapr.client.DaprClient;
+import io.dapr.client.DaprClientBuilder;
+import io.dapr.config.Properties;
+import io.dapr.config.Property;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -95,10 +99,27 @@ static void daprProperties(DynamicPropertyRegistry registry) {
     private WorkflowRuntime runtime;
 
     @BeforeEach
-    public void init() {
+    public void init() throws InterruptedException {
         RetryTestActivity.attemptCount = 0;
         RetryTestActivity.alwaysFail = false;
 
+        // Wait for Dapr sidecar to be ready before starting workflow runtime
+        Map<Property<?>, String> overrides = Map.of(
+            Properties.HTTP_ENDPOINT, DAPR_CONTAINER.getHttpEndpoint(),
+            Properties.GRPC_ENDPOINT, DAPR_CONTAINER.getGrpcEndpoint()
+        );
+
+        while (true) {
+            try (DaprClient client = new DaprClientBuilder()
+                    .withPropertyOverrides(overrides).build()) {
+                client.waitForSidecar(10000).block(); // 10 seconds
+                break;
+            } catch (Exception e) {
+                System.out.println("Sidecar not ready yet, retrying in 10 seconds...");
+                Thread.sleep(1000);
+            }
+        }
+        
         runtime = workflowRuntimeBuilder.build();
         System.out.println("Start workflow runtime");
         runtime.start(false);