Added tenant-id to the log message.

hawkular · Sep 15, 2017 · 8aacad3 · 8aacad3
1 parent 3885f90
commit 8aacad3
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/...cs-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/log/time/RequestTimeLogger.java b/...cs-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/log/time/RequestTimeLogger.java
@@ -23,11 +23,14 @@
 import io.undertow.server.ExchangeCompletionListener;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
+import io.undertow.util.HeaderMap;
 
 public class RequestTimeLogger implements HttpHandler {
 
     private static final RestLogger log = RestLogging.getRestLogger(RequestTimeLogger.class);
 
+    private static final String tenantHeader = "Hawkular-Tenant";
+
     private HttpHandler next;
 
     private long timeThreshold;
@@ -52,7 +55,7 @@ private class TimeMeasurer implements ExchangeCompletionListener {
 
         private long timeThreshold;
 
-        TimeMeasurer(long timeThreshold){
+        TimeMeasurer(long timeThreshold) {
             this.timeThreshold = timeThreshold;
         }
 
@@ -63,10 +66,18 @@ public void exchangeEvent(HttpServerExchange exchange, NextListener nextListener
                 long duration = end - start;
                 if (duration > this.timeThreshold) {
                     String method = exchange.getRequestMethod().toString();
-                    String uri = exchange.getRequestURI();
                     String query = exchange.getQueryString();
-                    log.warn("Request " + method + " " + uri + (query.isEmpty() ? "":("?" + query)) + " took: "+
-                            duration + " ms, exceeds " +  this.timeThreshold +" ms threshold");
+                    String request_url = exchange.getRequestURI() + (query.isEmpty() ? "" : ("?" + query));
+                    HeaderMap headers = exchange.getRequestHeaders();
+                    if (headers.contains(tenantHeader)) {
+                        String tenantId = headers.get(tenantHeader, 0);
+                        log.warnf("Request %s %s took: %d ms, exceeds %d ms threshold, tenant-id: %s",
+                                method, request_url, duration, timeThreshold, tenantId);
+                    } else {
+                        log.warnf("Request %s %s took: %d ms, exceeds %d ms threshold, no tenant",
+                                method, request_url, duration, timeThreshold);
+                    }
+
                 }
             } finally {
                 if (nextListener != null) {