From 599562f52740bb719deef3e4d60f5008bac90d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Rica=20Pais=20da=20Silva?= Date: Mon, 16 Jun 2025 12:11:59 +0200 Subject: [PATCH 1/2] Update traces duration mappings with appropriate unit type (#129418) (cherry picked from commit 78bc48e8b43b2fbdc189a47f08373983c6cd018e) # Conflicts: # x-pack/plugin/apm-data/src/main/resources/resources.yaml --- docs/changelog/129418.yaml | 5 +++++ .../resources/component-templates/traces-apm@mappings.yaml | 4 ++++ x-pack/plugin/apm-data/src/main/resources/resources.yaml | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 docs/changelog/129418.yaml diff --git a/docs/changelog/129418.yaml b/docs/changelog/129418.yaml new file mode 100644 index 0000000000000..0be7d7149d467 --- /dev/null +++ b/docs/changelog/129418.yaml @@ -0,0 +1,5 @@ +pr: 129418 +summary: Update traces duration mappings with appropriate unit type +area: Ingest Node +type: enhancement +issues: [] diff --git a/x-pack/plugin/apm-data/src/main/resources/component-templates/traces-apm@mappings.yaml b/x-pack/plugin/apm-data/src/main/resources/component-templates/traces-apm@mappings.yaml index 6f60dc45b3d8c..c7f282881ad65 100644 --- a/x-pack/plugin/apm-data/src/main/resources/component-templates/traces-apm@mappings.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/component-templates/traces-apm@mappings.yaml @@ -43,6 +43,8 @@ template: # span.* span.duration.us: type: long + meta: + unit: micros span.representative_count: type: scaled_float scaling_factor: 1000 @@ -57,6 +59,8 @@ template: dynamic: false transaction.duration.us: type: long + meta: + unit: micros transaction.representative_count: type: scaled_float scaling_factor: 1000 diff --git a/x-pack/plugin/apm-data/src/main/resources/resources.yaml b/x-pack/plugin/apm-data/src/main/resources/resources.yaml index 9484f577583eb..4ae333d7cfa8f 100644 --- a/x-pack/plugin/apm-data/src/main/resources/resources.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/resources.yaml @@ -1,7 +1,7 @@ # "version" holds the version of the templates and ingest pipelines installed # by xpack-plugin apm-data. This must be increased whenever an existing template or # pipeline is changed, in order for it to be updated on Elasticsearch upgrade. -version: 12 +version: 15 component-templates: # Data lifecycle. From 0ab8dce9d6d8a8e5fc849f912460641e22cd4cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Rica?= Date: Mon, 16 Jun 2025 13:41:53 +0200 Subject: [PATCH 2/2] Bump only one version up --- x-pack/plugin/apm-data/src/main/resources/resources.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/apm-data/src/main/resources/resources.yaml b/x-pack/plugin/apm-data/src/main/resources/resources.yaml index 4ae333d7cfa8f..beca2e5890bc0 100644 --- a/x-pack/plugin/apm-data/src/main/resources/resources.yaml +++ b/x-pack/plugin/apm-data/src/main/resources/resources.yaml @@ -1,7 +1,7 @@ # "version" holds the version of the templates and ingest pipelines installed # by xpack-plugin apm-data. This must be increased whenever an existing template or # pipeline is changed, in order for it to be updated on Elasticsearch upgrade. -version: 15 +version: 13 component-templates: # Data lifecycle.