Ticket #926: GCTime.patch

plugins/javalib/org/munin/plugin/jmx/GCTimeGet.java

@@ -13 +13 @@
 class GCTimeGet {
 
         private ArrayList<GarbageCollectorMXBean> gcmbeans;
-        private String[] GCresult = new String[2];
+        private long[] GCresult = new long[2];
         private MBeanServerConnection connection;
 
         public GCTimeGet(MBeanServerConnection connection) {
                 this.connection = connection;
         }
 
-        public String[] GC() throws IOException, MalformedObjectNameException {
+        public long[] GC() throws IOException, MalformedObjectNameException {
                 ObjectName gcName = null;
 
                 gcName = new ObjectName(
@@ -41 +41 @@
                 int i = 0;
 
                 for (GarbageCollectorMXBean gc : gcmbeans) {
-                        GCresult[i++] = formatMillis(gc.getCollectionTime());
+                        GCresult[i++] = gc.getCollectionTime();
                 }
                 
                 return GCresult;
         }
-
-        private String formatMillis(long ms) {
-                return String.format("%.4f", ms / (double) 1000);
-        }
 }

plugins/javalib/org/munin/plugin/jmx/GCTime.java

@@ -3 +3 @@
 import org.munin.plugin.jmx.AbstractAnnotationGraphsProvider.Graph;
 
 
-@Graph(title="GarbageCollectionTime", vlabel="seconds", info="The Sun JVM defines garbage collection in two modes: Minor copy collections and Major Mark-Sweep-Compact collections. A minor collection runs relatively quickly and involves moving live data around the heap in the presence of running threads. A major collection is a much more intrusive garbage collection that suspends all execution threads while it completes its task. In terms of performance tuning the heap, the primary goal is to reduce the frequency and duration of major garbage collections.")
+@Graph(title="GarbageCollectionTime", vlabel="ms", info="The Sun JVM defines garbage collection in two modes: Minor copy collections and Major Mark-Sweep-Compact collections. A minor collection runs relatively quickly and involves moving live data around the heap in the presence of running threads. A major collection is a much more intrusive garbage collection that suspends all execution threads while it completes its task. In terms of performance tuning the heap, the primary goal is to reduce the frequency and duration of major garbage collections.")
 public class GCTime extends AbstractAnnotationGraphsProvider {
         
-        private String[] times;
+        private long[] times;
 
         @Override
         public void prepareValues() throws Exception {
@@ -14 +14 @@
                 times = collector.GC();
         }
         
-        @Field(label="MinorTime", info="The approximate accumulated collection elapsed time in seconds. This method returns -1 if the collection elapsed time is undefined for this collector.", type="DERIVE")
-        public String copyTime() {
+        @Field(label="MinorTime", info="The approximate accumulated collection elapsed time in milliseconds. This method returns -1 if the collection elapsed time is undefined for this collector.", type="DERIVE", min=0)
+        public long copyTime() {
                 return times[0];
         }
         
-        @Field(label="MajorTime", info="The approximate accumulated collection elapsed time in seconds. This method returns -1 if the collection elapsed time is undefined for this collector.", type="DERIVE")
-        public String markSweepCompactTime() {
+        @Field(label="MajorTime", info="The approximate accumulated collection elapsed time in milliseconds. This method returns -1 if the collection elapsed time is undefined for this collector.", type="DERIVE", min=0)
+        public long markSweepCompactTime() {
                 return times[1];
         }