detect container startup with open ports

open-telemetry · Nov 12, 2024 · 3ab2f28 · 3ab2f28 · robsunday · Nov 12, 2024
1 parent 83ad212
commit 3ab2f28
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/...Test/java/io/opentelemetry/contrib/jmxscraper/target_systems/ActiveMqIntegrationTest.java b/...Test/java/io/opentelemetry/contrib/jmxscraper/target_systems/ActiveMqIntegrationTest.java
@@ -25,7 +25,8 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
                     builder -> builder.from("apache/activemq-classic:5.18.6").build()))
         .withEnv("JAVA_TOOL_OPTIONS", genericJmxJvmArguments(jmxPort))
         .withStartupTimeout(Duration.ofMinutes(2))
-        .waitingFor(Wait.forLogMessage(".*Apache ActiveMQ.*started.*", 1));
+        .withExposedPorts(61616, jmxPort)
+        .waitingFor(Wait.forListeningPorts(61616, jmxPort));
   }
 
   @Override

diff --git a/...est/java/io/opentelemetry/contrib/jmxscraper/target_systems/CassandraIntegrationTest.java b/...est/java/io/opentelemetry/contrib/jmxscraper/target_systems/CassandraIntegrationTest.java
@@ -30,7 +30,8 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
                 // making cassandra startup faster for single node, from ~1min to ~15s
                 + " -Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0")
         .withStartupTimeout(Duration.ofMinutes(2))
-        .waitingFor(Wait.forLogMessage(".*Startup complete.*", 1));
+        .withExposedPorts(9042, jmxPort)
+        .waitingFor(Wait.forListeningPorts(9042, jmxPort));
   }
 
   @Override

diff --git a/...ionTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JettyIntegrationTest.java b/...ionTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JettyIntegrationTest.java
@@ -39,7 +39,8 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
     container
         .withEnv("JAVA_OPTIONS", genericJmxJvmArguments(jmxPort))
         .withStartupTimeout(Duration.ofMinutes(2))
-        .waitingFor(Wait.forLogMessage(".*Started Server.*", 1));
+        .withExposedPorts(8080, jmxPort)
+        .waitingFor(Wait.forListeningPorts(8080, jmxPort));
 
     return container;
   }

diff --git a/...ationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java b/...ationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java
@@ -14,13 +14,18 @@
 import java.util.Arrays;
 import java.util.List;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
 
 public class JvmIntegrationTest extends TargetSystemIntegrationTest {
 
   @Override
   protected GenericContainer<?> createTargetContainer(int jmxPort) {
     // reusing test application for JVM metrics and custom yaml
-    return new TestAppContainer().withJmxPort(jmxPort);
+    //noinspection resource
+    return new TestAppContainer()
+        .withJmxPort(jmxPort)
+        .withExposedPorts(jmxPort)
+        .waitingFor(Wait.forListeningPorts(jmxPort));
   }
 
   @Override

diff --git a/...onTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TomcatIntegrationTest.java b/...onTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TomcatIntegrationTest.java
@@ -32,7 +32,8 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
                             .build()))
         .withEnv("CATALINA_OPTS", genericJmxJvmArguments(jmxPort))
         .withStartupTimeout(Duration.ofMinutes(2))
-        .waitingFor(Wait.forListeningPort());
+        .withExposedPorts(8080, jmxPort)
+        .waitingFor(Wait.forListeningPorts(8080, jmxPort));
   }
 
   @Override

diff --git a/...nTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/WildflyIntegrationTest.java b/...nTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/WildflyIntegrationTest.java
@@ -59,7 +59,8 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
             MountableFile.forHostPath(appWarPath),
             "/opt/jboss/wildfly/standalone/deployments/testapp.war")
         .withStartupTimeout(Duration.ofMinutes(2))
-        .waitingFor(Wait.forLogMessage(".*Http management interface listening on.*", 1));
+        .withExposedPorts(8080, 9990)
+        .waitingFor(Wait.forListeningPorts(8080, 9990));
   }
 
   @Override