Skip to content

Commit 92c279c

Browse files
authored
fix tomcat integration test (#1991)
1 parent dd5058d commit 92c279c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ protected JmxScraperContainer customizeScraperContainer(
3232
JmxScraperContainer scraper, GenericContainer<?> target, Path tempDir) {
3333
return scraper
3434
.withTargetSystem("jvm")
35-
// Since JVM metrics were be added to instrumentation, the default "auto" source
36-
// means that the definitions in instrumentation will be used, and thus this test will fail
37-
// due to metrics differences, adding an explicit "legacy" source is required to continue
38-
// testing the JVM metrics defined in this project.
39-
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13392
40-
.withTargetSystemSource("legacy")
4135
// also testing custom yaml
4236
.withCustomYaml("custom-metrics.yaml");
4337
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,12 @@ protected void startContainers(Path tmpDir) {
143143
// Create and initialize scraper container
144144
scraper =
145145
new JmxScraperContainer(otlpEndpoint, scraperBaseImage())
146+
// Since JVM metrics were be added to instrumentation, the default "auto" source
147+
// means that the definitions in instrumentation will be used, and thus tests will fail
148+
// due to metrics differences, adding an explicit "legacy" source is required to
149+
// continue
150+
// testing metrics defined in this project.
151+
.withTargetSystemSource("legacy")
146152
.withLogConsumer(new Slf4jLogConsumer(jmxScraperLogger))
147153
.withNetwork(network)
148154
.withRmiServiceUrl(TARGET_SYSTEM_NETWORK_ALIAS, JMX_PORT);

0 commit comments

Comments
 (0)