0.37.0

d-shapiro · web-flow · commit 0cfaf5c917cd · 2018-09-18T16:37:03.000-07:00
- Set Profiler to auto-refresh subscribed properties on a 5 second interval
- Add "Get Thread Dump" action to sys/Profiler/Thread, which returns a full thread dump
- Remove dependency on Java 1.7 (by removing references to PlatformManagedObject)
- Suppress expected InvocationTargetExceptions during profiler setup
- Add unit test for basic profiler features
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.36.0'
+    version '0.37.0'
 
     sourceCompatibility = 1.6
     targetCompatibility = 1.6
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/ClassLoadingNode.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/ClassLoadingNode.java
@@ -2,7 +2,6 @@
 
 import java.lang.management.ClassLoadingMXBean;
 import java.lang.management.ManagementFactory;
-import java.lang.management.PlatformManagedObject;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -20,12 +19,12 @@ public void refreshImpl() {
     }
 
     @Override
-    public PlatformManagedObject getMXBean() {
+    public Object getMXBean() {
         return mxbean;
     }
 
     @Override
-    public Class<? extends PlatformManagedObject> getMXInterface() {
+    public Class<? extends Object> getMXInterface() {
         return ClassLoadingMXBean.class;
     }
 
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/CompilationNode.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/CompilationNode.java
@@ -2,7 +2,6 @@
 
 import java.lang.management.CompilationMXBean;
 import java.lang.management.ManagementFactory;
-import java.lang.management.PlatformManagedObject;
 import java.util.ArrayList;
 import java.util.List;
 import org.iot.dsa.node.DSString;
@@ -23,12 +22,12 @@ public void refreshImpl() {
     }
 
     @Override
-    public PlatformManagedObject getMXBean() {
+    public Object getMXBean() {
         return mxbean;
     }
 
     @Override
-    public Class<? extends PlatformManagedObject> getMXInterface() {
+    public Class<? extends Object> getMXInterface() {
         return CompilationMXBean.class;
     }
 
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/GarbageCollectorNode.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/GarbageCollectorNode.java
@@ -1,7 +1,6 @@
 package com.acuity.iot.dsa.dslink.sys.profiler;
 
 import java.lang.management.GarbageCollectorMXBean;
-import java.lang.management.PlatformManagedObject;
 import java.util.ArrayList;
 import java.util.List;
 import org.iot.dsa.node.DSString;
@@ -31,12 +30,12 @@ public void refreshImpl() {
     }
 
     @Override
-    public PlatformManagedObject getMXBean() {
+    public Object getMXBean() {
         return mxbean;
     }
 
     @Override
-    public Class<? extends PlatformManagedObject> getMXInterface() {
+    public Class<? extends Object> getMXInterface() {
         return GarbageCollectorMXBean.class;
     }
 
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/MXBeanNode.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/MXBeanNode.java
@@ -1,8 +1,10 @@
 package com.acuity.iot.dsa.dslink.sys.profiler;
 
-import java.lang.management.PlatformManagedObject;
+import java.lang.management.MemoryPoolMXBean;
 import java.lang.reflect.Method;
 import java.util.List;
+import org.iot.dsa.DSRuntime;
+import org.iot.dsa.DSRuntime.Timer;
 import org.iot.dsa.node.DSIObject;
 import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSNode;
@@ -11,7 +13,9 @@
 import org.iot.dsa.node.action.ActionResult;
 import org.iot.dsa.node.action.DSAction;
 
-public abstract class MXBeanNode extends DSNode {
+public abstract class MXBeanNode extends DSNode implements Runnable {
+    
+    private Timer pollTimer;
 
     private static DSAction refreshAction = new DSAction() {
         @Override
@@ -31,6 +35,23 @@ protected void declareDefaults() {
     protected void onStable() {
         setupMXBean();
         refresh();
+        setupPolling();
+    }
+
+    private void setupPolling() {
+        pollTimer = DSRuntime.run(this, 0, 5000);
+    }
+    
+    @Override
+    public void run() {
+        if (isTreeSubscribed()) {
+            refresh();
+        }
+    }
+    
+    @Override
+    protected void onStopped() {
+        pollTimer.cancel();
     }
 
     private void refresh() {
@@ -42,15 +63,15 @@ private void refresh() {
 
     public abstract void refreshImpl();
 
-    public abstract PlatformManagedObject getMXBean();
+    public abstract Object getMXBean();
 
-    public abstract Class<? extends PlatformManagedObject> getMXInterface();
+    public abstract Class<? extends Object> getMXInterface();
 
     public abstract List<String> getOverriden();
 
     public void discover() {
-        PlatformManagedObject bean = getMXBean();
-        Class<? extends PlatformManagedObject> clazz = getMXInterface();
+        Object bean = getMXBean();
+        Class<? extends Object> clazz = getMXInterface();
         for (Method meth : clazz.getMethods()) {
             String methName = meth.getName();
             if (meth.getParameterCount() == 0 && meth.getReturnType() != Void.TYPE) {
@@ -68,7 +89,11 @@ public void discover() {
                         putProp(name,
                                 o != null ? ProfilerUtils.objectToDSIValue(o) : DSString.EMPTY);
                     } catch (Exception e) {
-                        debug(e);
+                        if (bean instanceof MemoryPoolMXBean && (name.startsWith("UsageThreshold") || name.startsWith("CollectionUsageThreshold"))) {
+                            // ignore
+                        } else {
+                            debug("Exception when invoking " + clazz.getName() + "." + meth.getName() + " on " + getName() + ": ", e);
+                        }
                     }
                 }
             }
@@ -78,5 +103,4 @@ public void discover() {
     protected void putProp(String name, DSIObject obj) {
         put(name, obj).setReadOnly(true).setTransient(true);
     }
-
 }
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/MemoryManagerNode.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/MemoryManagerNode.java
@@ -1,7 +1,6 @@
 package com.acuity.iot.dsa.dslink.sys.profiler;
 
 import java.lang.management.MemoryManagerMXBean;
-import java.lang.management.PlatformManagedObject;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,12 +29,12 @@ public void refreshImpl() {
     }
 
     @Override
-    public PlatformManagedObject getMXBean() {
+    public Object getMXBean() {
         return mxbean;
     }
 
     @Override
-    public Class<? extends PlatformManagedObject> getMXInterface() {
+    public Class<? extends Object> getMXInterface() {
         return MemoryManagerMXBean.class;
     }
 
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/MemoryNode.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/MemoryNode.java
@@ -2,7 +2,6 @@
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
-import java.lang.management.PlatformManagedObject;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,12 +20,12 @@ public void refreshImpl() {
     }
 
     @Override
-    public PlatformManagedObject getMXBean() {
+    public Object getMXBean() {
         return mxbean;
     }
 
     @Override
-    public Class<? extends PlatformManagedObject> getMXInterface() {
+    public Class<? extends Object> getMXInterface() {
         return MemoryMXBean.class;
     }
 
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/MemoryPoolNode.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/MemoryPoolNode.java
@@ -1,7 +1,6 @@
 package com.acuity.iot.dsa.dslink.sys.profiler;
 
 import java.lang.management.MemoryPoolMXBean;
-import java.lang.management.PlatformManagedObject;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,17 +24,15 @@ public void setupMXBean() {
 
     @Override
     public void refreshImpl() {
-        // TODO Auto-generated method stub
-
     }
 
     @Override
-    public PlatformManagedObject getMXBean() {
+    public Object getMXBean() {
         return mxbean;
     }
 
     @Override
-    public Class<? extends PlatformManagedObject> getMXInterface() {
+    public Class<? extends Object> getMXInterface() {
         return MemoryPoolMXBean.class;
     }
 
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/OperatingSystemNode.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/OperatingSystemNode.java
@@ -2,7 +2,6 @@
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.OperatingSystemMXBean;
-import java.lang.management.PlatformManagedObject;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,12 +21,12 @@ public void refreshImpl() {
     }
 
     @Override
-    public PlatformManagedObject getMXBean() {
+    public Object getMXBean() {
         return mxbean;
     }
 
     @Override
-    public Class<? extends PlatformManagedObject> getMXInterface() {
+    public Class<? extends Object> getMXInterface() {
         return OperatingSystemMXBean.class;
     }
 
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/RuntimeNode.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/RuntimeNode.java
@@ -1,7 +1,6 @@
 package com.acuity.iot.dsa.dslink.sys.profiler;
 
 import java.lang.management.ManagementFactory;
-import java.lang.management.PlatformManagedObject;
 import java.lang.management.RuntimeMXBean;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -46,12 +45,12 @@ public void refreshImpl() {
     }
 
     @Override
-    public PlatformManagedObject getMXBean() {
+    public Object getMXBean() {
         return mxbean;
     }
 
     @Override
-    public Class<? extends PlatformManagedObject> getMXInterface() {
+    public Class<? extends Object> getMXInterface() {
         return RuntimeMXBean.class;
     }
 
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/SysProfiler.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/SysProfiler.java
@@ -15,15 +15,15 @@ public class SysProfiler extends DSNode {
     @Override
     protected void declareDefaults() {
         super.declareDefaults();
-        declareDefault("Runtime", new RuntimeNode());
-        declareDefault("Class Loading", new ClassLoadingNode());
-        declareDefault("Compilation", new CompilationNode());
-        declareDefault("Memory", new MemoryNode());
-        declareDefault("Operating System", new OperatingSystemNode());
-        declareDefault("Thread", new ThreadNode());
-        declareDefault("Garbage Collectors", new DSNode());
-        declareDefault("Memory Managers", new DSNode());
-        declareDefault("Memory Pools", new DSNode());
+        declareDefault("Runtime", new RuntimeNode()).setTransient(true);
+        declareDefault("Class Loading", new ClassLoadingNode()).setTransient(true);
+        declareDefault("Compilation", new CompilationNode()).setTransient(true);
+        declareDefault("Memory", new MemoryNode()).setTransient(true);
+        declareDefault("Operating System", new OperatingSystemNode()).setTransient(true);
+        declareDefault("Thread", new ThreadNode()).setTransient(true);
+        declareDefault("Garbage Collectors", new DSNode()).setTransient(true);
+        declareDefault("Memory Managers", new DSNode()).setTransient(true);
+        declareDefault("Memory Pools", new DSNode()).setTransient(true);
     }
 
     @Override
@@ -41,5 +41,10 @@ protected void onStable() {
             mpNode.put(mxbean.getName(), new MemoryPoolNode(mxbean)).setTransient(true);
         }
     }
+    
+    @Override
+    public String getLogName() {
+        return getLogName("profiler");
+    }
 
 }
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/ThreadNode.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/profiler/ThreadNode.java
diff --git a/dslink-v2/src/main/java/org/iot/dsa/dslink/DSSysNode.java b/dslink-v2/src/main/java/org/iot/dsa/dslink/DSSysNode.java
diff --git a/dslink-v2/src/test/java/org/iot/dsa/dslink/SysProfilerTest.java b/dslink-v2/src/test/java/org/iot/dsa/dslink/SysProfilerTest.java

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import java.lang.management.ClassLoadingMXBean;`
`4`	`4`	`import java.lang.management.ManagementFactory;`
`5`		`-import java.lang.management.PlatformManagedObject;`
`6`	`5`	`import java.util.ArrayList;`
`7`	`6`	`import java.util.List;`
`8`	`7`
`@@ -20,12 +19,12 @@ public void refreshImpl() {`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`@Override`
`23`		`- public PlatformManagedObject getMXBean() {`
	`22`	`+ public Object getMXBean() {`
`24`	`23`	`return mxbean;`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`@Override`
`28`		`- public Class<? extends PlatformManagedObject> getMXInterface() {`
	`27`	`+ public Class<? extends Object> getMXInterface() {`
`29`	`28`	`return ClassLoadingMXBean.class;`
`30`	`29`	`}`
`31`	`30`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import java.lang.management.CompilationMXBean;`
`4`	`4`	`import java.lang.management.ManagementFactory;`
`5`		`-import java.lang.management.PlatformManagedObject;`
`6`	`5`	`import java.util.ArrayList;`
`7`	`6`	`import java.util.List;`
`8`	`7`	`import org.iot.dsa.node.DSString;`
`@@ -23,12 +22,12 @@ public void refreshImpl() {`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`@Override`
`26`		`- public PlatformManagedObject getMXBean() {`
	`25`	`+ public Object getMXBean() {`
`27`	`26`	`return mxbean;`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`@Override`
`31`		`- public Class<? extends PlatformManagedObject> getMXInterface() {`
	`30`	`+ public Class<? extends Object> getMXInterface() {`
`32`	`31`	`return CompilationMXBean.class;`
`33`	`32`	`}`
`34`	`33`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package com.acuity.iot.dsa.dslink.sys.profiler;`
`2`	`2`
`3`	`3`	`import java.lang.management.GarbageCollectorMXBean;`
`4`		`-import java.lang.management.PlatformManagedObject;`
`5`	`4`	`import java.util.ArrayList;`
`6`	`5`	`import java.util.List;`
`7`	`6`	`import org.iot.dsa.node.DSString;`
`@@ -31,12 +30,12 @@ public void refreshImpl() {`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`@Override`
`34`		`- public PlatformManagedObject getMXBean() {`
	`33`	`+ public Object getMXBean() {`
`35`	`34`	`return mxbean;`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`@Override`
`39`		`- public Class<? extends PlatformManagedObject> getMXInterface() {`
	`38`	`+ public Class<? extends Object> getMXInterface() {`
`40`	`39`	`return GarbageCollectorMXBean.class;`
`41`	`40`	`}`
`42`	`41`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package com.acuity.iot.dsa.dslink.sys.profiler;`
`2`	`2`
`3`	`3`	`import java.lang.management.MemoryManagerMXBean;`
`4`		`-import java.lang.management.PlatformManagedObject;`
`5`	`4`	`import java.util.ArrayList;`
`6`	`5`	`import java.util.List;`
`7`	`6`
`@@ -30,12 +29,12 @@ public void refreshImpl() {`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`@Override`
`33`		`- public PlatformManagedObject getMXBean() {`
	`32`	`+ public Object getMXBean() {`
`34`	`33`	`return mxbean;`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`@Override`
`38`		`- public Class<? extends PlatformManagedObject> getMXInterface() {`
	`37`	`+ public Class<? extends Object> getMXInterface() {`
`39`	`38`	`return MemoryManagerMXBean.class;`
`40`	`39`	`}`
`41`	`40`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import java.lang.management.ManagementFactory;`
`4`	`4`	`import java.lang.management.MemoryMXBean;`
`5`		`-import java.lang.management.PlatformManagedObject;`
`6`	`5`	`import java.util.ArrayList;`
`7`	`6`	`import java.util.List;`
`8`	`7`
`@@ -21,12 +20,12 @@ public void refreshImpl() {`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`@Override`
`24`		`- public PlatformManagedObject getMXBean() {`
	`23`	`+ public Object getMXBean() {`
`25`	`24`	`return mxbean;`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`@Override`
`29`		`- public Class<? extends PlatformManagedObject> getMXInterface() {`
	`28`	`+ public Class<? extends Object> getMXInterface() {`
`30`	`29`	`return MemoryMXBean.class;`
`31`	`30`	`}`
`32`	`31`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import java.lang.management.ManagementFactory;`
`4`	`4`	`import java.lang.management.OperatingSystemMXBean;`
`5`		`-import java.lang.management.PlatformManagedObject;`
`6`	`5`	`import java.util.ArrayList;`
`7`	`6`	`import java.util.List;`
`8`	`7`
`@@ -22,12 +21,12 @@ public void refreshImpl() {`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`@Override`
`25`		`- public PlatformManagedObject getMXBean() {`
	`24`	`+ public Object getMXBean() {`
`26`	`25`	`return mxbean;`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`@Override`
`30`		`- public Class<? extends PlatformManagedObject> getMXInterface() {`
	`29`	`+ public Class<? extends Object> getMXInterface() {`
`31`	`30`	`return OperatingSystemMXBean.class;`
`32`	`31`	`}`
`33`	`32`