Skip to content

Commit 5a41ca7

Browse files
author
ADOT Patch workflow
committed
remove flaky tomcat version of test
1 parent 8667004 commit 5a41ca7

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

.github/patches/opentelemetry-java-instrumentation.patch

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@ diff --git a/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/
1515
index 1234567890..abcdef1234 100644
1616
--- a/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java
1717
+++ b/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java
18-
@@ -49,6 +49,9 @@ public class TomcatIntegrationTest extends TargetSystemTest {
19-
target.execInContainer(
20-
"curl", sampleWebApplicationUrl, "-o", "/usr/local/tomcat/webapps/ROOT.war");
21-
22-
+ // Wait for deployment and session metrics registration, fixes issue with missing metrics in Tomcat 9.0
23-
+ Thread.sleep(10000);
24-
+
25-
verifyMetrics(createMetricsVerifier());
26-
}
27-
18+
@@ -21,7 +21,6 @@ public class TomcatIntegrationTest extends TargetSystemTest {
19+
@ParameterizedTest
20+
@CsvSource({
21+
"tomcat:10.0, https://tomcat.apache.org/tomcat-10.0-doc/appdev/sample/sample.war",
22+
- "tomcat:9.0, https://tomcat.apache.org/tomcat-9.0-doc/appdev/sample/sample.war"
23+
})
24+
void testCollectedMetrics(String dockerImageName, String sampleWebApplicationUrl)
25+
throws Exception {
2826
diff --git a/version.gradle.kts b/version.gradle.kts
2927
index 023d04703c..ec9690086c 100644
3028
--- a/version.gradle.kts

0 commit comments

Comments
 (0)