diff --git a/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/WildflyTest.java b/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/WildflyTest.java index 92c2e216966f..5075817213ed 100644 --- a/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/WildflyTest.java +++ b/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/WildflyTest.java @@ -23,6 +23,7 @@ class WildflyTest extends TargetSystemTest { private static final int WILDFLY_SERVICE_PORT = 8080; + private static final String LEGACY_WILDFLY_IMAGE = "jboss/wildfly:10.1.0.Final"; @ParameterizedTest @ValueSource( @@ -46,7 +47,10 @@ void testWildflyMetrics(String dockerImage) { .withStartupTimeout(Duration.ofMinutes(2)) .withExposedPorts(WILDFLY_SERVICE_PORT) .withEnv("JAVA_TOOL_OPTIONS", String.join(" ", jvmArgs)) - .waitingFor(Wait.forListeningPorts(WILDFLY_SERVICE_PORT)); + .waitingFor( + Wait.forHttp(testAppPath(dockerImage)) + .forPort(WILDFLY_SERVICE_PORT) + .withStartupTimeout(Duration.ofMinutes(2))); copyAgentToTarget(target); copyYamlFilesToTarget(target, yamlFiles); @@ -207,4 +211,8 @@ dataSourceAttribute, attribute("db.client.connection.state", "idle")))) .hasUnit("{transaction}") .hasDataPointsWithoutAttributes()); } + + private static String testAppPath(String dockerImage) { + return dockerImage.equals(LEGACY_WILDFLY_IMAGE) ? "/testapp/javax/" : "/testapp/jakarta/"; + } }