From b92852c989464d7d3d4c6fdcd657a8181c1807ee Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 29 Dec 2025 15:13:57 -0800 Subject: [PATCH 1/3] Upgrade protobuf Signed-off-by: siri-varma --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37c6ecea7..b5b697c98 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ UTF-8 1.69.0 - 3.25.5 + 4.33.2 https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.5/dapr/proto https://raw.githubusercontent.com/dapr/durabletask-protobuf/main/protos/orchestrator_service.proto 1.17.0-SNAPSHOT From 2f46b17fc30e7171f96b756f919bc4d6f31d47de Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 29 Dec 2025 15:58:48 -0800 Subject: [PATCH 2/3] Fix flaky test Signed-off-by: siri-varma --- .../testcontainers/pubsub/outbox/DaprPubSubOutboxIT.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/pubsub/outbox/DaprPubSubOutboxIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/pubsub/outbox/DaprPubSubOutboxIT.java index 423ae05e5..ec63b6edb 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/pubsub/outbox/DaprPubSubOutboxIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/pubsub/outbox/DaprPubSubOutboxIT.java @@ -67,6 +67,11 @@ public class DaprPubSubOutboxIT { private static final String TOPIC_PRODUCT_CREATED = "product.created"; private static final String STATE_STORE_NAME = "kvstore"; + static { + // Must be called before container starts to expose host ports to the container + org.testcontainers.Testcontainers.exposeHostPorts(PORT); + } + @Container private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName(PUBSUB_APP_ID) @@ -96,7 +101,8 @@ static void daprProperties(DynamicPropertyRegistry registry) { @BeforeEach public void setUp() { - org.testcontainers.Testcontainers.exposeHostPorts(PORT); + // Clear any events from previous test runs + ProductWebhookController.EVENT_LIST.clear(); } From 7e63268a70adb200a83700964e45997f9bda2a2f Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 29 Dec 2025 16:26:40 -0800 Subject: [PATCH 3/3] Fix flaky test Signed-off-by: siri-varma --- .../testcontainers/pubsub/outbox/DaprPubSubOutboxIT.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/pubsub/outbox/DaprPubSubOutboxIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/pubsub/outbox/DaprPubSubOutboxIT.java index ec63b6edb..423ae05e5 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/pubsub/outbox/DaprPubSubOutboxIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/pubsub/outbox/DaprPubSubOutboxIT.java @@ -67,11 +67,6 @@ public class DaprPubSubOutboxIT { private static final String TOPIC_PRODUCT_CREATED = "product.created"; private static final String STATE_STORE_NAME = "kvstore"; - static { - // Must be called before container starts to expose host ports to the container - org.testcontainers.Testcontainers.exposeHostPorts(PORT); - } - @Container private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName(PUBSUB_APP_ID) @@ -101,8 +96,7 @@ static void daprProperties(DynamicPropertyRegistry registry) { @BeforeEach public void setUp() { - // Clear any events from previous test runs - ProductWebhookController.EVENT_LIST.clear(); + org.testcontainers.Testcontainers.exposeHostPorts(PORT); }