Cleanup unnecessary env variables.

Removed env file and use JAVA_TOOL_OPTIONS instead to pass JMX options to ActiveMQ
open-telemetry · Oct 18, 2024 · 3f7d02f · 3f7d02f
1 parent 36bc5aa
commit 3f7d02f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 127 deletions.
diff --git a/...Test/java/io/opentelemetry/contrib/jmxscraper/target_systems/ActiveMqIntegrationTest.java b/...Test/java/io/opentelemetry/contrib/jmxscraper/target_systems/ActiveMqIntegrationTest.java
@@ -14,7 +14,6 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.utility.MountableFile;
 
 public class ActiveMqIntegrationTest extends TargetSystemIntegrationTest {
 
@@ -24,13 +23,8 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
             new ImageFromDockerfile()
                 .withDockerfileFromBuilder(
                     builder -> builder.from("apache/activemq-classic:5.18.6").build()))
-        .withEnv("LOCAL_JMX", "no")
-        .withCopyFileToContainer(
-            // Overwrite default ActiveMQ configuration in order to let ActiveMQ use JMX options
-            // stored in $ACTIVEMQ_JMX_OPTS env variable defined below
-            MountableFile.forClasspathResource("activemq/env"), "/opt/apache-activemq/bin/env")
         .withEnv(
-            "ACTIVEMQ_JMX_OPTS",
+            "JAVA_TOOL_OPTIONS",
             "-Dcom.sun.management.jmxremote.port="
                 + jmxPort
                 + " -Dcom.sun.management.jmxremote.rmi.port="

diff --git a/...onTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TomcatIntegrationTest.java b/...onTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TomcatIntegrationTest.java
@@ -30,7 +30,6 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
                                 "https://tomcat.apache.org/tomcat-9.0-doc/appdev/sample/sample.war",
                                 "/usr/local/tomcat/webapps/ROOT.war")
                             .build()))
-        .withEnv("LOCAL_JMX", "no")
         .withEnv(
             "CATALINA_OPTS",
             "-Dcom.sun.management.jmxremote.local.only=false"

diff --git a/jmx-scraper/src/main/resources/activemq/env b/jmx-scraper/src/main/resources/activemq/env