Skip to content

Commit

Permalink
apmpackage: prepare for move to apm-data plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
axw committed Nov 24, 2023
1 parent 87d312a commit 629f585
Show file tree
Hide file tree
Showing 8 changed files with 113 additions and 786 deletions.
7 changes: 5 additions & 2 deletions apmpackage/apm/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
- version: generated
changes:
- description: Placeholder
- description: Add missing mappings for various fields
type: enhancement
link: https://github.com/elastic/apm-server/pull/123
link: https://github.com/elastic/apm-server/pull/12102
- description: Remove unsupported 7.x data stream migration pipeline
type: enhancement
link: https://github.com/elastic/apm-server/pull/12102
- version: 8.11.0
changes:
- description: Add geoip processing to add client.geo.* fields for app_logs
Expand Down
34 changes: 32 additions & 2 deletions apmpackage/apm/data_stream/error_logs/fields/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
- name: error.culprit
type: keyword
description: Function call which was the primary perpetrator of this event.
- name: error.custom
type: flattened
description: Custom error context.
- name: error.exception.attributes
type: flattened
description: Arbitrary attributes associated with the exception.
- name: error.exception.code
type: keyword
description: The error code set when the error happened, e.g. database error code.
Expand All @@ -18,6 +24,10 @@
- name: error.exception.module
type: keyword
description: The module namespace of the original error.
- name: error.exception.stacktrace
type: flattened
description: |
Stacktrace identifying the instrumented source code corresponding to the error.
- name: error.exception.type
type: keyword
description: The type of the original error, e.g. the Java exception class name.
Expand All @@ -42,18 +52,38 @@
type: keyword
description: |
A parametrized message. E.g. 'Could not connect to %s'. The property message is still required, and should be equal to the param_message, but with placeholders replaced. In some situations the param_message is used to group errors together.
- name: error.log.stacktrace
type: flattened
description: |
Stacktrace identifying the instrumented source code corresponding to the error.
- name: http.request.body
type: flattened
description: |
The original body of the monitored HTTP request.
- name: http.request.env
type: flattened
description: |
The CGI-like environment variables of the monitored HTTP request.
- name: http.request.cookies
type: flattened
description: |
The cookies of the monitored HTTP request.
- name: http.request.headers
type: object
type: flattened
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: object
type: flattened
description: |
The canonical headers of the monitored HTTP response.
- name: http.response.headers_sent
type: boolean
description: |
Used by the Node agent to indicate whether HTTP response headers were sent.
- name: kubernetes.namespace
type: keyword
description: |
Expand Down

This file was deleted.

71 changes: 69 additions & 2 deletions apmpackage/apm/data_stream/traces/fields/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,35 @@
type: keyword
description: |
The lambda function version.
- name: http.request.body
type: flattened
description: |
The original body of the monitored HTTP request.
- name: http.request.env
type: flattened
description: |
The CGI-like environment variables of the monitored HTTP request.
- name: http.request.cookies
type: flattened
description: |
The cookies of the monitored HTTP request.
- name: http.request.headers
type: object
type: flattened
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: object
type: flattened
description: |
The canonical headers of the monitored HTTP response.
- name: http.response.headers_sent
type: boolean
index: false
description: |
Used by the Node agent to indicate whether HTTP response headers were sent.
- name: http.response.transfer_size
type: long
unit: byte
Expand Down Expand Up @@ -221,10 +238,26 @@
type: long
description: |
Sum of the durations of the compressed spans, in microseconds.
- name: span.db.instance
type: keyword
description: |
Database instance.
- name: span.db.link
type: keyword
description: |
Database link.
- name: span.db.type
type: keyword
description: |
Database type.
- name: span.db.user.name
type: keyword
description: |
Database username.
- name: span.db.statement
type: keyword
description: |
Database statement.
- name: span.db.rows_affected
type: long
description: |
Expand All @@ -245,6 +278,18 @@
type: long
description: |
Duration of the span, in microseconds.
- name: span.message.body
type: keyword
description: The message body
index: false
- name: span.message.routing_key
type: keyword
description: The message routing key
index: false
- name: span.message.headers
type: flattened
description: The message headers
index: false
- name: span.message.age.ms
type: long
description: |
Expand All @@ -257,6 +302,10 @@
type: keyword
description: |
Generic designation of a span in the scope of a transaction.
- name: span.stacktrace
type: flattened
description: |
Stacktrace identifying the instrumented source code corresponding to the span.
- name: span.subtype
type: keyword
description: |
Expand All @@ -279,6 +328,9 @@
type: long
description: |
Timestamp of the event in microseconds since Unix epoch.
- name: transaction.custom
type: flattened
description: Custom transaction context.
- name: transaction.duration.us
type: long
description: |
Expand Down Expand Up @@ -306,6 +358,18 @@
description: |
A user-defined mapping of groups of marks in milliseconds.
dynamic: true
- name: transaction.message.body
type: keyword
description: The message body
index: false
- name: transaction.message.routing_key
type: keyword
description: The message routing key
index: false
- name: transaction.message.headers
type: flattened
description: The message headers
index: false
- name: transaction.message.age.ms
type: long
description: |
Expand All @@ -332,6 +396,9 @@
- name: transaction.span_count.dropped
type: long
description: The total amount of dropped spans for this transaction.
- name: transaction.span_count.started
type: long
description: The total amount of started spans for this transaction.
- name: transaction.type
type: keyword
description: |
Expand Down
4 changes: 3 additions & 1 deletion changelogs/head.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ https://github.com/elastic/apm-server/compare/8.11\...main[View commits]

[float]
==== Breaking Changes
- The unsupported apm_data_stream_migration ingest pipeline has been removed {pull}12102[12102].

[float]
==== Bug fixes
Expand All @@ -20,4 +21,5 @@ https://github.com/elastic/apm-server/compare/8.11\...main[View commits]
==== Added
- Update container base image to Ubuntu 22.04 {pull}11778[11778]
- Add support for returning partial success response in OTLP input {pull}11883[11883]
- Setting event timestamp from OTel observed timestamp when needed {pull}11935[11935]
- Setting event timestamp from OTel observed timestamp when needed {pull}11935[11935]
- Field mappings have been added for various formerly unindexed fields {pull}12102[12102]
Loading

0 comments on commit 629f585

Please sign in to comment.