[logging-log4j2] 02/03: #335 Fix broken ITs due to recent ECS layout changes.

[vy]

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

vy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 631c660d1b55e3f754d747e1baef772d432ca8cf
Author: Volkan Yazıcı <volkan.yaz...@gmail.com>
AuthorDate: Wed Jun 24 08:04:54 2020 +0200

    #335 Fix broken ITs due to recent ECS layout changes.
---
 .../apache/logging/log4j/layout/json/template/EcsLayoutTest.java  | 2 +-
 .../org/apache/logging/log4j/layout/json/template/LogstashIT.java | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/EcsLayoutTest.java
 
b/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/EcsLayoutTest.java
index d6cbd30..8f5593d 100644
--- 
a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/EcsLayoutTest.java
+++ 
b/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/EcsLayoutTest.java
@@ -20,7 +20,7 @@ public class EcsLayoutTest {
 
     private static final String SERVICE_NAME = "test";
 
-    private static final String EVENT_DATASET = "test.log";
+    private static final String EVENT_DATASET = SERVICE_NAME + ".log";
 
     private static final JsonTemplateLayout JSON_TEMPLATE_LAYOUT = 
JsonTemplateLayout
             .newBuilder()
diff --git 
a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LogstashIT.java
 
b/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LogstashIT.java
index 9c30be8..311b0df 100644
--- 
a/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LogstashIT.java
+++ 
b/log4j-layout-json-template/src/test/java/org/apache/logging/log4j/layout/json/template/LogstashIT.java
@@ -63,6 +63,8 @@ public class LogstashIT {
 
     private static final String SERVICE_NAME = "LogstashIT";
 
+    private static final String EVENT_DATASET = SERVICE_NAME + ".log";
+
     private static final GelfLayout GELF_LAYOUT = GelfLayout
             .newBuilder()
             .setConfiguration(CONFIGURATION)
@@ -97,6 +99,7 @@ public class LogstashIT {
             .setConfiguration(CONFIGURATION)
             .setCharset(CHARSET)
             .setServiceName(SERVICE_NAME)
+            .setEventDataset(EVENT_DATASET)
             .build();
 
     private static final JsonTemplateLayout JSON_TEMPLATE_ECS_LAYOUT = 
JsonTemplateLayout
@@ -114,6 +117,11 @@ public class LogstashIT {
                                             .newBuilder()
                                             .setKey("service.name")
                                             .setValue(SERVICE_NAME)
+                                            .build(),
+                                    EventTemplateAdditionalField
+                                            .newBuilder()
+                                            .setKey("event.dataset")
+                                            .setValue(EVENT_DATASET)
                                             .build()
                             })
                     .build())