Improve rabbitmq startup check (#4813)

open-telemetry · Dec 6, 2021 · 3188350 · 3188350
1 parent b994497
commit 3188350
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/WithRabbitMqTrait.groovy b/instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/WithRabbitMqTrait.groovy
@@ -4,19 +4,26 @@
  */
 
 import com.rabbitmq.client.ConnectionFactory
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import org.testcontainers.containers.GenericContainer
 
 import java.time.Duration
+import org.testcontainers.containers.output.Slf4jLogConsumer
+import org.testcontainers.containers.wait.strategy.Wait
 
 trait WithRabbitMqTrait {
+ private static final Logger logger = LoggerFactory.getLogger("io.opentelemetry.testing.rabbitmq-container")
 
  static GenericContainer rabbitMqContainer
  static ConnectionFactory connectionFactory
 
  def startRabbit() {
  rabbitMqContainer = new GenericContainer('rabbitmq:latest')
  .withExposedPorts(5672)
- .withStartupTimeout(Duration.ofSeconds(120))
+ .withLogConsumer(new Slf4jLogConsumer(logger))
+ .waitingFor(Wait.forLogMessage(".*Server startup complete.*", 1))
+ .withStartupTimeout(Duration.ofMinutes(2))
  rabbitMqContainer.start()
 
  connectionFactory = new ConnectionFactory(