fix tests

Author: SylvainJuge

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

@@ -25,6 +25,7 @@
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -37,6 +38,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.annotation.Nullable;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
@@ -146,24 +148,24 @@ private static boolean testConnection(JmxConnectorBuilder connectorBuilder) {
     }
   }
 
-  // TODO : test on local JVM and call it more than once for stability
+  @Nullable
   static UUID getRemoteServiceInstanceId(JmxConnectorBuilder connectorBuilder) {
     try (JMXConnector jmxConnector = connectorBuilder.build()) {
       MBeanServerConnection connection = jmxConnector.getMBeanServerConnection();
 
       StringBuilder id = new StringBuilder();
       try {
         ObjectName objectName = new ObjectName("java.lang:type=Runtime");
-        for (String attribute : Arrays.asList("StartTime", "Pid", "Name")) {
+        for (String attribute : Arrays.asList("StartTime", "Name")) {
           Object value = connection.getAttribute(objectName, attribute);
           if (id.length() > 0) {
-            id.append(",");
+            id.append(" ");
           }
           id.append(value);
         }
-        return UUID.nameUUIDFromBytes(id.toString().getBytes());
+        return UUID.nameUUIDFromBytes(id.toString().getBytes(StandardCharsets.UTF_8));
       } catch (Exception e) {
-        throw new RuntimeException(e);
+        throw new IllegalStateException(e);
       }
     } catch (IOException e) {
       return null;

jmx-scraper/src/test/java/io/opentelemetry/contrib/jmxscraper/config/PropertiesCustomizerTest.java

@@ -17,16 +17,20 @@
 
 class PropertiesCustomizerTest {
 
+  private static final String DUMMY_URL = "service:jmx:rmi:///jndi/rmi://host:999/jmxrmi";
+
   @Test
-  void tryGetConfigBeforeApply() {
+  void tryGetBeforeApply() {
     assertThatThrownBy(() -> new PropertiesCustomizer().getScraperConfig())
         .isInstanceOf(IllegalStateException.class);
+    assertThatThrownBy(() -> new PropertiesCustomizer().getConnectorBuilder())
+        .isInstanceOf(IllegalStateException.class);
   }
 
   @Test
   void defaultOtlpExporter() {
     Map<String, String> map = new HashMap<>();
-    map.put("otel.jmx.service.url", "dummy-url");
+    map.put("otel.jmx.service.url", DUMMY_URL);
     map.put("otel.jmx.target.system", "jvm");
     ConfigProperties config = DefaultConfigProperties.createFromMap(map);
 
@@ -37,7 +41,7 @@ void defaultOtlpExporter() {
   @Test
   void explicitExporterSet() {
     Map<String, String> map = new HashMap<>();
-    map.put("otel.jmx.service.url", "dummy-url");
+    map.put("otel.jmx.service.url", DUMMY_URL);
     map.put("otel.jmx.target.system", "jvm");
     map.put("otel.metrics.exporter", "otlp,logging");
     ConfigProperties config = DefaultConfigProperties.createFromMap(map);
@@ -49,7 +53,7 @@ void explicitExporterSet() {
   @Test
   void getSomeConfiguration() {
     Map<String, String> map = new HashMap<>();
-    map.put("otel.jmx.service.url", "dummy-url");
+    map.put("otel.jmx.service.url", DUMMY_URL);
     map.put("otel.jmx.target.system", "jvm");
     map.put("otel.metrics.exporter", "otlp");
     ConfigProperties config = DefaultConfigProperties.createFromMap(map);
@@ -67,7 +71,7 @@ void getSomeConfiguration() {
   @Test
   void setSdkMetricExportFromJmxInterval() {
     Map<String, String> map = new HashMap<>();
-    map.put("otel.jmx.service.url", "dummy-url");
+    map.put("otel.jmx.service.url", DUMMY_URL);
     map.put("otel.jmx.target.system", "jvm");
     map.put("otel.metrics.exporter", "otlp");
     map.put("otel.jmx.interval.milliseconds", "10000");
@@ -83,7 +87,7 @@ void setSdkMetricExportFromJmxInterval() {
   @Test
   void sdkMetricExportIntervalPriority() {
     Map<String, String> map = new HashMap<>();
-    map.put("otel.jmx.service.url", "dummy-url");
+    map.put("otel.jmx.service.url", DUMMY_URL);
     map.put("otel.jmx.target.system", "jvm");
     map.put("otel.metrics.exporter", "otlp");
     map.put("otel.jmx.interval.milliseconds", "10000");