From 3a749f018f1309d1fa6bb59f49cfc22fdab259ff Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Wed, 22 Nov 2023 16:44:02 +0100
Subject: [PATCH 1/4] add span.code.stacktrace field

---
 apmpackage/apm/data_stream/traces/fields/fields.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apmpackage/apm/data_stream/traces/fields/fields.yml b/apmpackage/apm/data_stream/traces/fields/fields.yml
index 94ec29db330..cd22ee31fa3 100644
--- a/apmpackage/apm/data_stream/traces/fields/fields.yml
+++ b/apmpackage/apm/data_stream/traces/fields/fields.yml
@@ -275,6 +275,10 @@
   description: |
     The approximate number of spans represented, based on the inverse sampling rate.
     This will only be set when the sampling rate is known.
+- name: span.code.stacktrace
+  type: text
+  description: |
+    OTel stack trace
 - name: timestamp.us
   type: long
   description: |

From f3c04e0178ee26b8467a8711b80db3b36d469a2b Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Wed, 22 Nov 2023 16:49:26 +0100
Subject: [PATCH 2/4] update changelog

---
 apmpackage/apm/changelog.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apmpackage/apm/changelog.yml b/apmpackage/apm/changelog.yml
index 6906aa2b13d..64dffa96d28 100644
--- a/apmpackage/apm/changelog.yml
+++ b/apmpackage/apm/changelog.yml
@@ -1,8 +1,8 @@
 - version: generated
   changes:
-    - description: Placeholder
+    - description: Add span.code.stacktrace
       type: enhancement
-      link: https://github.com/elastic/apm-server/pull/123
+      link: https://github.com/elastic/apm-server/pull/12096
 - version: 8.11.0
   changes:
     - description: Add geoip processing to add client.geo.* fields for app_logs

From 5c431feec30d0a0a0e787baf515e6c6583c83135 Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Wed, 22 Nov 2023 17:16:50 +0100
Subject: [PATCH 3/4] update changelog

---
 changelogs/head.asciidoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
index 5e6155333cf..69c82159bb0 100644
--- a/changelogs/head.asciidoc
+++ b/changelogs/head.asciidoc
@@ -20,4 +20,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]
\ No newline at end of file
+- Setting event timestamp from OTel observed timestamp when needed {pull}11935[11935]
+- Add support for Otel code.stacktrace {pull}12096[12096]
\ No newline at end of file

From 6b31ac2a62d07c1941e8f8c5baee90f83e7c49f3 Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Thu, 23 Nov 2023 15:04:35 +0100
Subject: [PATCH 4/4] use 'code.stacktrace'

---
 apmpackage/apm/data_stream/traces/fields/fields.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apmpackage/apm/data_stream/traces/fields/fields.yml b/apmpackage/apm/data_stream/traces/fields/fields.yml
index cd22ee31fa3..c7815b3e2d8 100644
--- a/apmpackage/apm/data_stream/traces/fields/fields.yml
+++ b/apmpackage/apm/data_stream/traces/fields/fields.yml
@@ -275,7 +275,7 @@
   description: |
     The approximate number of spans represented, based on the inverse sampling rate.
     This will only be set when the sampling rate is known.
-- name: span.code.stacktrace
+- name: code.stacktrace
   type: text
   description: |
     OTel stack trace