You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2017/08/07 13:30:03 UTC

svn commit: r1804333 - /sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java

Author: justin
Date: Mon Aug  7 13:30:02 2017
New Revision: 1804333

URL: http://svn.apache.org/viewvc?rev=1804333&view=rev
Log:
SLING-7028 - remove assumption that histograms are durations

Modified:
    sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java

Modified: sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java?rev=1804333&r1=1804332&r2=1804333&view=diff
==============================================================================
--- sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java (original)
+++ sling/trunk/bundles/commons/metrics/src/main/java/org/apache/sling/commons/metrics/internal/MetricWebConsolePlugin.java Mon Aug  7 13:30:02 2017
@@ -314,7 +314,6 @@ public class MetricWebConsolePlugin exte
         pw.println("<th class='header'>98%</th>");
         pw.println("<th class='header'>99%</th>");
         pw.println("<th class='header'>999%</th>");
-        pw.println("<th>Duration Unit</th>");
         pw.println("</tr>");
         pw.println("</thead>");
         pw.println("<tbody>");
@@ -325,25 +324,22 @@ public class MetricWebConsolePlugin exte
             Snapshot s = h.getSnapshot();
             String name = e.getKey();
 
-            double durationFactor = 1.0 / timeUnit.durationFor(name).toNanos(1);
-            String durationUnit = timeUnit.durationFor(name).toString().toLowerCase(Locale.US);
             pw.printf("<tr class='%s ui-state-default'>%n", rowClass);
 
             pw.printf("<td>%s</td>", name);
             pw.printf("<td>%d</td>", h.getCount());
-            pw.printf("<td>%f</td>", s.getMedian() * durationFactor);
-            pw.printf("<td>%f</td>", s.getMin() * durationFactor);
-            pw.printf("<td>%f</td>", s.getMax() * durationFactor);
-            pw.printf("<td>%f</td>", s.getMean() * durationFactor);
-            pw.printf("<td>%f</td>", s.getStdDev() * durationFactor);
-
-            pw.printf("<td>%f</td>", s.get75thPercentile() * durationFactor);
-            pw.printf("<td>%f</td>", s.get95thPercentile() * durationFactor);
-            pw.printf("<td>%f</td>", s.get98thPercentile() * durationFactor);
-            pw.printf("<td>%f</td>", s.get99thPercentile() * durationFactor);
-            pw.printf("<td>%f</td>", s.get999thPercentile() * durationFactor);
+            pw.printf("<td>%f</td>", s.getMedian());
+            pw.printf("<td>%d</td>", s.getMin());
+            pw.printf("<td>%d</td>", s.getMax());
+            pw.printf("<td>%f</td>", s.getMean());
+            pw.printf("<td>%f</td>", s.getStdDev());
+
+            pw.printf("<td>%f</td>", s.get75thPercentile());
+            pw.printf("<td>%f</td>", s.get95thPercentile());
+            pw.printf("<td>%f</td>", s.get98thPercentile());
+            pw.printf("<td>%f</td>", s.get99thPercentile());
+            pw.printf("<td>%f</td>", s.get999thPercentile());
 
-            pw.printf("<td>%s</td>", durationUnit);
 
             pw.println("</tr>");
             rowClass = "odd".equals(rowClass) ? "even" : "odd";