Changes based on code review by brian-brazil

jamespic · jamespic · commit c90a4d056b98 · 2016-01-28T15:30:23.000Z
diff --git a/README.md b/README.md
@@ -38,8 +38,8 @@ rules:
 ```
 Name     | Description
 ---------|------------
-jmxUrl | A full JMX URL to connect to. Should not be specified if hostPort is.
 hostPort | The host and port to connect to via remote JMX. If neither this nor jmxUrl is specified, will talk to the local JVM.
+jmxUrl | A full JMX URL to connect to. Should not be specified if hostPort is.
 lowercaseOutputName | Lowercase the output metric name. Applies to default format and `name`. Defaults to false.
 lowercaseOutputLabelNames | Lowercase the output metric label names. Applies to default format and `labels`. Defaults to false.
 whitelistObjectNames | A list of [ObjectNames](http://docs.oracle.com/javase/6/docs/api/javax/management/ObjectName.html) to query. Defaults to all mBeans.
diff --git a/collector/src/main/java/io/prometheus/jmx/JmxCollector.java b/collector/src/main/java/io/prometheus/jmx/JmxCollector.java
@@ -26,8 +26,6 @@
 
 public class JmxCollector extends Collector {
     private static final Logger LOGGER = Logger.getLogger(JmxCollector.class.getName());
-    public static final String JMX_URL_KEY = "jmxUrl";
-    public static final String HOST_PORT_KEY = "hostPort";
 
     private static class Rule {
       Pattern pattern;
@@ -39,7 +37,7 @@ private static class Rule {
       ArrayList<String> labelValues;
     }
 
-    String jmxUrl = "";
+    String jmxUrl;
     String username;
     String password;
     
@@ -62,20 +60,23 @@ private JmxCollector(Map<String, Object> config) throws MalformedObjectNameExcep
             config = new HashMap<String, Object>();
         }
 
-        if (config.containsKey(HOST_PORT_KEY)) {
-          if (config.containsKey(JMX_URL_KEY)) {
+        if (config.containsKey("hostPort")) {
+          if (config.containsKey("jmxUrl")) {
               throw new IllegalArgumentException("At most one of hostPort and jmxUrl must be provided");
           }
-          jmxUrl ="service:jmx:rmi:///jndi/rmi://" + (String)config.get(HOST_PORT_KEY) + "/jmxrmi";
-        } else if (config.containsKey(JMX_URL_KEY)) {
-          jmxUrl = (String)config.get(JMX_URL_KEY);
+          jmxUrl ="service:jmx:rmi:///jndi/rmi://" + (String)config.get("hostPort") + "/jmxrmi";
+        } else if (config.containsKey("jmxUrl")) {
+          jmxUrl = (String)config.get("jmxUrl");
+        } else {
+            // Default to local JVM
+            jmxUrl = "";
         }
 
         if (config.containsKey("username")) {
-            this.username = (String)config.get("username");
+            username = (String)config.get("username");
           } else {
             // Any username.
-            this.username = "";
+            username = "";
           }
         
         if (config.containsKey("password")) {
