Merge branch 'master' into 1584-middleware

Author: salaboy

.github/workflows/build.yml

@@ -34,12 +34,12 @@ jobs:
       - name: Codecov
         uses: codecov/[email protected]
       - name: Upload test report for sdk
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: test-dapr-java-sdk-jdk${{ env.JDK_VER }}
           path: sdk/target/jacoco-report/
       - name: Upload test report for sdk-actors
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: report-dapr-java-sdk-actors-jdk${{ env.JDK_VER }}
           path: sdk-actors/target/jacoco-report/
@@ -83,7 +83,7 @@ jobs:
       run: docker kill durabletask-sidecar
 
     - name: Upload Durable Task Sidecar Logs
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: Durable Task Sidecar Logs
         path: durabletask-sidecar.log
@@ -200,13 +200,13 @@ jobs:
       run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -pl !durabletask-client -Pintegration-tests dependency:copy-dependencies verify
     - name: Upload failsafe test report for sdk-tests on failure
       if: ${{ failure() && steps.integration_tests.conclusion == 'failure' }}
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: failsafe-report-sdk-tests-jdk${{ matrix.java }}-sb${{ matrix.spring-boot-version }}
         path: sdk-tests/target/failsafe-reports
     - name: Upload surefire test report for sdk-tests on failure
       if: ${{ failure() && steps.integration_tests.conclusion == 'failure' }}
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: surefire-report-sdk-tests-jdk${{ matrix.java }}-sb${{ matrix.spring-boot-version }}
         path: sdk-tests/target/surefire-reports

sdk-tests/src/test/java/io/dapr/it/testcontainers/pubsub/outbox/DaprPubSubOutboxIT.java

@@ -23,11 +23,14 @@
 import io.dapr.testcontainers.DaprLogLevel;
 import org.assertj.core.api.Assertions;
 import org.awaitility.Awaitility;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
@@ -44,6 +47,7 @@
 
 import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
 
+@Disabled("Unclear why this test is failing intermittently in CI")
 @SpringBootTest(
     webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT,
     classes = {
@@ -81,6 +85,9 @@ public class DaprPubSubOutboxIT {
       .withAppChannelAddress("host.testcontainers.internal")
       .withAppPort(PORT);
 
+  @Autowired
+  private ProductWebhookController productWebhookController;
+
   /**
    * Expose the Dapr ports to the host.
    *
@@ -93,17 +100,18 @@ static void daprProperties(DynamicPropertyRegistry registry) {
     registry.add("server.port", () -> PORT);
   }
 
-
-  @BeforeEach
-  public void setUp() {
+  @BeforeAll
+  public static void beforeAll(){
     org.testcontainers.Testcontainers.exposeHostPorts(PORT);
   }
 
+  @BeforeEach
+  public void beforeEach() {
+    Wait.forLogMessage(APP_FOUND_MESSAGE_PATTERN, 1).waitUntilReady(DAPR_CONTAINER);
+  }
 
   @Test
   public void shouldPublishUsingOutbox() throws Exception {
-    Wait.forLogMessage(APP_FOUND_MESSAGE_PATTERN, 1).waitUntilReady(DAPR_CONTAINER);
-
     try (DaprClient client = DaprClientFactory.createDaprClientBuilder(DAPR_CONTAINER).build()) {
 
       ExecuteStateTransactionRequest transactionRequest = new ExecuteStateTransactionRequest(STATE_STORE_NAME);
@@ -123,7 +131,7 @@ public void shouldPublishUsingOutbox() throws Exception {
 
       Awaitility.await().atMost(Duration.ofSeconds(10))
           .ignoreExceptions()
-          .untilAsserted(() -> Assertions.assertThat(ProductWebhookController.EVENT_LIST).isNotEmpty());
+          .untilAsserted(() -> Assertions.assertThat(productWebhookController.getEventList()).isNotEmpty());
     }
   }
 

sdk-tests/src/test/java/io/dapr/it/testcontainers/pubsub/outbox/ProductWebhookController.java

@@ -26,12 +26,17 @@
 @RequestMapping("/webhooks/products")
 public class ProductWebhookController {
 
-  public static final List<CloudEvent<Product>> EVENT_LIST = new CopyOnWriteArrayList<>();
+  public final List<CloudEvent<Product>> events = new CopyOnWriteArrayList<>();
 
   @PostMapping("/created")
   @Topic(name = "product.created", pubsubName = "pubsub")
-  public void handleEvent(@RequestBody CloudEvent cloudEvent) {
+  public void handleEvent(@RequestBody CloudEvent<Product> cloudEvent) {
     System.out.println("Received product.created event: " + cloudEvent.getData());
-    EVENT_LIST.add(cloudEvent);
+
+    events.add(cloudEvent);
+  }
+
+  public List<CloudEvent<Product>> getEventList() {
+    return events;
   }
 }

testcontainers-dapr/pom.xml

@@ -33,6 +33,10 @@
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
 	</dependencies>
 
     <build>

testcontainers-dapr/src/main/java/io/dapr/testcontainers/wait/strategy/AbstractDaprWaitStrategy.java

@@ -0,0 +1,143 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.testcontainers.wait.strategy;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.dapr.testcontainers.wait.strategy.metadata.Metadata;
+import org.testcontainers.containers.ContainerLaunchException;
+import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.shaded.org.awaitility.Awaitility;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+
+/**
+ * Base wait strategy for Dapr containers that polls the metadata endpoint.
+ * Subclasses implement specific conditions to wait for.
+ */
+public abstract class AbstractDaprWaitStrategy extends AbstractWaitStrategy {
+
+  private static final int DAPR_HTTP_PORT = 3500;
+  private static final String METADATA_ENDPOINT = "/v1.0/metadata";
+  private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+      .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+  private Duration pollInterval = Duration.ofMillis(500);
+
+  /**
+   * Sets the poll interval for checking the metadata endpoint.
+   *
+   * @param pollInterval the interval between polling attempts
+   * @return this strategy for chaining
+   */
+  public AbstractDaprWaitStrategy withPollInterval(Duration pollInterval) {
+    this.pollInterval = pollInterval;
+    return this;
+  }
+
+  @Override
+  protected void waitUntilReady() {
+    String host = waitStrategyTarget.getHost();
+    Integer port = waitStrategyTarget.getMappedPort(DAPR_HTTP_PORT);
+    String metadataUrl = String.format("http://%s:%d%s", host, port, METADATA_ENDPOINT);
+
+    try {
+      Awaitility.await()
+          .atMost(startupTimeout.getSeconds(), TimeUnit.SECONDS)
+          .pollInterval(pollInterval.toMillis(), TimeUnit.MILLISECONDS)
+          .ignoreExceptions()
+          .until(() -> checkCondition(metadataUrl));
+    } catch (Exception e) {
+      throw new ContainerLaunchException(
+          String.format("Timed out waiting for Dapr condition: %s", getConditionDescription()), e);
+    }
+  }
+
+  /**
+   * Checks if the wait condition is satisfied.
+   *
+   * @param metadataUrl the URL to the metadata endpoint
+   * @return true if the condition is met
+   * @throws IOException if there's an error fetching metadata
+   */
+  protected boolean checkCondition(String metadataUrl) throws IOException {
+    Metadata metadata = fetchMetadata(metadataUrl);
+    return isConditionMet(metadata);
+  }
+
+  /**
+   * Fetches metadata from the Dapr sidecar.
+   *
+   * @param metadataUrl the URL to fetch metadata from
+   * @return the parsed metadata
+   * @throws IOException if there's an error fetching or parsing
+   */
+  protected Metadata fetchMetadata(String metadataUrl) throws IOException {
+    HttpURLConnection connection = (HttpURLConnection) new URL(metadataUrl).openConnection();
+    connection.setRequestMethod("GET");
+    connection.setConnectTimeout(1000);
+    connection.setReadTimeout(1000);
+
+    try {
+      int responseCode = connection.getResponseCode();
+      if (responseCode != 200) {
+        throw new IOException("Metadata endpoint returned status: " + responseCode);
+      }
+      return OBJECT_MAPPER.readValue(connection.getInputStream(), Metadata.class);
+    } finally {
+      connection.disconnect();
+    }
+  }
+
+  /**
+   * Checks if the specific wait condition is met based on the metadata.
+   *
+   * @param metadata the current Dapr metadata
+   * @return true if the condition is satisfied
+   */
+  protected abstract boolean isConditionMet(Metadata metadata);
+
+  /**
+   * Returns a description of what this strategy is waiting for.
+   *
+   * @return a human-readable description of the condition
+   */
+  protected abstract String getConditionDescription();
+
+  /**
+   * Creates a predicate-based wait strategy for custom conditions.
+   *
+   * @param predicate the predicate to test against metadata
+   * @param description a description of what the predicate checks
+   * @return a new wait strategy
+   */
+  public static AbstractDaprWaitStrategy forCondition(Predicate<Metadata> predicate, String description) {
+    return new AbstractDaprWaitStrategy() {
+      @Override
+      protected boolean isConditionMet(Metadata metadata) {
+        return predicate.test(metadata);
+      }
+
+      @Override
+      protected String getConditionDescription() {
+        return description;
+      }
+    };
+  }
+}

testcontainers-dapr/src/main/java/io/dapr/testcontainers/wait/strategy/ActorWaitStrategy.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.testcontainers.wait.strategy;
+
+import io.dapr.testcontainers.wait.strategy.metadata.Actor;
+import io.dapr.testcontainers.wait.strategy.metadata.Metadata;
+
+/**
+ * Wait strategy that waits for actors to be registered with Dapr.
+ */
+public class ActorWaitStrategy extends AbstractDaprWaitStrategy {
+
+  private final String actorType;
+
+  /**
+   * Creates a wait strategy that waits for any actor to be registered.
+   */
+  public ActorWaitStrategy() {
+    this.actorType = null;
+  }
+
+  /**
+   * Creates a wait strategy that waits for a specific actor type to be registered.
+   *
+   * @param actorType the actor type to wait for
+   */
+  public ActorWaitStrategy(String actorType) {
+    this.actorType = actorType;
+  }
+
+  @Override
+  protected boolean isConditionMet(Metadata metadata) {
+    if (metadata == null) {
+      return false;
+    }
+    if (actorType == null) {
+      return !metadata.getActors().isEmpty();
+    }
+    return metadata.getActors().stream()
+        .anyMatch(this::matchesActorType);
+  }
+
+  private boolean matchesActorType(Actor actor) {
+    if (actor == null || actorType == null) {
+      return false;
+    }
+    return actorType.equals(actor.getType());
+  }
+
+  @Override
+  protected String getConditionDescription() {
+    if (actorType != null) {
+      return String.format("actor type '%s'", actorType);
+    }
+    return "any registered actors";
+  }
+}