From 15865b32688b2153017fc437b1cd68ebc6f777a8 Mon Sep 17 00:00:00 2001 From: harshithb3304 Date: Tue, 21 Oct 2025 21:44:02 +0530 Subject: [PATCH 1/4] added accountId to each log --- .../main/java/com/akto/log/LoggerMaker.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/libs/utils/src/main/java/com/akto/log/LoggerMaker.java b/libs/utils/src/main/java/com/akto/log/LoggerMaker.java index 80de03c396..6077998540 100644 --- a/libs/utils/src/main/java/com/akto/log/LoggerMaker.java +++ b/libs/utils/src/main/java/com/akto/log/LoggerMaker.java @@ -158,7 +158,7 @@ protected static void sendToSlack(String err) { protected String basicError(String err, LogDb db) { if(Context.accountId.get() != null){ - err = String.format("%s\nAccount id: %d", err, Context.accountId.get()); + err = String.format("%s\naccountId: %d", err, Context.accountId.get()); } logger.error(err); try{ @@ -209,7 +209,7 @@ public void errorAndAddToDb(Exception e, String err, LogDb db) { @Deprecated public void infoAndAddToDb(String info, LogDb db) { String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; - String infoMessage = "acc: " + accountId + ", " + info; + String infoMessage = "accountId: " + accountId + ", " + info; logger.info(infoMessage); try{ insert(infoMessage, "info",db); @@ -220,7 +220,7 @@ public void infoAndAddToDb(String info, LogDb db) { public void warnAndAddToDb(String info, LogDb db) { String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; - String infoMessage = "acc: " + accountId + ", " + info; + String infoMessage = "accountId: " + accountId + ", " + info; logger.info(infoMessage); try{ insert(infoMessage, "warn",db); @@ -331,19 +331,27 @@ public List fetchLogRecords(int logFetchStartTime, int logFetchEndTime, Log } public void info(String message, Object... vars) { - logger.info(message, vars); + String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; + String formattedMessage = "accountId: " + accountId + ", " + message; + logger.info(formattedMessage, vars); } public void error(String errorMessage, Object... vars) { - logger.error(errorMessage, vars); + String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; + String formattedMessage = "accountId: " + accountId + ", " + errorMessage; + logger.error(formattedMessage, vars); } public void debug(String message, Object... vars) { - logger.debug(message, vars); + String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; + String formattedMessage = "accountId: " + accountId + ", " + message; + logger.debug(formattedMessage, vars); } public void warn(String message, Object... vars) { - logger.warn(message, vars); + String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; + String formattedMessage = "accountId: " + accountId + ", " + message; + logger.warn(formattedMessage, vars); } public void debugAndAddToDb(String message) { @@ -360,7 +368,7 @@ public void debugAndAddToDbCount(String message) { public void debugAndAddToDb(String message, LogDb db) { String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; - String debugMessage = "acc: " + accountId + ", " + message; + String debugMessage = "accountId: " + accountId + ", " + message; debug(debugMessage); try{ insert(debugMessage, "debug", db); From c944e488465a73e3f2ec0df99462e39d481c6639 Mon Sep 17 00:00:00 2001 From: harshithb3304 Date: Tue, 21 Oct 2025 21:53:54 +0530 Subject: [PATCH 2/4] added logging function --- .../main/java/com/akto/log/LoggerMaker.java | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/libs/utils/src/main/java/com/akto/log/LoggerMaker.java b/libs/utils/src/main/java/com/akto/log/LoggerMaker.java index 6077998540..22aff9e56a 100644 --- a/libs/utils/src/main/java/com/akto/log/LoggerMaker.java +++ b/libs/utils/src/main/java/com/akto/log/LoggerMaker.java @@ -157,16 +157,17 @@ protected static void sendToSlack(String err) { } protected String basicError(String err, LogDb db) { - if(Context.accountId.get() != null){ + if (Context.accountId.get() != null) { err = String.format("%s\naccountId: %d", err, Context.accountId.get()); } - logger.error(err); + String formatted = getFormattedMessage(err); + logger.error(formatted); try{ - insert(err, "error", db); + insert(formatted, "error", db); } catch (Exception e){ } - return err; + return formatted; } public void errorAndAddToDb(String err, LogDb db) { @@ -208,8 +209,7 @@ public void errorAndAddToDb(Exception e, String err, LogDb db) { @Deprecated public void infoAndAddToDb(String info, LogDb db) { - String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; - String infoMessage = "accountId: " + accountId + ", " + info; + String infoMessage = getFormattedMessage(info); logger.info(infoMessage); try{ insert(infoMessage, "info",db); @@ -219,8 +219,7 @@ public void infoAndAddToDb(String info, LogDb db) { } public void warnAndAddToDb(String info, LogDb db) { - String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; - String infoMessage = "accountId: " + accountId + ", " + info; + String infoMessage = getFormattedMessage(info); logger.info(infoMessage); try{ insert(infoMessage, "warn",db); @@ -331,27 +330,27 @@ public List fetchLogRecords(int logFetchStartTime, int logFetchEndTime, Log } public void info(String message, Object... vars) { - String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; - String formattedMessage = "accountId: " + accountId + ", " + message; - logger.info(formattedMessage, vars); + logger.info(getFormattedMessage(message), vars); } public void error(String errorMessage, Object... vars) { - String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; - String formattedMessage = "accountId: " + accountId + ", " + errorMessage; - logger.error(formattedMessage, vars); + logger.error(getFormattedMessage(errorMessage), vars); } public void debug(String message, Object... vars) { - String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; - String formattedMessage = "accountId: " + accountId + ", " + message; - logger.debug(formattedMessage, vars); + logger.debug(getFormattedMessage(message), vars); } public void warn(String message, Object... vars) { + logger.warn(getFormattedMessage(message), vars); + } + + /** + * Helper to prefix the message with accountId consistently. + */ + private String getFormattedMessage(String message) { String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; - String formattedMessage = "accountId: " + accountId + ", " + message; - logger.warn(formattedMessage, vars); + return "accountId: " + accountId + ", " + message; } public void debugAndAddToDb(String message) { @@ -367,8 +366,7 @@ public void debugAndAddToDbCount(String message) { } public void debugAndAddToDb(String message, LogDb db) { - String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; - String debugMessage = "accountId: " + accountId + ", " + message; + String debugMessage = getFormattedMessage(message); debug(debugMessage); try{ insert(debugMessage, "debug", db); From b7ac1994df00ac67f2ad241b01336008d7cc8e79 Mon Sep 17 00:00:00 2001 From: harshithb3304 Date: Tue, 21 Oct 2025 22:02:37 +0530 Subject: [PATCH 3/4] removed manual accountId logging --- libs/utils/src/main/java/com/akto/log/LoggerMaker.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/utils/src/main/java/com/akto/log/LoggerMaker.java b/libs/utils/src/main/java/com/akto/log/LoggerMaker.java index 22aff9e56a..9f438c82be 100644 --- a/libs/utils/src/main/java/com/akto/log/LoggerMaker.java +++ b/libs/utils/src/main/java/com/akto/log/LoggerMaker.java @@ -157,9 +157,6 @@ protected static void sendToSlack(String err) { } protected String basicError(String err, LogDb db) { - if (Context.accountId.get() != null) { - err = String.format("%s\naccountId: %d", err, Context.accountId.get()); - } String formatted = getFormattedMessage(err); logger.error(formatted); try{ From 09c5b47fa1e8735eb009b0d56b7a19f558ea488e Mon Sep 17 00:00:00 2001 From: harshithb3304 Date: Tue, 21 Oct 2025 22:04:51 +0530 Subject: [PATCH 4/4] updated logging format --- libs/utils/src/main/java/com/akto/log/LoggerMaker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/utils/src/main/java/com/akto/log/LoggerMaker.java b/libs/utils/src/main/java/com/akto/log/LoggerMaker.java index 9f438c82be..70e9ddf1aa 100644 --- a/libs/utils/src/main/java/com/akto/log/LoggerMaker.java +++ b/libs/utils/src/main/java/com/akto/log/LoggerMaker.java @@ -347,7 +347,7 @@ public void warn(String message, Object... vars) { */ private String getFormattedMessage(String message) { String accountId = Context.accountId.get() != null ? Context.accountId.get().toString() : "NA"; - return "accountId: " + accountId + ", " + message; + return "accountId: " + accountId + " message: " + message; } public void debugAndAddToDb(String message) {