Skip to content

fixed namespace-aware-logger-config #11948

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 1 commit into
base: develop
Choose a base branch
from
Open

fixed namespace-aware-logger-config #11948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions core/src/main/java/io/kestra/core/runners/RunContextLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ public RunContextLogger() {

public RunContextLogger(QueueInterface<LogEntry> logQueue, LogEntry logEntry, org.slf4j.event.Level loglevel, boolean logToFile) {
if (logEntry.getTaskId() != null) {
this.loggerName = "flow." + logEntry.getFlowId() + "." + logEntry.getTaskId();
this.loggerName = logEntry.getNamespace() + "." + logEntry.getFlowId() + "." + logEntry.getTaskId();
} else if (logEntry.getTriggerId() != null) {
this.loggerName = "flow." + logEntry.getFlowId() + "." + logEntry.getTriggerId();
this.loggerName = logEntry.getNamespace() + "." + logEntry.getFlowId() + "." + logEntry.getTriggerId();
} else {
this.loggerName = "flow." + logEntry.getFlowId();
this.loggerName = logEntry.getNamespace() + "." + logEntry.getFlowId();
}

this.logQueue = logQueue;
Expand Down
12 changes: 6 additions & 6 deletions core/src/main/java/io/kestra/core/services/LogService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void logExecution(FlowId flow, Logger logger, Level level, String message
}

/**
* Log an execution via the execution logger named: 'execution.{flowId}'.
* Log an execution via the execution logger named: '{namespace}.{flowId}'.
*/
public void logExecution(Execution execution, Level level, String message, Object... args) {
Logger logger = logger(execution);
Expand All @@ -54,7 +54,7 @@ public void logExecution(Execution execution, Logger logger, Level level, String
}

/**
* Log a trigger via the trigger logger named: 'trigger.{flowId}.{triggereId}'.
* Log a trigger via the trigger logger named: '{namespace}.{flowId}.{triggereId}'.
*/
public void logTrigger(TriggerContext triggerContext, Level level, String message, Object... args) {
Logger logger = logger(triggerContext);
Expand All @@ -68,7 +68,7 @@ public void logTrigger(TriggerContext triggerContext, Logger logger, Level level
}

/**
* Log a taskRun via the taskRun logger named: 'task.{flowId}.{taskId}'.
* Log a taskRun via the taskRun logger named: '{namespace}.{flowId}.{taskId}'.
*/
public void logTaskRun(TaskRun taskRun, Level level, String message, Object... args) {
String prefix = TASKRUN_PREFIX_WITH_TENANT;
Expand Down Expand Up @@ -96,19 +96,19 @@ public List<LogEntry> errorLogs(String tenantId, String executionId) {

private Logger logger(TaskRun taskRun) {
return LoggerFactory.getLogger(
"task." + taskRun.getFlowId() + "." + taskRun.getTaskId()
taskRun.getNamespace() + "." + taskRun.getFlowId() + "." + taskRun.getTaskId()
);
}

private Logger logger(TriggerContext triggerContext) {
return LoggerFactory.getLogger(
"trigger." + triggerContext.getFlowId() + "." + triggerContext.getTriggerId()
triggerContext.getNamespace() + "." + triggerContext.getFlowId() + "." + triggerContext.getTriggerId()
);
}

private Logger logger(Execution execution) {
return LoggerFactory.getLogger(
"execution." + execution.getFlowId()
execution.getNamespace() + "." + execution.getFlowId()
);
}
}
11 changes: 7 additions & 4 deletions core/src/main/resources/logback/base.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@
<property name="pattern" value="%date{HH:mm:ss}.%ms %highlight(%-5.5level) %magenta(%-12.36thread) %cyan(%-12.36logger{36}) %msg%n" />

<logger name="io.kestra" level="INFO" />
<logger name="flow" level="INFO" />
<logger name="task" level="INFO" />
<logger name="execution" level="INFO" />
<logger name="trigger" level="INFO" />
<!-- Logger levels for namespace-aware loggers: {namespace}.{flowId}.{taskId} -->
<!-- Example configurations:
<logger name="mynamespace.myflowId.mytaskId" level="OFF" />
<logger name="mynamespace.myflowId.mytriggerId" level="OFF" />
<logger name="mynamespace.myflowId" level="OFF" />
<logger name="mynamespace" level="OFF" />
-->

<logger name="io.kestra.ee.runner.kafka.services.KafkaConsumerService" level="WARN" />
<logger name="io.kestra.ee.runner.kafka.services.KafkaProducerService" level="WARN" />
Expand Down