Stabilize actor IT runtime isolation and bootstrap waits

artur-ciocanu · artur-ciocanu · commit 58e64190e137 · 2026-02-27T16:08:26.000-08:00
Signed-off-by: Artur Ciocanu &lt;artur.ciocanu@gmail.com&gt;
diff --git a/sdk-tests/src/test/java/io/dapr/it/actors/ActivationDeactivationIT.java b/sdk-tests/src/test/java/io/dapr/it/actors/ActivationDeactivationIT.java
@@ -27,7 +27,6 @@
 import io.dapr.testcontainers.internal.DaprContainerFactory;
 import io.dapr.testcontainers.internal.DaprSidecarContainer;
 import io.dapr.testcontainers.internal.spring.DaprSpringBootTest;
-import io.dapr.testcontainers.wait.strategy.DaprWait;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -69,8 +68,7 @@ void setUp() {
     actorRuntime.getConfig().setDrainOngoingCallTimeout(Duration.ofSeconds(10));
     actorRuntime.getConfig().setDrainBalancedActors(true);
     actorRuntime.registerActor(DemoActorImpl.class);
-    org.testcontainers.Testcontainers.exposeHostPorts(DAPR_CONTAINER.getAppPort());
-    DaprWait.forActors().waitUntilReady(DAPR_CONTAINER);
+    ActorTestBootstrap.exposeHostPortAndWaitForActorType(DAPR_CONTAINER, "DemoActorTest");
   }
 
   @Test
diff --git a/sdk-tests/src/test/java/io/dapr/it/actors/ActorExceptionIT.java b/sdk-tests/src/test/java/io/dapr/it/actors/ActorExceptionIT.java
@@ -26,7 +26,6 @@
 import io.dapr.testcontainers.internal.DaprContainerFactory;
 import io.dapr.testcontainers.internal.DaprSidecarContainer;
 import io.dapr.testcontainers.internal.spring.DaprSpringBootTest;
-import io.dapr.testcontainers.wait.strategy.DaprWait;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -58,8 +57,7 @@ public class ActorExceptionIT {
 
   @BeforeEach
   public void setUp() {
-    org.testcontainers.Testcontainers.exposeHostPorts(DAPR_CONTAINER.getAppPort());
-    DaprWait.forActors().waitUntilReady(DAPR_CONTAINER);
+    ActorTestBootstrap.exposeHostPortAndWaitForActorType(DAPR_CONTAINER, "MyActorTest");
   }
 
   private ActorClient newActorClient(Map<String, String> metadata) {
diff --git a/sdk-tests/src/test/java/io/dapr/it/actors/ActorMethodNameIT.java b/sdk-tests/src/test/java/io/dapr/it/actors/ActorMethodNameIT.java
@@ -26,7 +26,6 @@
 import io.dapr.testcontainers.internal.DaprContainerFactory;
 import io.dapr.testcontainers.internal.DaprSidecarContainer;
 import io.dapr.testcontainers.internal.spring.DaprSpringBootTest;
-import io.dapr.testcontainers.wait.strategy.DaprWait;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -58,8 +57,7 @@ public class ActorMethodNameIT {
 
   @BeforeEach
   void setUp() {
-    org.testcontainers.Testcontainers.exposeHostPorts(DAPR_CONTAINER.getAppPort());
-    DaprWait.forActors().waitUntilReady(DAPR_CONTAINER);
+    ActorTestBootstrap.exposeHostPortAndWaitForActorType(DAPR_CONTAINER, "MyActorTest");
   }
 
   @Test
diff --git a/sdk-tests/src/test/java/io/dapr/it/actors/ActorReminderRecoveryIT.java b/sdk-tests/src/test/java/io/dapr/it/actors/ActorReminderRecoveryIT.java
@@ -27,9 +27,7 @@
 import io.dapr.testcontainers.internal.DaprContainerFactory;
 import io.dapr.testcontainers.internal.DaprSidecarContainer;
 import io.dapr.testcontainers.internal.spring.DaprSpringBootTest;
-import io.dapr.testcontainers.wait.strategy.DaprWait;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -106,13 +104,8 @@ public static Stream<Arguments> data() {
     );
   }
 
-  @BeforeEach
-  public void setUp() {
-    org.testcontainers.Testcontainers.exposeHostPorts(DAPR_CONTAINER.getAppPort());
-  }
-
   public void setup(String actorType) {
-    DaprWait.forActorType(actorType).waitUntilReady(DAPR_CONTAINER);
+    ActorTestBootstrap.exposeHostPortAndWaitForActorType(DAPR_CONTAINER, actorType);
 
     this.actorType = actorType;
     this.actorId = new ActorId(UUID.randomUUID().toString());
diff --git a/sdk-tests/src/test/java/io/dapr/it/actors/ActorSdkResiliencyIT.java b/sdk-tests/src/test/java/io/dapr/it/actors/ActorSdkResiliencyIT.java
@@ -32,7 +32,6 @@
 import io.dapr.testcontainers.internal.DaprContainerFactory;
 import io.dapr.testcontainers.internal.DaprSidecarContainer;
 import io.dapr.testcontainers.internal.spring.DaprSpringBootTest;
-import io.dapr.testcontainers.wait.strategy.DaprWait;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -117,8 +116,7 @@ public static void init() throws IOException {
 
   @BeforeEach
   public void setUp() throws Exception {
-    org.testcontainers.Testcontainers.exposeHostPorts(DAPR_CONTAINER.getAppPort());
-    DaprWait.forActorType("DemoActorTest").waitUntilReady(DAPR_CONTAINER);
+    ActorTestBootstrap.exposeHostPortAndWaitForActorType(DAPR_CONTAINER, "DemoActorTest");
 
     removeToxics(grpcProxy);
     removeToxics(httpProxy);
diff --git a/sdk-tests/src/test/java/io/dapr/it/actors/ActorStateIT.java b/sdk-tests/src/test/java/io/dapr/it/actors/ActorStateIT.java
@@ -26,7 +26,6 @@
 import io.dapr.testcontainers.internal.DaprContainerFactory;
 import io.dapr.testcontainers.internal.DaprSidecarContainer;
 import io.dapr.testcontainers.internal.spring.DaprSpringBootTest;
-import io.dapr.testcontainers.wait.strategy.DaprWait;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -60,8 +59,7 @@ public class ActorStateIT {
 
   @BeforeEach
   void setUp() {
-    org.testcontainers.Testcontainers.exposeHostPorts(DAPR_CONTAINER.getAppPort());
-    DaprWait.forActorType("StatefulActorTest").waitUntilReady(DAPR_CONTAINER);
+    ActorTestBootstrap.exposeHostPortAndWaitForActorType(DAPR_CONTAINER, "StatefulActorTest");
   }
 
   @Test
diff --git a/sdk-tests/src/test/java/io/dapr/it/actors/ActorTestBootstrap.java b/sdk-tests/src/test/java/io/dapr/it/actors/ActorTestBootstrap.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2026 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.it.actors;
+
+import io.dapr.testcontainers.DaprContainer;
+import io.dapr.testcontainers.wait.strategy.DaprWait;
+
+import java.time.Duration;
+
+/**
+ * Shared bootstrap helpers for actor integration tests.
+ */
+public final class ActorTestBootstrap {
+
+  private static final Duration DEFAULT_ACTOR_WAIT_TIMEOUT = Duration.ofMinutes(2);
+
+  private ActorTestBootstrap() {
+  }
+
+  /**
+   * Expose host app port and wait for the given actor type to be registered in Dapr metadata.
+   *
+   * @param daprContainer sidecar container
+   * @param actorType actor type name to wait for
+   */
+  public static void exposeHostPortAndWaitForActorType(DaprContainer daprContainer, String actorType) {
+    org.testcontainers.Testcontainers.exposeHostPorts(daprContainer.getAppPort());
+    DaprWait.forActorType(actorType)
+        .withStartupTimeout(DEFAULT_ACTOR_WAIT_TIMEOUT)
+        .waitUntilReady(daprContainer);
+  }
+
+  /**
+   * Expose host app port and wait until at least one actor is registered.
+   *
+   * @param daprContainer sidecar container
+   */
+  public static void exposeHostPortAndWaitForAnyActor(DaprContainer daprContainer) {
+    org.testcontainers.Testcontainers.exposeHostPorts(daprContainer.getAppPort());
+    DaprWait.forActors()
+        .withStartupTimeout(DEFAULT_ACTOR_WAIT_TIMEOUT)
+        .waitUntilReady(daprContainer);
+  }
+}
diff --git a/sdk-tests/src/test/java/io/dapr/it/actors/ActorTimerRecoveryIT.java b/sdk-tests/src/test/java/io/dapr/it/actors/ActorTimerRecoveryIT.java
@@ -71,7 +71,7 @@ public class ActorTimerRecoveryIT {
    */
   @Test
   public void timerRecoveryTest() throws Exception {
-    org.testcontainers.Testcontainers.exposeHostPorts(DAPR_CONTAINER.getAppPort());
+    ActorTestBootstrap.exposeHostPortAndWaitForActorType(DAPR_CONTAINER, ACTOR_TYPE);
 
     ActorClient refreshedActorClient = actorClient;
     try {
@@ -100,6 +100,7 @@ public void timerRecoveryTest() throws Exception {
 
       DAPR_CONTAINER.stop();
       DAPR_CONTAINER.start();
+      ActorTestBootstrap.exposeHostPortAndWaitForActorType(DAPR_CONTAINER, ACTOR_TYPE);
       refreshedActorClient = new ActorClient(new Properties(Map.of(
           "dapr.http.endpoint", DAPR_CONTAINER.getHttpEndpoint(),
           "dapr.grpc.endpoint", DAPR_CONTAINER.getGrpcEndpoint()
diff --git a/sdk-tests/src/test/java/io/dapr/it/actors/ActorTurnBasedConcurrencyIT.java b/sdk-tests/src/test/java/io/dapr/it/actors/ActorTurnBasedConcurrencyIT.java
@@ -26,7 +26,6 @@
 import io.dapr.testcontainers.internal.DaprContainerFactory;
 import io.dapr.testcontainers.internal.DaprSidecarContainer;
 import io.dapr.testcontainers.internal.spring.DaprSpringBootTest;
-import io.dapr.testcontainers.wait.strategy.DaprWait;
 import io.dapr.utils.Version;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
@@ -81,8 +80,7 @@ public class ActorTurnBasedConcurrencyIT {
 
   @BeforeEach
   public void setUp() {
-    org.testcontainers.Testcontainers.exposeHostPorts(DAPR_CONTAINER.getAppPort());
-    DaprWait.forActorType(ACTOR_TYPE).waitUntilReady(DAPR_CONTAINER);
+    ActorTestBootstrap.exposeHostPortAndWaitForActorType(DAPR_CONTAINER, ACTOR_TYPE);
   }
 
   @AfterEach
diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestDaprActorsConfiguration.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/actors/TestDaprActorsConfiguration.java
@@ -13,8 +13,6 @@
 
 package io.dapr.it.testcontainers.actors;
 
-import java.util.Map;
-
 import io.dapr.actors.runtime.ActorRuntime;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -23,8 +21,13 @@
 import io.dapr.actors.client.ActorClient;
 import io.dapr.config.Properties;
 
+import java.lang.reflect.Field;
+import java.util.Map;
+
 @Configuration
 public class TestDaprActorsConfiguration {
+  private static final Object ACTOR_RUNTIME_RESET_LOCK = new Object();
+
   @Bean
   public ActorClient daprActorClient(
       @Value("${dapr.http.endpoint}") String daprHttpEndpoint,
@@ -43,11 +46,29 @@ public ActorRuntime daprActorRuntime(
       @Value("${dapr.http.endpoint}") String daprHttpEndpoint,
       @Value("${dapr.grpc.endpoint}") String daprGrpcEndpoint
   ){
+    resetActorRuntimeSingleton();
+
     Map<String, String> overrides = Map.of(
 	      "dapr.http.endpoint", daprHttpEndpoint,
         "dapr.grpc.endpoint", daprGrpcEndpoint
     );
 
     return ActorRuntime.getInstance(new Properties(overrides));
   }
+
+  private static void resetActorRuntimeSingleton() {
+    synchronized (ACTOR_RUNTIME_RESET_LOCK) {
+      try {
+        Field instanceField = ActorRuntime.class.getDeclaredField("instance");
+        instanceField.setAccessible(true);
+        ActorRuntime instance = (ActorRuntime) instanceField.get(null);
+        if (instance != null) {
+          instance.close();
+          instanceField.set(null, null);
+        }
+      } catch (ReflectiveOperationException e) {
+        throw new IllegalStateException("Failed to reset ActorRuntime singleton for test isolation.", e);
+      }
+    }
+  }
 }
diff --git a/sdk-tests/src/test/java/io/dapr/testcontainers/internal/spring/DaprSpringBootTest.java b/sdk-tests/src/test/java/io/dapr/testcontainers/internal/spring/DaprSpringBootTest.java
@@ -18,6 +18,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.core.annotation.AliasFor;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -57,6 +58,7 @@
 @ExtendWith(DaprSpringBootExtension.class)  // Must be first to register container before Spring starts
 @Testcontainers  // Starts containers via @Container/@DaprSidecarContainer
 @ContextConfiguration(initializers = DaprSpringBootContextInitializer.class)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 @SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT)  // Starts Spring context last
 public @interface DaprSpringBootTest {
 
diff --git a/spring-boot-4-sdk-tests/src/test/java/io/dapr/it/springboot4/testcontainers/actors/TestDaprActorsConfiguration.java b/spring-boot-4-sdk-tests/src/test/java/io/dapr/it/springboot4/testcontainers/actors/TestDaprActorsConfiguration.java
@@ -13,8 +13,6 @@
 
 package io.dapr.it.springboot4.testcontainers.actors;
 
-import java.util.Map;
-
 import io.dapr.actors.runtime.ActorRuntime;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -23,8 +21,13 @@
 import io.dapr.actors.client.ActorClient;
 import io.dapr.config.Properties;
 
+import java.lang.reflect.Field;
+import java.util.Map;
+
 @Configuration
 public class TestDaprActorsConfiguration {
+  private static final Object ACTOR_RUNTIME_RESET_LOCK = new Object();
+
   @Bean
   public ActorClient daprActorClient(
       @Value("${dapr.http.endpoint}") String daprHttpEndpoint,
@@ -43,11 +46,29 @@ public ActorRuntime daprActorRuntime(
       @Value("${dapr.http.endpoint}") String daprHttpEndpoint,
       @Value("${dapr.grpc.endpoint}") String daprGrpcEndpoint
   ){
+    resetActorRuntimeSingleton();
+
     Map<String, String> overrides = Map.of(
 	      "dapr.http.endpoint", daprHttpEndpoint,
         "dapr.grpc.endpoint", daprGrpcEndpoint
     );
 
     return ActorRuntime.getInstance(new Properties(overrides));
   }
+
+  private static void resetActorRuntimeSingleton() {
+    synchronized (ACTOR_RUNTIME_RESET_LOCK) {
+      try {
+        Field instanceField = ActorRuntime.class.getDeclaredField("instance");
+        instanceField.setAccessible(true);
+        ActorRuntime instance = (ActorRuntime) instanceField.get(null);
+        if (instance != null) {
+          instance.close();
+          instanceField.set(null, null);
+        }
+      } catch (ReflectiveOperationException e) {
+        throw new IllegalStateException("Failed to reset ActorRuntime singleton for test isolation.", e);
+      }
+    }
+  }
 }
diff --git a/spring-boot-4-sdk-tests/src/test/java/io/dapr/it/springboot4/testcontainers/spring/DaprSpringBootTest.java b/spring-boot-4-sdk-tests/src/test/java/io/dapr/it/springboot4/testcontainers/spring/DaprSpringBootTest.java
@@ -18,6 +18,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.core.annotation.AliasFor;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -57,6 +58,7 @@
 @ExtendWith(DaprSpringBootExtension.class)  // Must be first to register container before Spring starts
 @Testcontainers  // Starts containers via @Container/@DaprSidecarContainer
 @ContextConfiguration(initializers = DaprSpringBootContextInitializer.class)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 @SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT)  // Starts Spring context last
 public @interface DaprSpringBootTest {
 
