diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java index 29b698eb5..e29021a93 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/JvmIntegrationTest.java @@ -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"); } diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TargetSystemIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TargetSystemIntegrationTest.java index 9c58c07fc..e74e93180 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TargetSystemIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TargetSystemIntegrationTest.java @@ -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);