Merge pull request #568 from wrijeff/v1x_temp

MAINT: restore traceGroup backward compatibility (#564)
opendistro-for-elasticsearch · May 5, 2021 · d3d6a72 · d3d6a72
2 parents ed1b8c1 + 1bb550d
commit d3d6a72
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/data-prepper-plugins/elasticsearch/src/main/resources/otel-v1-apm-span-index-template.json b/data-prepper-plugins/elasticsearch/src/main/resources/otel-v1-apm-span-index-template.json
@@ -40,11 +40,11 @@
         "type": "keyword"
       },
       "traceGroup": {
+        "ignore_above": 1024,
+        "type": "keyword"
+      },
+      "traceGroupFields": {
         "properties": {
-          "name": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
           "endTime": {
             "type": "date_nanos"
           },

diff --git a/...prepper/src/main/java/com/amazon/dataprepper/plugins/prepper/oteltrace/model/RawSpan.java b/...prepper/src/main/java/com/amazon/dataprepper/plugins/prepper/oteltrace/model/RawSpan.java
@@ -185,7 +185,7 @@ public Map<String, Object> getAttributes() {
         return attributes;
     }
 
-    @JsonUnwrapped(prefix="traceGroup.")
+    @JsonUnwrapped
     public TraceGroup getTraceGroup() {
         return traceGroup;
     }

diff --git a/...pper/src/main/java/com/amazon/dataprepper/plugins/prepper/oteltrace/model/TraceGroup.java b/...pper/src/main/java/com/amazon/dataprepper/plugins/prepper/oteltrace/model/TraceGroup.java
@@ -6,9 +6,13 @@
 import java.util.Objects;
 
 public class TraceGroup {
+    @JsonProperty("traceGroup")
     private final String name;
+    @JsonProperty("traceGroupFields.endTime")
     private final String endTime;
+    @JsonProperty("traceGroupFields.statusCode")
     private final Integer statusCode;
+    @JsonProperty("traceGroupFields.durationInNanos")
     private final Long durationInNanos;
 
     public String getName() {

diff --git a/...c/test/java/com/amazon/dataprepper/plugins/prepper/oteltrace/OTelTraceRawPrepperTest.java b/...c/test/java/com/amazon/dataprepper/plugins/prepper/oteltrace/OTelTraceRawPrepperTest.java
@@ -236,10 +236,10 @@ private int getMissingTraceGroupFieldsSpanCount(List<Record<String>> records) th
         for (Record<String> record: records) {
             final String spanJson = record.getData();
             Map<String, Object> spanMap = OBJECT_MAPPER.readValue(spanJson, new TypeReference<Map<String, Object>>() {});
-            final String traceGroupName = (String) spanMap.get("traceGroup.name");
-            final String traceGroupEndTime = (String) spanMap.get("traceGroup.endTime");
-            final Number traceGroupDurationInNanos = (Number) spanMap.get("traceGroup.durationInNanos");
-            final Number traceGroupStatusCode = (Number) spanMap.get("traceGroup.statusCode");
+            final String traceGroupName = (String) spanMap.get("traceGroup");
+            final String traceGroupEndTime = (String) spanMap.get("traceGroupFields.endTime");
+            final Number traceGroupDurationInNanos = (Number) spanMap.get("traceGroupFields.durationInNanos");
+            final Number traceGroupStatusCode = (Number) spanMap.get("traceGroupFields.statusCode");
             if (Stream.of(traceGroupName, traceGroupEndTime, traceGroupDurationInNanos, traceGroupStatusCode).allMatch(Objects::isNull)) {
                 count += 1;
             }