You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2019/12/08 21:06:07 UTC
[logging-log4j2] branch master updated (005f674 -> 361707f)
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 005f674 Merge branch 'rmannibucau-LOG4J2-2523_session-attr-support-for-web-lookups'
add b4f739c Add support for LogEvent timestamp embedding in ProducerRecord
add 290e194 Add test
add 5b10d64 Update default behaviour to send LogEvent timestamp as Kafka ProducerRecord timestamp Change 'timestamp' attribute name to 'eventTimestamp' Update tests and test configuration
add 655986b Match coding style
add 2cf2964 Move KafkaAppenderTest.xml and KafkaAppenderCloseTimeoutTest.xml
new a2c72d2 Merge branch 'kafka-timestamp' of https://github.com/fedexist/logging-log4j2 into fedexist-kafka-timestamp
new 1ba29fa LOG4J2-2678 - Add LogEvent timestamp to ProducerRecord in KafkaAppender
new 361707f Merge branch 'fedexist-kafka-timestamp'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../log4j/kafka/appender/KafkaAppender.java | 19 ++++++++++++++++--
.../logging/log4j/kafka/appender/KafkaManager.java | 23 +++++++++++++++-------
.../log4j/kafka/appender/KafkaAppenderTest.java | 18 +++++++++++++++++
.../resources/KafkaAppenderCloseTimeoutTest.xml | 0
.../src/test/resources/KafkaAppenderTest.xml | 6 ++++++
src/changes/changes.xml | 3 +++
6 files changed, 60 insertions(+), 9 deletions(-)
rename {log4j-core => log4j-kafka}/src/test/resources/KafkaAppenderCloseTimeoutTest.xml (100%)
rename {log4j-core => log4j-kafka}/src/test/resources/KafkaAppenderTest.xml (86%)
[logging-log4j2] 03/03: Merge branch 'fedexist-kafka-timestamp'
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 361707f090a3d0e0faa003b5929bc016180894f8
Merge: 005f674 1ba29fa
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sun Dec 8 14:05:46 2019 -0700
Merge branch 'fedexist-kafka-timestamp'
.../log4j/kafka/appender/KafkaAppender.java | 19 ++++++++++++++++--
.../logging/log4j/kafka/appender/KafkaManager.java | 23 +++++++++++++++-------
.../log4j/kafka/appender/KafkaAppenderTest.java | 18 +++++++++++++++++
.../resources/KafkaAppenderCloseTimeoutTest.xml | 0
.../src/test/resources/KafkaAppenderTest.xml | 6 ++++++
src/changes/changes.xml | 3 +++
6 files changed, 60 insertions(+), 9 deletions(-)
[logging-log4j2] 01/03: Merge branch 'kafka-timestamp' of
https://github.com/fedexist/logging-log4j2 into fedexist-kafka-timestamp
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a2c72d234179a026cd13c4866df2195fdd58ec6d
Merge: 005f674 2cf2964
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sun Dec 8 13:58:10 2019 -0700
Merge branch 'kafka-timestamp' of https://github.com/fedexist/logging-log4j2 into fedexist-kafka-timestamp
.../log4j/kafka/appender/KafkaAppender.java | 19 ++++++++++++++++--
.../logging/log4j/kafka/appender/KafkaManager.java | 23 +++++++++++++++-------
.../log4j/kafka/appender/KafkaAppenderTest.java | 18 +++++++++++++++++
.../resources/KafkaAppenderCloseTimeoutTest.xml | 0
.../src/test/resources/KafkaAppenderTest.xml | 6 ++++++
5 files changed, 57 insertions(+), 9 deletions(-)
diff --cc log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
index 8f7de26,a0e8c64..36ab5ec
--- a/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
+++ b/log4j-kafka/src/main/java/org/apache/logging/log4j/kafka/appender/KafkaAppender.java
@@@ -50,15 -50,18 +50,18 @@@ public final class KafkaAppender extend
public static class Builder<B extends Builder<B>> extends AbstractAppender.Builder<B>
implements org.apache.logging.log4j.plugins.util.Builder<KafkaAppender> {
- @PluginAttribute("topic")
+ @PluginAttribute
private String topic;
- @PluginAttribute("key")
+ @PluginAttribute
private String key;
- @PluginAttribute(value = "syncSend", defaultBoolean = true)
+ @PluginAttribute(defaultBoolean = true)
private boolean syncSend;
+ @PluginAttribute(value = "eventTimestamp", defaultBoolean = true)
+ private boolean sendEventTimestamp;
+
@SuppressWarnings("resource")
@Override
public KafkaAppender build() {
[logging-log4j2] 02/03: LOG4J2-2678 - Add LogEvent timestamp to
ProducerRecord in KafkaAppender
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 1ba29faf751d1debf115fb070b04fe5a212475e5
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sun Dec 8 14:05:02 2019 -0700
LOG4J2-2678 - Add LogEvent timestamp to ProducerRecord in KafkaAppender
---
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f9bf359..2f6fdbb 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
- "remove" - Removed
-->
<release version="3.0.0" date="2019-xx-xx" description="GA Release 3.0.0">
+ <action issue="LOG4J2-2678" dev="rgoers" type="update" due-to="Federico D'Ambrosio">
+ Add LogEvent timestamp to ProducerRecord in KafkaAppender.
+ </action>
<actino issue="LOG4J2-2688" dev="rgoers" type="add" due-to="Romain Manni-Bucau">
Allow web lookup of session attributes.
</actino>