Skip to content

[DONOT-MERGE]Feature/fluentd logging #3390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[DONOT-MERGE]Feature/fluentd logging #3390

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15865b3
added accountId to each log
harshithb3304 Oct 21, 2025
c944e48
added logging function
harshithb3304 Oct 21, 2025
b7ac199
removed manual accountId logging
harshithb3304 Oct 21, 2025
09c5b47
updated logging format
harshithb3304 Oct 21, 2025
b113330
Merge pull request #3389 from harshithb3304/account-logger
gauravakto Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions libs/utils/src/main/java/com/akto/log/LoggerMaker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,14 @@ 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());
}
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) {
Expand Down Expand Up @@ -208,8 +206,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 = getFormattedMessage(info);
logger.info(infoMessage);
try{
insert(infoMessage, "info",db);
Expand All @@ -219,8 +216,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 = getFormattedMessage(info);
logger.info(infoMessage);
try{
insert(infoMessage, "warn",db);
Expand Down Expand Up @@ -331,19 +327,27 @@ public List<Log> fetchLogRecords(int logFetchStartTime, int logFetchEndTime, Log
}

public void info(String message, Object... vars) {
logger.info(message, vars);
logger.info(getFormattedMessage(message), vars);
}

public void error(String errorMessage, Object... vars) {
logger.error(errorMessage, vars);
logger.error(getFormattedMessage(errorMessage), vars);
}

public void debug(String message, Object... vars) {
logger.debug(message, vars);
logger.debug(getFormattedMessage(message), vars);
}

public void warn(String message, Object... vars) {
logger.warn(message, 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";
return "accountId: " + accountId + " message: " + message;
}

public void debugAndAddToDb(String message) {
Expand All @@ -359,8 +363,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 = getFormattedMessage(message);
debug(debugMessage);
try{
insert(debugMessage, "debug", db);
Expand Down
Loading