diff --git a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java index 0414b99d53..2d33e0dd19 100644 --- a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java +++ b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java @@ -29,6 +29,7 @@ import jakarta.jms.MessageConsumer; import jakarta.jms.MessageProducer; import jakarta.jms.Session; import jakarta.jms.TextMessage; +import java.time.Duration; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; @@ -48,6 +49,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.containers.wait.strategy.Wait; class Jms3InstrumentationTest { @@ -70,6 +72,8 @@ class Jms3InstrumentationTest { .withEnv("AMQ_USER", "test") .withEnv("AMQ_PASSWORD", "test") .withExposedPorts(61616, 8161) + .waitingFor(Wait.forLogMessage(".*Server is now live.*", 1)) + .withStartupTimeout(Duration.ofMinutes(2)) .withLogConsumer(new Slf4jLogConsumer(logger)); broker.start(); diff --git a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java index 6b49edbc99..585c7bc52c 100644 --- a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java +++ b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java @@ -21,6 +21,7 @@ import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtens import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; import jakarta.jms.ConnectionFactory; +import java.time.Duration; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; @@ -44,6 +45,7 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.jms.core.JmsTemplate; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.containers.wait.strategy.Wait; class SpringJmsListenerTest { @@ -63,6 +65,8 @@ class SpringJmsListenerTest { .withEnv("AMQ_USER", "test") .withEnv("AMQ_PASSWORD", "test") .withExposedPorts(61616, 8161) + .waitingFor(Wait.forLogMessage(".*Server is now live.*", 1)) + .withStartupTimeout(Duration.ofMinutes(2)) .withLogConsumer(new Slf4jLogConsumer(logger)); broker.start(); }