Skip to content

Fix failing upstream test in PR build #1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 15, 2025
Merged

Fix failing upstream test in PR build #1239

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
77c42d8
add delay for failing tomcat metrics test
Oct 14, 2025
8667004
save test reports in case of additional failure
Oct 14, 2025
5a41ca7
remove flaky tomcat version of test
Oct 14, 2025
3a6679b
Revert "save test reports in case of additional failure"
Oct 14, 2025
e4cb579
add comment to patch
Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion .github/patches/opentelemetry-java-instrumentation.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,20 @@ index 98def282f8..65fd6a8a13 100644
"io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
"io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources:${otelContribVersion}",
"io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
diff --git a/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java b/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java
index 1234567890..abcdef1234 100644
--- a/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java
+++ b/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java
@@ -20,8 +20,8 @@ public class TomcatIntegrationTest extends TargetSystemTest {

@ParameterizedTest
@CsvSource({
+ // TODO: Remove this patch after we no longer depend on 2.18.1 of opentelemetry-java-instrumentation.
"tomcat:10.0, https://tomcat.apache.org/tomcat-10.0-doc/appdev/sample/sample.war",
- "tomcat:9.0, https://tomcat.apache.org/tomcat-9.0-doc/appdev/sample/sample.war"
})
void testCollectedMetrics(String dockerImageName, String sampleWebApplicationUrl)
throws Exception {
diff --git a/version.gradle.kts b/version.gradle.kts
index 023d04703c..ec9690086c 100644
--- a/version.gradle.kts
Expand All @@ -25,4 +39,3 @@ index 023d04703c..ec9690086c 100644
if (findProperty("otel.stable") != "true") {
--
2.45.1

Loading