Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert some flattened fields to object type #12157

Merged
merged 1 commit into from
Dec 5, 2023
+224 −288
Merged

Revert some flattened fields to object type #12157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions apmpackage/apm/data_stream/error_logs/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 12 additions & 8 deletions apmpackage/apm/data_stream/traces/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down
64 changes: 28 additions & 36 deletions systemtest/approvals/TestIntake/Errors.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
62 changes: 27 additions & 35 deletions systemtest/approvals/TestIntake/ErrorsTxID.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading