-
Notifications
You must be signed in to change notification settings - Fork 522
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ingest: translate known OpenTelemetry JVM metrics (#4986)
* ingest: translate known OpenTelemetry JVM metrics Copy well-known JVM metrics from their OpenTelemetry names and associated labels to their counterparts produced by the Elastic APM Java agent. This enables users to visualise the metrics in the Elastic APM app in Kibana. Metrics are duplicated to avoid surprising users by silently dropping the OpenTelemetry names. Users can drop either one of the duplicates with ingest pipeline customisation. * Add changelog * docs: document new ingest pipelines * docs: move existing docs to correct position * ingest: address review comments - Move `runtime.jvm.gc.collection` before `runtime.jvm.gc.time` - Require `ctx.runtime?.jvm?.gc != null` when copying `labels.gc` * Regenerate integration package (cherry picked from commit 264d151) # Conflicts: # changelogs/head.asciidoc
- Loading branch information
Showing
15 changed files
with
442 additions
and
16 deletions.
There are no files selected for viewing
41 changes: 41 additions & 0 deletions
41
....2.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_opentelemetry_metrics.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
{ | ||
"description": "Populate Elastic APM metric fields from well-known OpenTelemetry metric counterparts", | ||
"processors": [ | ||
{ | ||
"set": { | ||
"field": "jvm.memory.{{labels.area}}.{{labels.type}}", | ||
"copy_from": "runtime.jvm.memory.area", | ||
"if": "ctx.runtime?.jvm?.memory?.area != null && ctx.labels?.area != null && ctx.labels?.type != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.time", | ||
"copy_from": "runtime.jvm.gc.collection", | ||
"if": "ctx.runtime?.jvm?.gc?.collection != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.time", | ||
"copy_from": "runtime.jvm.gc.time", | ||
"if": "ctx.runtime?.jvm?.gc?.time != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.count", | ||
"copy_from": "runtime.jvm.gc.count", | ||
"if": "ctx.runtime?.jvm?.gc?.count != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "labels.name", | ||
"copy_from": "labels.gc", | ||
"override": false, | ||
"if": "ctx.labels?.gc != null && ctx.runtime?.jvm?.gc != null" | ||
} | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
...0.2.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_opentelemetry_metrics.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
{ | ||
"description": "Populate Elastic APM metric fields from well-known OpenTelemetry metric counterparts", | ||
"processors": [ | ||
{ | ||
"set": { | ||
"field": "jvm.memory.{{labels.area}}.{{labels.type}}", | ||
"copy_from": "runtime.jvm.memory.area", | ||
"if": "ctx.runtime?.jvm?.memory?.area != null && ctx.labels?.area != null && ctx.labels?.type != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.time", | ||
"copy_from": "runtime.jvm.gc.collection", | ||
"if": "ctx.runtime?.jvm?.gc?.collection != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.time", | ||
"copy_from": "runtime.jvm.gc.time", | ||
"if": "ctx.runtime?.jvm?.gc?.time != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.count", | ||
"copy_from": "runtime.jvm.gc.count", | ||
"if": "ctx.runtime?.jvm?.gc?.count != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "labels.name", | ||
"copy_from": "labels.gc", | ||
"override": false, | ||
"if": "ctx.labels?.gc != null && ctx.runtime?.jvm?.gc != null" | ||
} | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
...data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_opentelemetry_metrics.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
{ | ||
"description": "Populate Elastic APM metric fields from well-known OpenTelemetry metric counterparts", | ||
"processors": [ | ||
{ | ||
"set": { | ||
"field": "jvm.memory.{{labels.area}}.{{labels.type}}", | ||
"copy_from": "runtime.jvm.memory.area", | ||
"if": "ctx.runtime?.jvm?.memory?.area != null && ctx.labels?.area != null && ctx.labels?.type != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.time", | ||
"copy_from": "runtime.jvm.gc.collection", | ||
"if": "ctx.runtime?.jvm?.gc?.collection != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.time", | ||
"copy_from": "runtime.jvm.gc.time", | ||
"if": "ctx.runtime?.jvm?.gc?.time != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.count", | ||
"copy_from": "runtime.jvm.gc.count", | ||
"if": "ctx.runtime?.jvm?.gc?.count != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "labels.name", | ||
"copy_from": "labels.gc", | ||
"override": false, | ||
"if": "ctx.labels?.gc != null && ctx.runtime?.jvm?.gc != null" | ||
} | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
.../data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_opentelemetry_metrics.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
{ | ||
"description": "Populate Elastic APM metric fields from well-known OpenTelemetry metric counterparts", | ||
"processors": [ | ||
{ | ||
"set": { | ||
"field": "jvm.memory.{{labels.area}}.{{labels.type}}", | ||
"copy_from": "runtime.jvm.memory.area", | ||
"if": "ctx.runtime?.jvm?.memory?.area != null && ctx.labels?.area != null && ctx.labels?.type != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.time", | ||
"copy_from": "runtime.jvm.gc.collection", | ||
"if": "ctx.runtime?.jvm?.gc?.collection != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.time", | ||
"copy_from": "runtime.jvm.gc.time", | ||
"if": "ctx.runtime?.jvm?.gc?.time != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.count", | ||
"copy_from": "runtime.jvm.gc.count", | ||
"if": "ctx.runtime?.jvm?.gc?.count != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "labels.name", | ||
"copy_from": "labels.gc", | ||
"override": false, | ||
"if": "ctx.labels?.gc != null && ctx.runtime?.jvm?.gc != null" | ||
} | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
...apm/0.2.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_opentelemetry_metrics.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
{ | ||
"description": "Populate Elastic APM metric fields from well-known OpenTelemetry metric counterparts", | ||
"processors": [ | ||
{ | ||
"set": { | ||
"field": "jvm.memory.{{labels.area}}.{{labels.type}}", | ||
"copy_from": "runtime.jvm.memory.area", | ||
"if": "ctx.runtime?.jvm?.memory?.area != null && ctx.labels?.area != null && ctx.labels?.type != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.time", | ||
"copy_from": "runtime.jvm.gc.collection", | ||
"if": "ctx.runtime?.jvm?.gc?.collection != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.time", | ||
"copy_from": "runtime.jvm.gc.time", | ||
"if": "ctx.runtime?.jvm?.gc?.time != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "jvm.gc.count", | ||
"copy_from": "runtime.jvm.gc.count", | ||
"if": "ctx.runtime?.jvm?.gc?.count != null" | ||
} | ||
}, | ||
{ | ||
"set": { | ||
"field": "labels.name", | ||
"copy_from": "labels.gc", | ||
"override": false, | ||
"if": "ctx.labels?.gc != null && ctx.runtime?.jvm?.gc != null" | ||
} | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
[[release-notes-head]] | ||
== APM Server version HEAD | ||
|
||
https:/elastic/apm-server/compare/7.12\...master[View commits] | ||
|
||
[float] | ||
==== Breaking Changes | ||
|
||
[float] | ||
==== Bug fixes | ||
* Fix `setup.template` config merging {pull}4950[4950] | ||
|
||
[float] | ||
==== Intake API Changes | ||
|
||
[float] | ||
==== Added | ||
* Add support for Node.js wall time profiles {pull}4728[4728] | ||
* Add metricset.name field to metric docs {pull}4857[4857] | ||
* Add `apm-server.default_service_environment` config {pull}4861[4861] | ||
* Transaction histogram metrics are now recorded by default {pull}4882[4882] | ||
* Add `error.grouping_name` field to speed up error grouping aggregations {pull}4886[4886] | ||
* Add support for OpenTelemetry exception span events {pull}4876[4876] | ||
* Set metricset.name for breakdown metrics {pull}4910[4910] | ||
* Set log and http responses for server timeout {pull}4918[4918] | ||
* Define ES fields for cgroup.cpu and cgroup.cpuacct metrics {pull}4956[4956] | ||
* Log gRPC tracing requests {pull}4934[4934] | ||
* Improved coverage of translation of OpenTelemetry resource conventions {pull}4955[4955] | ||
* Set `client.ip` for events from the Elastic APM iOS agent {pull}4975[4975] | ||
* Calculate service destination metrics for OpenTelemetry spans {pull}4976[4976] | ||
* Add exponential retries to api key and tail sampling requests{pull}4991[4991] | ||
* Add `apm-server.rum.allow_service_names` config {pull}5030[5030] | ||
* Ingest pipeline for translating OpenTelemetry Java metrics to Elastic APM fields {pull}4986[4986] | ||
|
||
[float] | ||
==== Deprecated |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.