post-review changes

Author: SylvainJuge

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

@@ -25,7 +25,7 @@ public class JmxScraperContainer extends GenericContainer<JmxScraperContainer> {
   private final Set<String> targetSystems;
   private String serviceUrl;
   private int intervalMillis;
-  private final Set<String> customYaml;
+  private final Set<String> customYamlFiles;
 
   public JmxScraperContainer(String otlpEndpoint) {
     super("openjdk:8u272-jre-slim");
@@ -40,7 +40,7 @@ public JmxScraperContainer(String otlpEndpoint) {
 
     this.endpoint = otlpEndpoint;
     this.targetSystems = new HashSet<>();
-    this.customYaml = new HashSet<>();
+    this.customYamlFiles = new HashSet<>();
     this.intervalMillis = 1000;
   }
 
@@ -67,7 +67,7 @@ public JmxScraperContainer withService(String host, int port) {
 
   @CanIgnoreReturnValue
   public JmxScraperContainer withCustomYaml(String yamlPath) {
-    this.customYaml.add(yamlPath);
+    this.customYamlFiles.add(yamlPath);
     return this;
   }
 
@@ -88,19 +88,11 @@ public void start() {
     arguments.add("-Dotel.jmx.service.url=" + serviceUrl);
     arguments.add("-Dotel.jmx.interval.milliseconds=" + intervalMillis);
 
-    if (!customYaml.isEmpty()) {
-      int i = 0;
-      StringBuilder sb = new StringBuilder("-Dotel.jmx.config=");
-      for (String yaml : customYaml) {
-        String containerPath = "/custom_" + i + ".yaml";
-        this.withCopyFileToContainer(MountableFile.forClasspathResource(yaml), containerPath);
-        if (i > 0) {
-          sb.append(",");
-        }
-        sb.append(containerPath);
-        i++;
+    if (!customYamlFiles.isEmpty()) {
+      for (String yaml : customYamlFiles) {
+        this.withCopyFileToContainer(MountableFile.forClasspathResource(yaml), yaml);
       }
-      arguments.add(sb.toString());
+      arguments.add("-Dotel.jmx.config=" + String.join(",", customYamlFiles));
     }
 
     arguments.add("-jar");

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

@@ -58,11 +58,6 @@ public TestAppContainer withUserAuth(String login, String pwd) {
     return this;
   }
 
-  @Override
-  protected void doStart() {
-    super.doStart();
-  }
-
   @Override
   public void start() {
 

jmx-scraper/src/main/java/io/opentelemetry/contrib/jmxscraper/JmxScraper.java

@@ -36,12 +36,12 @@ public class JmxScraper {
    */
   @SuppressWarnings({"SystemOut", "SystemExitOutsideMain"})
   public static void main(String[] args) {
+    JmxScraperConfig config = null;
+    JmxScraper jmxScraper = null;
     try {
       JmxScraperConfigFactory factory = new JmxScraperConfigFactory();
-      JmxScraperConfig config = JmxScraper.createConfigFromArgs(Arrays.asList(args), factory);
-
-      JmxScraper jmxScraper = new JmxScraper(config);
-      jmxScraper.start();
+      config = JmxScraper.createConfigFromArgs(Arrays.asList(args), factory);
+      jmxScraper = new JmxScraper(config);
 
     } catch (ArgumentsParsingException e) {
       System.err.println(
@@ -52,6 +52,13 @@ public static void main(String[] args) {
       System.err.println(e.getMessage());
       System.exit(1);
     }
+
+    try {
+      jmxScraper.start();
+    } catch (IOException e) {
+      System.err.println("Unable to connect to " + config.getServiceUrl() + " " + e.getMessage());
+      System.exit(2);
+    }
   }
 
   /**
@@ -96,11 +103,7 @@ private static void loadPropertiesFromPath(Properties props, String path)
   }
 
   JmxScraper(JmxScraperConfig config) throws ConfigurationException {
-
     String serviceUrl = config.getServiceUrl();
-    if (serviceUrl == null) {
-      throw new ConfigurationException("missing service URL");
-    }
     int interval = config.getIntervalMilliseconds();
     if (interval < 0) {
       throw new ConfigurationException("interval must be positive");
@@ -110,15 +113,12 @@ private static void loadPropertiesFromPath(Properties props, String path)
     // this.service = JmxMetricInsight.createService(GlobalOpenTelemetry.get(), interval);
   }
 
-  private void start() {
+  private void start() throws IOException {
+
+    JMXConnector connector = client.connect();
+
     @SuppressWarnings("unused")
-    MBeanServerConnection connection;
-    try {
-      JMXConnector connector = client.connect();
-      connection = connector.getMBeanServerConnection();
-    } catch (IOException e) {
-      throw new IllegalStateException(e);
-    }
+    MBeanServerConnection connection = connector.getMBeanServerConnection();
 
     // TODO: depend on instrumentation 2.9.0 snapshot
     // MetricConfiguration metricConfig = new MetricConfiguration();