Skip to content

fix tomcat integration test #1991

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 2 commits into from
Jul 3, 2025
+6 −6
Merged

fix tomcat integration test #1991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd26277
use legacy source
breedx-splk Jul 3, 2025
7a9bf73
use legacy for all
breedx-splk Jul 3, 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
6 changes: 0 additions & 6 deletions ...ationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@ protected JmxScraperContainer customizeScraperContainer(
JmxScraperContainer scraper, GenericContainer<?> target, Path tempDir) {
return scraper
.withTargetSystem("jvm")
// Since JVM metrics were be added to instrumentation, the default "auto" source
// means that the definitions in instrumentation will be used, and thus this test will fail
// due to metrics differences, adding an explicit "legacy" source is required to continue
// testing the JVM metrics defined in this project.
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13392
.withTargetSystemSource("legacy")
// also testing custom yaml
.withCustomYaml("custom-metrics.yaml");
}
Expand Down
6 changes: 6 additions & 0 deletions .../java/io/opentelemetry/contrib/jmxscraper/target_systems/TargetSystemIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@ protected void startContainers(Path tmpDir) {
// Create and initialize scraper container
scraper =
new JmxScraperContainer(otlpEndpoint, scraperBaseImage())
// Since JVM metrics were be added to instrumentation, the default "auto" source
// means that the definitions in instrumentation will be used, and thus tests will fail
// due to metrics differences, adding an explicit "legacy" source is required to
// continue
// testing metrics defined in this project.
.withTargetSystemSource("legacy")
.withLogConsumer(new Slf4jLogConsumer(jmxScraperLogger))
.withNetwork(network)
.withRmiServiceUrl(TARGET_SYSTEM_NETWORK_ALIAS, JMX_PORT);
Expand Down