pull request jmxtrans#2 add typeName support to Query.

Author: lookfirst

samples/activemq/queues-graphite.json

@@ -17,14 +17,14 @@
     		"EnqueueCount",
     		"Subscriptions"
   		],
+      "typeNames" : ["Destination"],
       "resultAlias" : "ActiveMQ.Queue",
 
       "outputWriters" : [ {
         "@class" : "com.googlecode.jmxtrans.model.output.GraphiteWriter",
         "settings" : {
           "port" : 2003,
-          "host" : "192.168.1.88",
-          "typeNames" : ["Destination"]
+          "host" : "192.168.1.88"
         }
       } ]
     } ]

samples/activemq/queues.json

@@ -19,11 +19,13 @@
             "EnqueueCount",
             "Subscriptions"
           ],
-
+          "typeNames" : ["Destination"],
+          "resultAlias" : "ActiveMQ.Queue",
           "outputWriters":[
             {
-              "@class":"com.googlecode.jmxtrans.model.output.StdOutWriter",
+              "@class":"com.googlecode.jmxtrans.model.output.KeyOutWriter",
               "settings":{
+                "outputFile" : "logs/output.txt"
               }
             }
           ]

src/com/googlecode/jmxtrans/model/Query.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -21,7 +22,7 @@
  * @author jon
  */
 @JsonSerialize(include=Inclusion.NON_NULL)
-@JsonPropertyOrder(value={"obj", "attr", "resultAlias", "keys", "outputWriters"})
+@JsonPropertyOrder(value={"obj", "attr", "typeNames", "resultAlias", "keys", "outputWriters"})
 public class Query {
 
     private Server server;
@@ -32,6 +33,7 @@ public class Query {
     private List<String> keys;
     private List<OutputWriter> outputWriters;
     private List<Result> results;
+    private Set<String> typeNames;
 
     public Query() { }
 
@@ -77,6 +79,22 @@ public String getResultAlias() {
         return resultAlias;
     }
 
+    public void setTypeNames(Set<String> typeNames) {
+        this.typeNames = typeNames;
+    }
+
+    /**
+     * The list of type names used in a JMX bean string when querying with a wildcard
+     * which is used to expose the actual type name value to the key string. e.g. for this JMX name
+     *
+     * typeName=name=PS Eden Space,type=MemoryPool
+     *
+     * If you add a typeName("name"), then it'll retrieve 'PS Eden Space' from the string
+     */
+    public Set<String> getTypeNames() {
+        return typeNames;
+    }
+
     public void setAttr(List<String> attr) {
         this.attr = attr;
         PropertyResolver.resolveList(this.attr);

src/com/googlecode/jmxtrans/util/JmxUtils.java

@@ -6,6 +6,7 @@
 import java.rmi.UnmarshalException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -600,7 +601,7 @@ public static String getKeyString(Query query, Result result, Entry<String, Obje
 
 		sb.append(".");
 
-		String typeName = cleanupStr(getConcatedTypeNameValues(typeNames, result.getTypeName()));
+		String typeName = cleanupStr(getConcatedTypeNameValues(query, typeNames, result.getTypeName()));
 		if (typeName != null) {
 			sb.append(typeName);
 			sb.append(".");
@@ -629,7 +630,7 @@ public static String getKeyString2(Query query, Result result, Entry<String, Obj
 
 		sb.append(".");
 
-		String typeName = cleanupStr(getConcatedTypeNameValues(typeNames, result.getTypeName()));
+		String typeName = cleanupStr(getConcatedTypeNameValues(query, typeNames, result.getTypeName()));
 		if (typeName != null) {
 			sb.append(typeName);
 			sb.append(".");
@@ -639,7 +640,8 @@ public static String getKeyString2(Query query, Result result, Entry<String, Obj
 		return sb.toString();
 	}
 
-	/**
+
+    /**
 	 * Replaces all . with _ and removes all spaces and double/single quotes.
 	 */
 	public static String cleanupStr(String name) {
@@ -677,6 +679,29 @@ public static String getConcatedTypeNameValues(List<String> typeNames, String ty
 		return StringUtils.chomp(sb.toString(), "_");
 	}
 
+
+    /**
+   	 * Given a typeName string, get the first match from the typeNames setting.
+   	 * In other words, suppose you have:
+   	 *
+   	 * typeName=name=PS Eden Space,type=MemoryPool
+   	 *
+   	 * If you addTypeName("name"), then it'll retrieve 'PS Eden Space' from the string
+   	 */
+    public static String getConcatedTypeNameValues(Query query, List<String> typeNames, String typeName) {
+        Set<String> queryTypeNames = query.getTypeNames();
+        if (queryTypeNames != null && queryTypeNames.size() > 0) {
+            List<String> allNames = new ArrayList<String>(queryTypeNames);
+            for (String name : typeNames) {
+                if (!allNames.contains(name)) {
+                    allNames.add(name);
+                }
+            }
+            return getConcatedTypeNameValues(allNames, typeName);
+        } else {
+            return getConcatedTypeNameValues(typeNames, typeName);
+        }
+    }
 	/** */
 	private static String getTypeNameValue(String typeName, String[] tokens) {
 		boolean foundIt = false;