#168 Completed first new metrics

svenkubiak · May 30, 2016 · a836b2e · a836b2e
1 parent b5d9b7b
commit a836b2e
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 31 deletions.
diff --git a/mangooio-core/src/main/java/io/mangoo/admin/AdminController.java b/mangooio-core/src/main/java/io/mangoo/admin/AdminController.java
@@ -153,6 +153,8 @@ private Response metrics() {
                 .andContent(VERSION, BootstrapUtils.getVersion())
                 .andContent(METRICS, metrics.getMetrics())
                 .andContent("totalRequests", totalRequests)
+                .andContent("minRequestTime", metrics.getMinRequestTime())
+                .andContent("maxRequestTime", metrics.getMaxRequestTime())
                 .andContent("errorRate", errorRate)
                 .andTemplate(Template.DEFAULT.metricsPath());
     }

diff --git a/mangooio-core/src/main/java/io/mangoo/models/Metrics.java b/mangooio-core/src/main/java/io/mangoo/models/Metrics.java
@@ -2,6 +2,7 @@
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.LongAdder;
 
 import com.google.inject.Singleton;
@@ -14,13 +15,43 @@
  */
 @Singleton
 public class Metrics {
+    private final AtomicIntegerFieldUpdater<Metrics> maxRequestTimeUpdater = AtomicIntegerFieldUpdater.newUpdater(Metrics.class, "maxRequestTime");
+    private final AtomicIntegerFieldUpdater<Metrics> minRequestTimeUpdater = AtomicIntegerFieldUpdater.newUpdater(Metrics.class, "minRequestTime");
     private final Map<Integer, LongAdder> metricsCount = new ConcurrentHashMap<>(16, 0.9f, 1);
-
+    private volatile int maxRequestTime;
+    private volatile int minRequestTime = -1;
+
     public void inc(int responseCode) {
         this.metricsCount.computeIfAbsent(responseCode, t -> new LongAdder()).increment();
     }
 
+    public void update(final int requestTime) {
+        int maxRequestTime;
+        do {
+            maxRequestTime = this.maxRequestTime;
+            if (requestTime < maxRequestTime) {
+                break;
+            }
+        } while (!this.maxRequestTimeUpdater.compareAndSet(this, maxRequestTime, requestTime));
+
+        int minRequestTime;
+        do {
+            minRequestTime = this.minRequestTime;
+            if (requestTime > minRequestTime && minRequestTime != -1) {
+                break;
+            }
+        } while (!this.minRequestTimeUpdater.compareAndSet(this, minRequestTime, requestTime));
+    }
+
     public Map<Integer, LongAdder> getMetrics() {
         return this.metricsCount;
     }
+
+    public int getMaxRequestTime() {
+        return maxRequestTime;
+    }
+
+    public int getMinRequestTime() {
+        return minRequestTime;
+    }
 }
diff --git a/mangooio-core/src/main/java/io/mangoo/routing/handlers/DispatcherHandler.java b/mangooio-core/src/main/java/io/mangoo/routing/handlers/DispatcherHandler.java
@@ -43,13 +43,11 @@ public class DispatcherHandler implements HttpHandler {
     private final TemplateEngine templateEngine;
     private final Messages messages;
     private final Crypto crypto;
-    private final MetricsListener metricsListener;
     private final Map<String, Class<?>> methodParameters;
     private final Class<?> controllerClass;
     private final String controllerClassName;
     private final String controllerMethodName;
     private final int methodParametersCount;
-    private final boolean metrics;
     private final boolean async;
     private final boolean hasRequestFilter;
 
@@ -59,7 +57,6 @@ public DispatcherHandler(Class<?> controllerClass, String controllerMethod, bool
 
         this.templateEngine = internal ? Application.getInternalTemplateEngine() : Application.getInstance(TemplateEngine.class);
         this.messages = Application.getInstance(Messages.class);
-        this.metricsListener = Application.getInstance(MetricsListener.class);
         this.crypto = Application.getInstance(Crypto.class);
         this.controllerClass = controllerClass;
         this.controllerMethodName = controllerMethod;
@@ -68,7 +65,6 @@ public DispatcherHandler(Class<?> controllerClass, String controllerMethod, bool
         this.methodParametersCount = this.methodParameters.size();
         this.async = async;
         this.hasRequestFilter = Application.getInjector().getAllBindings().containsKey(com.google.inject.Key.get(MangooRequestFilter.class));
-        this.metrics = CONFIG.isAdminEnabled();
 
         try {
             this.method = Application.getInstance(this.controllerClass)
@@ -86,8 +82,8 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
             return;
         }
 
-        if (this.metrics) {
-            exchange.addResponseCommitListener(this.metricsListener);
+        if (CONFIG.isAdminEnabled()) {
+            exchange.addExchangeCompleteListener(new MetricsListener(System.currentTimeMillis()));
         }
 
         final Attachment attachment = Attachment.build()

diff --git a/mangooio-core/src/main/java/io/mangoo/routing/listeners/MetricsListener.java b/mangooio-core/src/main/java/io/mangoo/routing/listeners/MetricsListener.java
@@ -1,35 +1,34 @@
 package io.mangoo.routing.listeners;
 
-import java.util.Objects;
 import java.util.Optional;
 
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
+import io.mangoo.core.Application;
 import io.mangoo.models.Metrics;
+import io.undertow.server.ExchangeCompletionListener;
 import io.undertow.server.HttpServerExchange;
-import io.undertow.server.ResponseCommitListener;
 
 /**
- * Listener that is invoked for counting metrics of HTTP response codes
- *
- * @author Kubiak
+ * 
+ * @author svenkubiak
  *
  */
-@Singleton
-public class MetricsListener implements ResponseCommitListener {
-    private final Metrics metrics;
+public class MetricsListener implements ExchangeCompletionListener {
+    private long start;
 
-    @Inject
-    public MetricsListener(Metrics metrics) {
-        this.metrics = Objects.requireNonNull(metrics, "metrics can not be null");
+    public MetricsListener(long start) {
+        this.start = start;
     }
 
     @Override
-    public void beforeCommit(HttpServerExchange exchange) {
+    public void exchangeEvent(HttpServerExchange exchange, NextListener nextListener) {
+        Metrics metrics = Application.getInstance(Metrics.class);
+        metrics.update((int) (System.currentTimeMillis() - this.start));
+
         String uri = Optional.ofNullable(exchange.getRequestURI()).orElse("").replace("/", "").toLowerCase();
         if (!uri.contains("@admin")) {
-            this.metrics.inc(exchange.getStatusCode());
+            metrics.inc(exchange.getStatusCode());
         }
+
+        nextListener.proceed();
     }
 }
diff --git a/mangooio-core/src/main/resources/templates/admin/index.ftl b/mangooio-core/src/main/resources/templates/admin/index.ftl
@@ -30,7 +30,7 @@
 	        	<table class="table table-hover">
 	            	<thead>
 						<tr>
-							<th data-sort="string"><b>Key</b></th>
+							<th data-sort="string"><b>Property</b></th>
 							<th data-sort="string"><b>Value</b></th>
 						</tr>
 					</thead>

diff --git a/mangooio-core/src/main/resources/templates/admin/metrics.ftl b/mangooio-core/src/main/resources/templates/admin/metrics.ftl
@@ -12,7 +12,25 @@
     	<div class="small-box bg-red">
         	<div class="inner">
             	<h3>${errorRate} %</h3>
-            	<p>Error rates</p>
+            	<p>Error rate</p>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-lg-3 col-xs-6">
+    	<div class="small-box bg-aqua">
+        	<div class="inner">
+            	<h3>${minRequestTime} ms</h3>
+            	<p>Min request time</p>
+            </div>
+        </div>
+    </div>
+    <div class="col-lg-3 col-xs-6">
+    	<div class="small-box bg-aqua">
+        	<div class="inner">
+            	<h3>${maxRequestTime} ms</h3>
+            	<p>Max request time</p>
             </div>
         </div>
     </div>
@@ -38,8 +56,8 @@
             	<table class="table table-hover">
                 	<thead>
 						<tr>
-							<th data-sort="string"><b>Key</b></th>
-							<th data-sort="string"><b>Value</b></th>
+							<th data-sort="string"><b>HTTP status</b></th>
+							<th data-sort="string"><b>Count</b></th>
 						</tr>
 					</thead>
 					<tbody class="searchable">

diff --git a/mangooio-core/src/main/resources/templates/admin/routes.ftl b/mangooio-core/src/main/resources/templates/admin/routes.ftl
@@ -20,8 +20,11 @@
             	<table class="table table-hover">
                 	<thead>
 						<tr>
-							<th data-sort="string"><b>Key</b></th>
-							<th data-sort="string"><b>Value</b></th>
+							<th data-sort="string"><b>Method</b></th>
+							<th data-sort="string"><b>URL</b></th>
+							<th data-sort="string"><b>Controller class</b></th>
+							<th data-sort="string"><b>Controller method</b></th>
+							<th data-sort="string"><b>Type</b></th>
 						</tr>
 					</thead>
 					<tbody class="searchable">

diff --git a/mangooio-core/src/main/resources/templates/admin/scheduler.ftl b/mangooio-core/src/main/resources/templates/admin/scheduler.ftl
@@ -49,7 +49,7 @@
 									&nbsp;&nbsp;
 									<a href="/@admin/scheduler/execute/${job.name}" class="simpletooltip">
 										<span class="simpletooltiptext">Execute job</span>
-										<i class="fa fa-random" aria-hidden="true"></i>
+										<i class="fa fa-fire" aria-hidden="true"></i>
 									</a>
 								</td>
 							</tr>
@@ -60,5 +60,4 @@
     	</div>
 	</div>
 </div>
-
 <#include "footer.ftl">