From 3da6808cd5fb06667cc520016c1455fdb399718a Mon Sep 17 00:00:00 2001 From: Francesco Gualazzi Date: Fri, 18 Oct 2024 12:01:54 +0200 Subject: [PATCH 1/3] changelog: 8.15.3 release (#14377) Signed-off-by: inge4pres Co-authored-by: Carson Ip --- changelogs/8.15.asciidoc | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/changelogs/8.15.asciidoc b/changelogs/8.15.asciidoc index 2623162ef76..bd0d480cbbc 100644 --- a/changelogs/8.15.asciidoc +++ b/changelogs/8.15.asciidoc @@ -1,20 +1,20 @@ [[apm-release-notes-8.15]] == APM version 8.15 +* <> * <> * <> * <> [float] -[[apm-release-notes-8.15.2]] -=== APM version 8.15.2 +[[apm-release-notes-8.15.3]] +=== APM version 8.15.3 -https://github.com/elastic/apm-server/compare/v8.15.1\...v8.15.2[View commits] +https://github.com/elastic/apm-server/compare/v8.15.2\...v8.15.3[View commits] [float] ==== Bug fixes -- Fix broken APM Agents configuration cache when there are more than 100 agent config entries {pull}13958[13958] - Fix a panic in OTLP label setting when receiving on non-compliant attribute array values {pull}13950[13950] [float] @@ -22,6 +22,17 @@ https://github.com/elastic/apm-server/compare/v8.15.1\...v8.15.2[View commits] - Map OpenTelemetry instrumentation scope to `Service.Framework.*` for all signal types. {pull}13903[13903] +[float] +[[apm-release-notes-8.15.2]] +=== APM version 8.15.2 + +https://github.com/elastic/apm-server/compare/v8.15.1\...v8.15.2[View commits] + +[float] +==== Bug fixes + +- Fix broken APM Agents configuration cache when there are more than 100 agent config entries {pull}13958[13958] + [float] [[apm-release-notes-8.15.1]] === APM version 8.15.1 From a4371bf4da486614ad9b5606af24153eca959928 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 18 Oct 2024 18:19:17 +0200 Subject: [PATCH 2/3] mergify: add 8.16 (#14394) Co-authored-by: Carson Ip --- .mergify.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index b6f2ee940fc..c94503ba151 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -389,3 +389,17 @@ pull_request_rules: labels: - "backport" title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" + - name: backport patches to 8.16 branch + conditions: + - merged + - base=main + - label=backport-8.16 + actions: + backport: + assignees: + - "{{ author }}" + branches: + - "8.16" + labels: + - "backport" + title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})" From d9860efb158e8edaaf44e52fae63d522e0da197a Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 09:03:12 +0100 Subject: [PATCH 3/3] 8.16: update docs (backport #14382) (#14395) * docs: Update changelogs for 8.16 release (#14382) Co-authored-by: obltmachine <150269514+obltmachine@users.noreply.github.com> (cherry picked from commit b3c5d5fb41ca044dfaf2275446bab7ee41af1add) Signed-off-by: Carson Ip * Add back head Signed-off-by: Carson Ip --------- Signed-off-by: Carson Ip Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Co-authored-by: obltmachine <150269514+obltmachine@users.noreply.github.com> Co-authored-by: Carson Ip --- CHANGELOG.asciidoc | 2 ++ changelogs/8.16.asciidoc | 31 +++++++++++++++++++++++++++++++ changelogs/head.asciidoc | 12 +----------- 3 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 changelogs/8.16.asciidoc diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index dffd289c9bc..f31ddeb5dc8 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -1,4 +1,5 @@ // tag::list[] +* <> * <> * <> * <> @@ -19,6 +20,7 @@ // tag::includes[] include::./changelogs/head.asciidoc[] +include::./changelogs/8.16.asciidoc[] include::./changelogs/8.15.asciidoc[] include::./changelogs/8.14.asciidoc[] include::./changelogs/8.13.asciidoc[] diff --git a/changelogs/8.16.asciidoc b/changelogs/8.16.asciidoc new file mode 100644 index 00000000000..aef70522e8b --- /dev/null +++ b/changelogs/8.16.asciidoc @@ -0,0 +1,31 @@ +[[apm-release-notes-8.16]] +== APM version 8.16 +* <> + +[float] +[[apm-release-notes-8.16.0]] +=== APM version 8.16.0 + +https://github.com/elastic/apm-server/compare/v8.15.2\...v8.16.0[View commits] + +[float] +==== Bug fixes + +- Track all bulk request response status codes {pull}13574[13574] +- Fix a concurrent map write panic in monitoring middleware {pull}14335[14335] +- Apply shutdown timeout to http server {pull}14339[14339] + +[float] +==== Breaking Changes + +[float] +==== Deprecations +- Support for Jaeger is now deprecated, and will be removed in a future release {pull}13809[13809] + +[float] +==== Intake API Changes + +[float] +==== Added + +- APM Server will no longer retry an HTTP request that returned 502s, 503s, 504s. It will only retry 429s. {pull}13523[13523] diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index f3211c82c9f..4b71ea29c89 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -1,26 +1,16 @@ [[release-notes-head]] == APM version HEAD -https://github.com/elastic/apm-server/compare/8.15\...main[View commits] - -[float] -==== Bug fixes - -- Track all bulk request response status codes {pull}13574[13574] -- Fix a concurrent map write panic in monitoring middleware {pull}14335[14335] -- Apply shutdown timeout to http server {pull}14339[14339] +https://github.com/elastic/apm-server/compare/8.16\...8.x[View commits] [float] ==== Breaking Changes [float] ==== Deprecations -- Support for Jaeger is now deprecated, and will be removed in a future release {pull}13809[13809] [float] ==== Intake API Changes [float] ==== Added - -- APM Server will no longer retry an HTTP request that returned 502s, 503s, 504s. It will only retry 429s. {pull}13523[13523]