use legacy for all

Author: breedx-splk

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");
   }

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);

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TomcatIntegrationTest.java

@@ -42,7 +42,7 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
   @Override
   protected JmxScraperContainer customizeScraperContainer(
       JmxScraperContainer scraper, GenericContainer<?> target, Path tempDir) {
-    return scraper.withTargetSystemSource("legacy").withTargetSystem("tomcat");
+    return scraper.withTargetSystem("tomcat");
   }
 
   @Override