Revert some flattened fields to object type (#12157)

Revert some fields from flattened back to object to align with how we will dynamically map those fields in the future. We keep a few APM-specific fields that may cause mapping conflicts as flattened for now.
elastic · Dec 5, 2023 · 0f7508b · 0f7508b
1 parent 3e54384
commit 0f7508b
Show file tree

Hide file tree

Showing 9 changed files with 224 additions and 288 deletions.
diff --git a/apmpackage/apm/data_stream/error_logs/fields/fields.yml b/apmpackage/apm/data_stream/error_logs/fields/fields.yml
@@ -61,23 +61,27 @@
   description: |
     The original body of the monitored HTTP request.
 - name: http.request.env
-  type: flattened
+  type: object
+  dynamic: true
   description: |
     The CGI-like environment variables of the monitored HTTP request.
 - name: http.request.cookies
-  type: flattened
+  type: object
+  dynamic: true
   description: |
     The cookies of the monitored HTTP request.
 - name: http.request.headers
-  type: flattened
+  type: object
+  dynamic: true
   description: |
     The canonical headers of the monitored HTTP request.
 - name: http.response.finished
   type: boolean
   description: |
     Used by the Node agent to indicate when in the response life cycle an error has occurred.
 - name: http.response.headers
-  type: flattened
+  type: object
+  dynamic: true
   description: |
     The canonical headers of the monitored HTTP response.
 - name: http.response.headers_sent

diff --git a/apmpackage/apm/data_stream/traces/fields/fields.yml b/apmpackage/apm/data_stream/traces/fields/fields.yml
@@ -61,23 +61,27 @@
   description: |
     The original body of the monitored HTTP request.
 - name: http.request.env
-  type: flattened
+  type: object
+  dynamic: true
   description: |
     The CGI-like environment variables of the monitored HTTP request.
 - name: http.request.cookies
-  type: flattened
+  type: object
+  dynamic: true
   description: |
     The cookies of the monitored HTTP request.
 - name: http.request.headers
-  type: flattened
+  type: object
+  dynamic: true
   description: |
     The canonical headers of the monitored HTTP request.
 - name: http.response.finished
   type: boolean
   description: |
     Used by the Node agent to indicate when in the response life cycle an error has occurred.
 - name: http.response.headers
-  type: flattened
+  type: object
+  dynamic: true
   description: |
     The canonical headers of the monitored HTTP response.
 - name: http.response.headers_sent
@@ -287,9 +291,9 @@
   description: The message routing key
   index: false
 - name: span.message.headers
-  type: flattened
+  type: object
+  dynamic: true
   description: The message headers
-  index: false
 - name: span.message.age.ms
   type: long
   description: |
@@ -367,9 +371,9 @@
   description: The message routing key
   index: false
 - name: transaction.message.headers
-  type: flattened
+  type: object
+  dynamic: true
   description: The message headers
-  index: false
 - name: transaction.message.age.ms
   type: long
   description: |

diff --git a/systemtest/approvals/TestIntake/Errors.approved.json b/systemtest/approvals/TestIntake/Errors.approved.json
@@ -288,38 +288,34 @@
                 "original": "Hello World"
             }
         ],
-        "http.request.cookies": [
-            {
-                "c1": "v1",
-                "c2": "v2"
-            }
+        "http.request.cookies.c1": [
+            "v1"
         ],
-        "http.request.env": [
-            {
-                "GATEWAY_INTERFACE": "CGI/1.1",
-                "SERVER_SOFTWARE": "nginx"
-            }
+        "http.request.cookies.c2": [
+            "v2"
         ],
-        "http.request.headers": [
-            {
-                "Array": [
-                    "foo",
-                    "bar",
-                    "baz"
-                ],
-                "Content-Type": [
-                    "text/html"
-                ],
-                "Cookie": [
-                    "c1=v1,c2=v2"
-                ],
-                "Some-Other-Header": [
-                    "foo"
-                ],
-                "User-Agent": [
-                    "Mozilla Chrome Edge"
-                ]
-            }
+        "http.request.env.GATEWAY_INTERFACE": [
+            "CGI/1.1"
+        ],
+        "http.request.env.SERVER_SOFTWARE": [
+            "nginx"
+        ],
+        "http.request.headers.Array": [
+            "foo",
+            "bar",
+            "baz"
+        ],
+        "http.request.headers.Content-Type": [
+            "text/html"
+        ],
+        "http.request.headers.Cookie": [
+            "c1=v1,c2=v2"
+        ],
+        "http.request.headers.Some-Other-Header": [
+            "foo"
+        ],
+        "http.request.headers.User-Agent": [
+            "Mozilla Chrome Edge"
         ],
         "http.request.method": [
             "POST"
@@ -330,12 +326,8 @@
         "http.response.finished": [
             true
         ],
-        "http.response.headers": [
-            {
-                "Content-Type": [
-                    "application/json"
-                ]
-            }
+        "http.response.headers.Content-Type": [
+            "application/json"
         ],
         "http.response.headers_sent": [
             true

diff --git a/systemtest/approvals/TestIntake/ErrorsTxID.approved.json b/systemtest/approvals/TestIntake/ErrorsTxID.approved.json
@@ -189,50 +189,42 @@
                 "original": "HelloWorld"
             }
         ],
-        "http.request.cookies": [
-            {
-                "c1": "v1",
-                "c2": "v2"
-            }
+        "http.request.cookies.c1": [
+            "v1"
         ],
-        "http.request.env": [
-            {
-                "GATEWAY_INTERFACE": "CGI/1.1",
-                "SERVER_SOFTWARE": "nginx"
-            }
+        "http.request.cookies.c2": [
+            "v2"
         ],
-        "http.request.headers": [
-            {
-                "Content-Length": [
-                    "0"
-                ],
-                "Cookie": [
-                    "c1=v1",
-                    "c2=v2"
-                ],
-                "Elastic-Apm-Traceparent": [
-                    "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01"
-                ],
-                "Forwarded": [
-                    "for=192.168.0.1"
-                ],
-                "Host": [
-                    "opbeans-java:3000"
-                ]
-            }
+        "http.request.env.GATEWAY_INTERFACE": [
+            "CGI/1.1"
+        ],
+        "http.request.env.SERVER_SOFTWARE": [
+            "nginx"
+        ],
+        "http.request.headers.Content-Length": [
+            "0"
+        ],
+        "http.request.headers.Cookie": [
+            "c1=v1",
+            "c2=v2"
+        ],
+        "http.request.headers.Elastic-Apm-Traceparent": [
+            "00-8c21b4b556467a0b17ae5da959b5f388-31301f1fb2998121-01"
+        ],
+        "http.request.headers.Forwarded": [
+            "for=192.168.0.1"
+        ],
+        "http.request.headers.Host": [
+            "opbeans-java:3000"
         ],
         "http.request.method": [
             "POST"
         ],
         "http.response.finished": [
             true
         ],
-        "http.response.headers": [
-            {
-                "Content-Type": [
-                    "application/json"
-                ]
-            }
+        "http.response.headers.Content-Type": [
+            "application/json"
         ],
         "http.response.headers_sent": [
             true