(asterixdb) branch master updated: [ASTERIXDB-3307][*DB] Better logging to identify query requests

[alsuliman]

This is an automated email from the ASF dual-hosted git repository.

alsuliman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git


The following commit(s) were added to refs/heads/master by this push:
     new a096614911 [ASTERIXDB-3307][*DB] Better logging to identify query 
requests
a096614911 is described below

commit a09661491182ad72e91144cbd0726fdf564003bd
Author: Ali Alsuliman <ali.al.solai...@gmail.com>
AuthorDate: Thu Nov 9 18:27:25 2023 -0800

    [ASTERIXDB-3307][*DB] Better logging to identify query requests
    
    - user model changes: no
    - storage format changes: no
    - interface changes: no
    
    Details:
    Use both request UUID and clientContextID for logs identifying
    query requests.
    
    Change-Id: I1154a478281e8c757178c0c826ce8d68699c4a08
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17942
    Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Ali Alsuliman <ali.al.solai...@gmail.com>
    Reviewed-by: Murtadha Hubail <mhub...@apache.org>
    Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
---
 .../org/apache/asterix/api/http/server/QueryServiceServlet.java     | 5 ++++-
 .../apache/asterix/app/message/ExecuteStatementRequestMessage.java  | 5 +++--
 .../java/org/apache/asterix/app/translator/QueryTranslator.java     | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
index 6678c52851..a33102cc0c 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
@@ -278,7 +278,10 @@ public class QueryServiceServlet extends 
AbstractQueryApiServlet {
             if (forceReadOnly) {
                 param.setReadOnly(true);
             }
-            LOGGER.info(() -> "handleRequest: " + 
LogRedactionUtil.statement(param.toString()));
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info("handleRequest: uuid={}, clientContextID={}, {}", 
requestRef.getUuid(),
+                        param.getClientContextID(), 
LogRedactionUtil.statement(param.toString()));
+            }
             delivery = param.getMode();
             setSessionConfig(sessionOutput, param, delivery);
             final ResultProperties resultProperties = new 
ResultProperties(delivery, param.getMaxResultReads());
diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java
index 05bc87b2f5..e31417798b 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java
@@ -243,7 +243,8 @@ public class ExecuteStatementRequestMessage implements 
ICcAddressedMessage {
 
     @Override
     public String toString() {
-        return String.format("%s(id=%s, from=%s, uuid=%s): %s", 
getClass().getSimpleName(), requestMessageId,
-                requestNodeId, requestReference.getUuid(), 
LogRedactionUtil.statement(statementsText));
+        return String.format("%s(id=%s, from=%s, uuid=%s, clientContextID=%s): 
%s", getClass().getSimpleName(),
+                requestMessageId, requestNodeId, requestReference.getUuid(), 
clientContextID,
+                LogRedactionUtil.statement(statementsText));
     }
 }
diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index c2be64f4e3..8c750b0bf2 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -5337,9 +5337,9 @@ public class QueryTranslator extends 
AbstractLangTranslator implements IStatemen
                 }
             }
             jobId = JobUtils.runJob(hcc, jobSpec, jobFlags, false);
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("createAndRunJob jobId:{}, uuid:{}", jobId,
-                        requestParameters.getRequestReference().getUuid());
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info("Created job {} for query uuid:{}, 
clientContextID:{}", jobId,
+                        requestParameters.getRequestReference().getUuid(), 
requestParameters.getClientContextId());
             }
             clientRequest.setJobId(jobId);
             if (jId != null) {