This is an automated email from the ASF dual-hosted git repository.
zixuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 0c86cf0032a [improve] Add context map to log4j2 pattern layouts
(#25491)
0c86cf0032a is described below
commit 0c86cf0032a558173c390b720d4e7958e9994702
Author: Matteo Merli <[email protected]>
AuthorDate: Wed Apr 8 23:47:37 2026 -0700
[improve] Add context map to log4j2 pattern layouts (#25491)
---
buildtools/src/main/resources/log4j2.xml | 2 +-
conf/functions_log4j2.xml | 6 +++---
conf/log4j2.yaml | 4 ++--
microbench/src/main/resources/log4j2.xml | 2 +-
pulsar-broker/src/test/resources/log4j2.xml | 4 ++--
pulsar-client-admin/src/test/resources/log4j2.xml | 2 +-
pulsar-functions/localrun/src/main/resources/log4j2.xml | 2 +-
.../runtime-all/src/main/resources/java_instance_log4j2.xml | 6 +++---
.../runtime-all/src/main/resources/kubernetes_instance_log4j2.xml | 2 +-
pulsar-proxy/src/test/resources/log4j2.xml | 2 +-
tiered-storage/jcloud/src/test/resources/log4j2-test.yml | 4 ++--
11 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/buildtools/src/main/resources/log4j2.xml
b/buildtools/src/main/resources/log4j2.xml
index 608a18c234e..0885ee27723 100644
--- a/buildtools/src/main/resources/log4j2.xml
+++ b/buildtools/src/main/resources/log4j2.xml
@@ -38,7 +38,7 @@
filePattern="${sys:pulsar.test.logging.file}-%i.log"
immediateFlush="${sys:pulsar.test.logging.file.immediateFlush}"
createOnDemand="true">
- <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg%n"/>
+ <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg %X%n"/>
<Policies>
<SizeBasedTriggeringPolicy size="10MB"/>
</Policies>
diff --git a/conf/functions_log4j2.xml b/conf/functions_log4j2.xml
index fd4042e82e8..b4c36867e2d 100644
--- a/conf/functions_log4j2.xml
+++ b/conf/functions_log4j2.xml
@@ -40,7 +40,7 @@
<name>Console</name>
<target>SYSTEM_OUT</target>
<PatternLayout>
- <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg %X%n</Pattern>
</PatternLayout>
</Console>
<RollingFile>
@@ -49,7 +49,7 @@
<filePattern>${sys:pulsar.function.log.dir}/${sys:pulsar.function.log.file}-%d{MM-dd-yyyy}-%i.log.gz</filePattern>
<immediateFlush>true</immediateFlush>
<PatternLayout>
- <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg %X%n</Pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy>
@@ -82,7 +82,7 @@
<filePattern>${sys:pulsar.function.log.dir}/${sys:pulsar.function.log.file}.bk-%d{MM-dd-yyyy}-%i.log.gz</filePattern>
<immediateFlush>true</immediateFlush>
<PatternLayout>
- <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg %X%n</Pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy>
diff --git a/conf/log4j2.yaml b/conf/log4j2.yaml
index 2571c2d9ab9..05923816647 100644
--- a/conf/log4j2.yaml
+++ b/conf/log4j2.yaml
@@ -58,7 +58,7 @@ Configuration:
- name: Console
target: SYSTEM_OUT
PatternLayout:
- Pattern: "%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg%n"
+ Pattern: "%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg %X%n"
- name: ConsoleJson
target: SYSTEM_OUT
JsonTemplateLayout:
@@ -71,7 +71,7 @@ Configuration:
filePattern:
"${sys:pulsar.log.dir}/${sys:pulsar.log.file}-%d{MM-dd-yyyy}-%i.log.gz"
immediateFlush: ${sys:pulsar.log.immediateFlush}
PatternLayout:
- Pattern: "%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36}
- %msg%n"
+ Pattern: "%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36}
- %msg %X%n"
Policies:
TimeBasedTriggeringPolicy:
interval: 1
diff --git a/microbench/src/main/resources/log4j2.xml
b/microbench/src/main/resources/log4j2.xml
index 7ec5ed8169a..64b03ab62f4 100644
--- a/microbench/src/main/resources/log4j2.xml
+++ b/microbench/src/main/resources/log4j2.xml
@@ -22,7 +22,7 @@
<Configuration status="WARN">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t]
%-5level %logger{36} - %msg%n"/>
+ <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t]
%-5level %logger{36} - %msg %X%n"/>
</Console>
</Appenders>
<Loggers>
diff --git a/pulsar-broker/src/test/resources/log4j2.xml
b/pulsar-broker/src/test/resources/log4j2.xml
index 4360e076cf1..d6da878d794 100644
--- a/pulsar-broker/src/test/resources/log4j2.xml
+++ b/pulsar-broker/src/test/resources/log4j2.xml
@@ -30,14 +30,14 @@
<Appenders>
<!-- setting follow="true" is required for using ConsoleCaptor to validate
log messages -->
<Console name="CONSOLE" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="%d{ISO8601} - %-5p - [%t:%c{1}] - %m%n"/>
+ <PatternLayout pattern="%d{ISO8601} - %-5p - [%t:%c{1}] - %m %X%n"/>
</Console>
<RollingFile name="FILE"
fileName="${sys:pulsar.test.logging.file}"
filePattern="${sys:pulsar.test.logging.file}-%i.log"
immediateFlush="${sys:pulsar.test.logging.file.immediateFlush}"
createOnDemand="true">
- <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg%n"/>
+ <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg %X%n"/>
<Policies>
<SizeBasedTriggeringPolicy size="10MB"/>
</Policies>
diff --git a/pulsar-client-admin/src/test/resources/log4j2.xml
b/pulsar-client-admin/src/test/resources/log4j2.xml
index 9b57b450ffa..48853fe300f 100644
--- a/pulsar-client-admin/src/test/resources/log4j2.xml
+++ b/pulsar-client-admin/src/test/resources/log4j2.xml
@@ -25,7 +25,7 @@
<Appenders>
<!-- setting follow="true" is required for using ConsoleCaptor to validate
log messages -->
<Console name="CONSOLE" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="%d{ISO8601} - %-5p - [%t:%c{1}] - %m%n"/>
+ <PatternLayout pattern="%d{ISO8601} - %-5p - [%t:%c{1}] - %m %X%n"/>
</Console>
</Appenders>
<Loggers>
diff --git a/pulsar-functions/localrun/src/main/resources/log4j2.xml
b/pulsar-functions/localrun/src/main/resources/log4j2.xml
index a7714c3f488..d29e798e479 100644
--- a/pulsar-functions/localrun/src/main/resources/log4j2.xml
+++ b/pulsar-functions/localrun/src/main/resources/log4j2.xml
@@ -22,7 +22,7 @@
<Configuration status="WARN">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t]
%-5level %logger{36} - %msg%n"/>
+ <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t]
%-5level %logger{36} - %msg %X%n"/>
</Console>
</Appenders>
<Loggers>
diff --git
a/pulsar-functions/runtime-all/src/main/resources/java_instance_log4j2.xml
b/pulsar-functions/runtime-all/src/main/resources/java_instance_log4j2.xml
index 190d9be9294..c6e4b8eeb86 100644
--- a/pulsar-functions/runtime-all/src/main/resources/java_instance_log4j2.xml
+++ b/pulsar-functions/runtime-all/src/main/resources/java_instance_log4j2.xml
@@ -40,7 +40,7 @@
<name>Console</name>
<target>SYSTEM_OUT</target>
<PatternLayout>
- <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg %X%n</Pattern>
</PatternLayout>
</Console>
<RollingFile>
@@ -49,7 +49,7 @@
<filePattern>${sys:pulsar.function.log.dir}/${sys:pulsar.function.log.file}-%d{MM-dd-yyyy}-%i.log.gz</filePattern>
<immediateFlush>true</immediateFlush>
<PatternLayout>
- <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg %X%n</Pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy>
@@ -82,7 +82,7 @@
<filePattern>${sys:pulsar.function.log.dir}/${sys:pulsar.function.log.file}.bk-%d{MM-dd-yyyy}-%i.log.gz</filePattern>
<immediateFlush>true</immediateFlush>
<PatternLayout>
- <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg %X%n</Pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy>
diff --git
a/pulsar-functions/runtime-all/src/main/resources/kubernetes_instance_log4j2.xml
b/pulsar-functions/runtime-all/src/main/resources/kubernetes_instance_log4j2.xml
index f86d03e4179..d245fe7714f 100644
---
a/pulsar-functions/runtime-all/src/main/resources/kubernetes_instance_log4j2.xml
+++
b/pulsar-functions/runtime-all/src/main/resources/kubernetes_instance_log4j2.xml
@@ -36,7 +36,7 @@
<name>Console</name>
<target>SYSTEM_OUT</target>
<PatternLayout>
- <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level
%logger{36} - %msg %X%n</Pattern>
</PatternLayout>
</Console>
</Appenders>
diff --git a/pulsar-proxy/src/test/resources/log4j2.xml
b/pulsar-proxy/src/test/resources/log4j2.xml
index 261bd2edf69..c43c326a30a 100644
--- a/pulsar-proxy/src/test/resources/log4j2.xml
+++ b/pulsar-proxy/src/test/resources/log4j2.xml
@@ -25,7 +25,7 @@
<Appenders>
<!-- setting follow="true" is required for using ConsoleCaptor to validate
log messages -->
<Console name="CONSOLE" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="%d{ISO8601} - %-5p - [%t:%c{1}] - %m%n"/>
+ <PatternLayout pattern="%d{ISO8601} - %-5p - [%t:%c{1}] - %m %X%n"/>
</Console>
</Appenders>
<Loggers>
diff --git a/tiered-storage/jcloud/src/test/resources/log4j2-test.yml
b/tiered-storage/jcloud/src/test/resources/log4j2-test.yml
index f5ee5c9a53d..f7b47fd5d80 100644
--- a/tiered-storage/jcloud/src/test/resources/log4j2-test.yml
+++ b/tiered-storage/jcloud/src/test/resources/log4j2-test.yml
@@ -33,12 +33,12 @@ Configuration:
name: STDOUT
target: SYSTEM_OUT
PatternLayout:
- Pattern: "%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36}
- %msg%n"
+ Pattern: "%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36}
- %msg %X%n"
File:
name: File
fileName: ${filename}
PatternLayout:
- Pattern: "%d %p %c{1.} [%t] %m%n"
+ Pattern: "%d %p %c{1.} [%t] %m %X%n"
Filters:
ThresholdFilter:
level: error
