From 7c05d56690012cf1a29ac9be57a3607b573a8194 Mon Sep 17 00:00:00 2001 From: Marc Lopez Rubio Date: Tue, 9 Jul 2024 16:03:31 +0800 Subject: [PATCH] Fix conflicts, update changelog Signed-off-by: Marc Lopez Rubio --- changelogs/8.15.asciidoc | 1 + changelogs/head.asciidoc | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/changelogs/8.15.asciidoc b/changelogs/8.15.asciidoc index 2c2eae9120b..f3f4e495947 100644 --- a/changelogs/8.15.asciidoc +++ b/changelogs/8.15.asciidoc @@ -35,3 +35,4 @@ https://github.com/elastic/apm-server/compare/v8.14.2\...v8.15.0[View commits] - Add require data stream to bulk index requests {pull}13398[13398] - Support self-instrumentation when in managed mode by getting tracing configs via reloader {pull}13514[13514] - Add mapping for OpenTelemetry attribute `messaging.destination.name` to derive `service.target` correctly {pull}13472[13472] +- APM Server now automatically retries document-level 429s from Elasticsearch to avoid dropping data. `output.elasticsearch.max_retries` now controls both request-level and document-level retries, and defaults to `3`. {pull}13620[13620] diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index a13985e5e85..c7ba3087091 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -23,13 +23,9 @@ https://github.com/elastic/apm-server/compare/8.14\...main[View commits] [float] ==== Added -<<<<<<< HEAD - Add `elasticsearch.flushed.uncompressed.bytes` metric {pull}13155[13155] - APM Server now relies on the Elasticsearch apm-data plugin's index templates, removing the requirement to install the APM integration package {pull}12066[12066] - Upgraded bundled APM Java agent attacher CLI to version 1.50.0 {pull}13326[13326] - Enable Kibana curated UIs to work with hostmetrics from OpenTelemetry's https://pkg.go.dev/go.opentelemetry.io/collector/receiver/hostmetricsreceiver[hostmetricsreceiver] {pull}13196[13196] - Add require data stream to bulk index requests {pull}13398[13398] - Support self-instrumentation when in managed mode by getting tracing configs via reloader {pull}13514[13514] -======= -- APM Server now automatically retries document-level 429s from Elasticsearch to avoid dropping data. `output.elasticsearch.max_retries` now controls both request-level and document-level retries, and defaults to `3`. {pull}13620[13620] ->>>>>>> 28436dc03 (output: Retry document-level `429`s by default (#13620))