You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2026/08/07 16:18:21 UTC
(pulsar) branch branch-4.2 updated: [fix][misc] Remove unnecessary " {}" suffix from log lines when there are no context attributes (#26285)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.2
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-4.2 by this push:
new 29395e769430 [fix][misc] Remove unnecessary " {}" suffix from log lines when there are no context attributes (#26285)
29395e769430 is described below
commit 29395e7694304c9580f6b266bccbee209043c92d
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Fri Aug 7 16:44:19 2026 +0300
[fix][misc] Remove unnecessary " {}" suffix from log lines when there are no context attributes (#26285)
(cherry picked from commit af54f64e1880e32d859e6f5f726503f7228f9804)
---
buildtools/src/main/resources/log4j2.xml | 4 ++--
conf/functions_log4j2.xml | 6 +++---
conf/log4j2.yaml | 6 +++---
microbench/src/main/resources/log4j2.xml | 2 +-
pulsar-broker/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 +-
tiered-storage/jcloud/src/test/resources/log4j2-test.yml | 2 +-
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/buildtools/src/main/resources/log4j2.xml b/buildtools/src/main/resources/log4j2.xml
index 0885ee27723e..f962d6198e1e 100644
--- a/buildtools/src/main/resources/log4j2.xml
+++ b/buildtools/src/main/resources/log4j2.xml
@@ -31,14 +31,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_OFFSET_DATE_TIME_HHMM} %-5level [%t{12}] %c{1.} - %msg %X%n"/>
+ <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} %-5level [%t{12}] %c{1.} - %msg%equals{ %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 %X%n"/>
+ <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %X}{ {}}{}%n"/>
<Policies>
<SizeBasedTriggeringPolicy size="10MB"/>
</Policies>
diff --git a/conf/functions_log4j2.xml b/conf/functions_log4j2.xml
index b4c36867e2d4..364fa0c21cfb 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 %X%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %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 %X%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %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 %X%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %X}{ {}}{}%n</Pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy>
diff --git a/conf/log4j2.yaml b/conf/log4j2.yaml
index 52b5e9283085..6d28eaf5fdcb 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 %X%n"
+ Pattern: "%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %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 %X%n"
+ Pattern: "%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %X}{ {}}{}%n"
Policies:
TimeBasedTriggeringPolicy:
interval: 1
@@ -109,7 +109,7 @@ Configuration:
fileName : "${sys:pulsar.log.dir}/functions/${ctx:function}/${ctx:functionname}-${ctx:instance}.log"
filePattern : "${sys:pulsar.log.dir}/functions/${sys:pulsar.log.file}-${ctx:instance}-%d{MM-dd-yyyy}-%i.log.gz"
PatternLayout:
- Pattern: "%d{ABSOLUTE} %level{length=5} [%thread] [instance: %X{instance}] %logger{1} - %msg %X%n"
+ Pattern: "%d{ABSOLUTE} %level{length=5} [%thread] [instance:%X{instance}] %logger{1} - %msg%equals{ %X}{ {}}{}%n"
Policies:
TimeBasedTriggeringPolicy:
interval: 1
diff --git a/microbench/src/main/resources/log4j2.xml b/microbench/src/main/resources/log4j2.xml
index 64b03ab62f43..0898d4d66e48 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 %X%n"/>
+ <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %X}{ {}}{}%n"/>
</Console>
</Appenders>
<Loggers>
diff --git a/pulsar-broker/src/test/resources/log4j2.xml b/pulsar-broker/src/test/resources/log4j2.xml
index 0c5a622cd2ac..c2413cb36f26 100644
--- a/pulsar-broker/src/test/resources/log4j2.xml
+++ b/pulsar-broker/src/test/resources/log4j2.xml
@@ -37,7 +37,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 %X%n"/>
+ <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %X}{ {}}{}%n"/>
<Policies>
<SizeBasedTriggeringPolicy size="10MB"/>
</Policies>
diff --git a/pulsar-functions/localrun/src/main/resources/log4j2.xml b/pulsar-functions/localrun/src/main/resources/log4j2.xml
index d29e798e4797..57b6e9e7d33c 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 %X%n"/>
+ <PatternLayout pattern="%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %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 271669bb1638..49336daca907 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 %X%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %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 %X%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %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 %X%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %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 582905605c95..4b26c51f2024 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 %X%n</Pattern>
+ <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %X}{ {}}{}%n</Pattern>
</PatternLayout>
</Console>
</Appenders>
diff --git a/tiered-storage/jcloud/src/test/resources/log4j2-test.yml b/tiered-storage/jcloud/src/test/resources/log4j2-test.yml
index 77b3baa97a97..1b8131a52adb 100644
--- a/tiered-storage/jcloud/src/test/resources/log4j2-test.yml
+++ b/tiered-storage/jcloud/src/test/resources/log4j2-test.yml
@@ -33,7 +33,7 @@ Configuration:
name: STDOUT
target: SYSTEM_OUT
PatternLayout:
- Pattern: "%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg %X%n"
+ Pattern: "%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%equals{ %X}{ {}}{}%n"
File:
name: File
fileName: ${filename}