diff --git a/.mergify.yml b/.mergify.yml index 173043031e2..fb0f2880eb0 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -318,3 +318,17 @@ pull_request_rules: labels: - "backport" title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" + - name: backport patches to 8.13 branch + conditions: + - merged + - base=main + - label=backport-8.13 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "8.13" + labels: + - "backport" + title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 7b32b7b3575..7de561ebddf 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -1,4 +1,5 @@ // tag::list[] +* <> * <> * <> * <> @@ -16,6 +17,7 @@ // tag::includes[] include::./changelogs/head.asciidoc[] +include::./changelogs/8.13.asciidoc[] include::./changelogs/8.12.asciidoc[] include::./changelogs/8.11.asciidoc[] include::./changelogs/8.10.asciidoc[] diff --git a/changelogs/8.13.asciidoc b/changelogs/8.13.asciidoc new file mode 100644 index 00000000000..6bb901cbff4 --- /dev/null +++ b/changelogs/8.13.asciidoc @@ -0,0 +1,31 @@ +[[release-notes-8.13]] +== APM version 8.13 + +https://github.com/elastic/apm-server/compare/8.12\...8.13[View commits] + +* <> + +[float] +[[release-notes-8.13.0]] +=== APM version 8.13.0 + +[float] +==== Breaking Changes + +[float] +==== Bug fixes + +[float] +==== Deprecations + +[float] +==== Intake API Changes + +[float] +==== Added +- map OTel's `span.Status: Unset` to `event.outcome: success` instead of `event.outcome: unknown` +- Add support for Otel code.stacktrace {pull}12096[12096] +- `http.request.body.bytes` now reports the bytes read from request body even if Content-Length is -1 {pull}12451[12451] +- Use `messaging.system` and `messaging.operation` to detect OTel messaging span for transactions {pull}12506[12506] +- Add support for OTel data stream routing by parsing `data_stream.dataset` and `data_stream.namespace` from: (from lowest to highest precedence) resource attributes, instrumentation scope attributes, and signal-level attributes. This is a breaking change only for users relying on the existing `data_stream` attributes being stored as labels. {pull}12578[12578] +- Map OTel transaction `elastic.profiler_stack_trace_ids` attribute {pull}12493[12493] diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index 9f127999d7d..d54a7013e6f 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -1,14 +1,11 @@ [[release-notes-head]] == APM version HEAD -https://github.com/elastic/apm-server/compare/8.12\...main[View commits] +https://github.com/elastic/apm-server/compare/8.13\...main[View commits] [float] ==== Breaking Changes -[float] -==== Bug fixes - [float] ==== Deprecations @@ -17,9 +14,3 @@ https://github.com/elastic/apm-server/compare/8.12\...main[View commits] [float] ==== Added -- map OTel's `span.Status: Unset` to `event.outcome: success` instead of `event.outcome: unknown` -- Add support for Otel code.stacktrace {pull}12096[12096] -- `http.request.body.bytes` now reports the bytes read from request body even if Content-Length is -1 {pull}12451[12451] -- Use `messaging.system` and `messaging.operation` to detect OTel messaging span for transactions {pull}12506[12506] -- Add support for OTel data stream routing by parsing `data_stream.dataset` and `data_stream.namespace` from: (from lowest to highest precedence) resource attributes, instrumentation scope attributes, and signal-level attributes. This is a breaking change only for users relying on the existing `data_stream` attributes being stored as labels. {pull}12578[12578] -- Map OTel transaction `elastic.profiler_stack_trace_ids` attribute {pull}12493[12493] diff --git a/cmd/intake-receiver/version.go b/cmd/intake-receiver/version.go index bddb4af2de5..7b4c8aa6075 100644 --- a/cmd/intake-receiver/version.go +++ b/cmd/intake-receiver/version.go @@ -18,4 +18,4 @@ package main // version matches the APM Server's version -const version = "8.13.0" +const version = "8.14.0" diff --git a/internal/version/version.go b/internal/version/version.go index e9b837e114b..fdde5cd026d 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -18,4 +18,4 @@ package version // Version holds the APM Server version. -const Version = "8.13.0" +const Version = "8.14.0"