[samza] branch master updated: Make the StreamAppender output the formatted message in String format instead of Object (#1427)

[bharathkk]

This is an automated email from the ASF dual-hosted git repository.

bharathkk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/samza.git


The following commit(s) were added to refs/heads/master by this push:
     new ccd5789  Make the StreamAppender output the formatted message in 
String format instead of Object (#1427)
ccd5789 is described below

commit ccd5789fec2565165a03428056a96c2087611b22
Author: Pawas Chhokra <pawas2...@gmail.com>
AuthorDate: Thu Sep 3 20:05:20 2020 -0700

    Make the StreamAppender output the formatted message in String format 
instead of Object (#1427)
---
 .../apache/samza/logging/log4j2/serializers/LoggingEventJsonSerde.java  | 2 +-
 .../test/java/org/apache/samza/logging/log4j2/TestStreamAppender.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/samza-log4j2/src/main/java/org/apache/samza/logging/log4j2/serializers/LoggingEventJsonSerde.java
 
b/samza-log4j2/src/main/java/org/apache/samza/logging/log4j2/serializers/LoggingEventJsonSerde.java
index e178394..6a5e974 100644
--- 
a/samza-log4j2/src/main/java/org/apache/samza/logging/log4j2/serializers/LoggingEventJsonSerde.java
+++ 
b/samza-log4j2/src/main/java/org/apache/samza/logging/log4j2/serializers/LoggingEventJsonSerde.java
@@ -114,7 +114,7 @@ public class LoggingEventJsonSerde implements 
Serde<LogEvent> {
     logstashEvent.put("@version", VERSION);
     logstashEvent.put("@timestamp", dateFormat(timestamp));
     logstashEvent.put("source_host", getHostname());
-    logstashEvent.put("message", loggingEvent.getMessage());
+    logstashEvent.put("message", 
loggingEvent.getMessage().getFormattedMessage());
 
     if (loggingEvent.getThrown() != null) {
       final Throwable throwableInformation = loggingEvent.getThrown();
diff --git 
a/samza-log4j2/src/test/java/org/apache/samza/logging/log4j2/TestStreamAppender.java
 
b/samza-log4j2/src/test/java/org/apache/samza/logging/log4j2/TestStreamAppender.java
index a659290..88f9405 100644
--- 
a/samza-log4j2/src/test/java/org/apache/samza/logging/log4j2/TestStreamAppender.java
+++ 
b/samza-log4j2/src/test/java/org/apache/samza/logging/log4j2/TestStreamAppender.java
@@ -352,7 +352,7 @@ public class TestStreamAppender {
   }
 
   private String asJsonMessageSegment(String message) {
-    return String.format("\"formatted-message\":\"%s\"", message);
+    return String.format("\"message\":\"%s\"", message);
   }
 
   private void removeAllAppenders() {