tidy a few things

Author: SylvainJuge

jmx-scraper/build.gradle.kts

@@ -29,7 +29,6 @@ testing {
       dependencies {
         implementation("org.testcontainers:junit-jupiter")
         implementation("org.slf4j:slf4j-simple")
-        implementation("com.linecorp.armeria:armeria-grpc")
         implementation("com.linecorp.armeria:armeria-junit5")
         implementation("com.linecorp.armeria:armeria-grpc")
         implementation("io.opentelemetry.proto:opentelemetry-proto:0.20.0-alpha")

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

@@ -7,13 +7,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.MountableFile;
@@ -108,6 +108,8 @@ public void start() {
 
     this.withCommand(arguments.toArray(new String[0]));
 
+    logger().info("Starting scraper with command: " + String.join(" ", arguments));
+
     super.start();
   }
 }

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

@@ -16,8 +16,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.shaded.com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -26,8 +24,6 @@
 /** Test container that allows to execute {@link TestApp} in an isolated container */
 public class TestAppContainer extends GenericContainer<TestAppContainer> {
 
-  private static final Logger logger = LoggerFactory.getLogger(TestAppContainer.class);
-
   private final Map<String, String> properties;
   private int port;
   private String login;
@@ -101,11 +97,11 @@ public void start() {
 
     this.withEnv("JAVA_TOOL_OPTIONS", confArgs);
 
-    logger.info("Test application JAVA_TOOL_OPTIONS = " + confArgs);
+    logger().info("Test application JAVA_TOOL_OPTIONS = " + confArgs);
 
     super.start();
 
-    logger.info("Test application JMX port mapped to {}:{}", getHost(), getMappedPort(port));
+    logger().info("Test application JMX port mapped to {}:{}", getHost(), getMappedPort(port));
   }
 
   private static Path createPwdFile(String login, String pwd) {

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

@@ -37,6 +37,7 @@
 public abstract class TargetSystemIntegrationTest {
 
   private static final Logger logger = LoggerFactory.getLogger(TargetSystemIntegrationTest.class);
+  public static final String TARGET_SYSTEM_NETWORK_ALIAS = "targetsystem";
   private static String otlpEndpoint;
 
   /**
@@ -95,28 +96,30 @@ void endToEndTest() {
             .withLogConsumer(new Slf4jLogConsumer(logger))
             .withNetwork(network)
             .withExposedPorts(JMX_PORT)
-            .withNetworkAliases("target_system");
+            .withNetworkAliases(TARGET_SYSTEM_NETWORK_ALIAS);
     target.start();
 
     String targetHost = target.getHost();
     Integer targetPort = target.getMappedPort(JMX_PORT);
     logger.info(
         "Target system started, JMX port: {} mapped to {}:{}", JMX_PORT, targetHost, targetPort);
 
-    scraper = new JmxScraperContainer(otlpEndpoint).withService("target_system", JMX_PORT);
-
-    scraper = customizeScraperContainer(scraper);
-    logger.info("starting scraper with command: {}", String.join(" ", scraper.getCommandParts()));
-
-    scraper.start();
-
     // TODO : wait for metrics to be sent and add assertions on what is being captured
     // for now we just test that we can connect to remote JMX using our client.
     try (JMXConnector connector = JmxRemoteClient.createNew(targetHost, targetPort).connect()) {
       assertThat(connector.getMBeanServerConnection()).isNotNull();
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
+
+    scraper =
+        new JmxScraperContainer(otlpEndpoint)
+            .withNetwork(network)
+            .withService(TARGET_SYSTEM_NETWORK_ALIAS, JMX_PORT);
+
+    scraper = customizeScraperContainer(scraper);
+    scraper.start();
+
     // TODO: replace with real assertions
     assertThat(otlpServer.getMetrics()).isEmpty();
   }

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

@@ -126,5 +126,12 @@ private void start() {
     // service.startRemote(metricConfig, () -> Collections.singletonList(connection));
 
     logger.info("JMX scraping started");
+
+    // TODO: wait a bit to keep the JVM running, this won't be needed once calling jmx insight
+    try {
+      Thread.sleep(5000);
+    } catch (InterruptedException e) {
+      throw new IllegalStateException(e);
+    }
   }
 }