Add timestamp and query fields to json dump

2 files changed, 16 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/logging/AbstractThreadedLogger.java b/container-search/src/main/java/com/yahoo/search/logging/AbstractThreadedLogger.java
index d061c2430cb..5c14109b26e 100644
--- a/container-search/src/main/java/com/yahoo/search/logging/AbstractThreadedLogger.java
+++ b/container-search/src/main/java/com/yahoo/search/logging/AbstractThreadedLogger.java
@@ -68,7 +68,7 @@ abstract class AbstractThreadedLogger implements Logger {
             try {
                 super.run();
             } catch (Exception e) {
-                log.error(String.format("Error while sending to DH: %s", e), e);
+                log.error(String.format("Error while sending logger entry: %s", e), e);
             }
         }
 
diff --git a/container-search/src/main/java/com/yahoo/search/logging/LoggerEntry.java b/container-search/src/main/java/com/yahoo/search/logging/LoggerEntry.java
index 4498f666091..e69cb7ca428 100644
--- a/container-search/src/main/java/com/yahoo/search/logging/LoggerEntry.java
+++ b/container-search/src/main/java/com/yahoo/search/logging/LoggerEntry.java
@@ -33,6 +33,19 @@ public class LoggerEntry {
         return query;
     }
 
+    public String queryString() {
+        String queryString = null;
+        if (query != null) {
+            if (query.getHttpRequest() != null && query.getHttpRequest().getUri() != null) {
+                queryString = query.getHttpRequest().getUri().getPath();
+                if (query.getHttpRequest().getUri().getQuery() != null) {
+                    queryString += "?" + query.getHttpRequest().getUri().getRawQuery();
+                }
+            }
+        }
+        return queryString;
+    }
+
     public ByteBuffer blob() {
         return blob;
     }
@@ -47,6 +60,8 @@ public class LoggerEntry {
             JsonGenerator g = new JsonFactory().createGenerator(out, JsonEncoding.UTF8);
             g.writeStartObject();
 
+            g.writeNumberField("timestamp", timestamp);
+            g.writeStringField("query", queryString());
             g.writeStringField("blob", Base64.getEncoder().encodeToString(blob.array()));
 
             g.writeEndObject();