Properly handle JMX TabularData.

Change-Id: I3e27bbf6a4003f21fd78c40f086e3177b4293598
StumbleUponArchive · Mar 27, 2012 · a9763c5 · a9763c5
1 parent 4347116
commit a9763c5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/collectors/lib/jmx-1.0.jar b/collectors/lib/jmx-1.0.jar
diff --git a/stumbleupon/monitoring/jmx.java b/stumbleupon/monitoring/jmx.java
@@ -32,6 +32,7 @@
 import javax.management.MBeanInfo;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
+import javax.management.openmbean.TabularData;
 import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
@@ -209,9 +210,26 @@ private static void dumpMBean(final boolean long_output,
                                 final MBeanServerConnection mbsc,
                                 final ObjectName object,
                                 final MBeanAttributeInfo attr) throws Exception {
-    final StringBuilder buf = new StringBuilder();
     final String name = attr.getName();
     Object value = mbsc.getAttribute(object, name);
+    if (value instanceof TabularData) {
+      final TabularData tab = (TabularData) value;
+      int i = 0;
+      for (final Object o : tab.keySet()) {
+        dumpMBeanValue(long_output, print_timestamps, object, name + "." + i, o);
+        i++;
+      }
+    } else {
+      dumpMBeanValue(long_output, print_timestamps, object, name, value);
+    }
+  }
+
+  private static void dumpMBeanValue(final boolean long_output,
+                                     final boolean print_timestamps,
+                                     final ObjectName object,
+                                     final String name,
+                                     final Object value) {
+    final StringBuilder buf = new StringBuilder();
     final long timestamp = System.currentTimeMillis() / 1000;
     if (print_timestamps) {
       buf.append(timestamp).append('\t');