From ce6435c293d5b97c92e2db3062964ba50d105240 Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Mon, 3 Jun 2024 12:29:09 +0100 Subject: [PATCH] Bump go-docappender to v2.1.3 (#13287) Includes fix "Remove item.Error.Reason for unavailable_shards_exception" (cherry picked from commit c41654fb0559adb388fcae456bdacd7f0ca1252f) # Conflicts: # NOTICE.txt # go.mod # go.sum --- NOTICE.txt | 9 +++++++++ changelogs/8.14.asciidoc | 4 ++++ go.mod | 4 ++++ go.sum | 5 +++++ 4 files changed, 22 insertions(+) diff --git a/NOTICE.txt b/NOTICE.txt index 4da8c1be6ac..33a07c6216e 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1461,12 +1461,21 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/gmux@v0.3.2/LIC -------------------------------------------------------------------------------- +<<<<<<< HEAD Dependency : github.com/elastic/go-docappender Version: v1.1.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender@v1.1.1/LICENSE: +======= +Dependency : github.com/elastic/go-docappender/v2 +Version: v2.1.3 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.1.3/LICENSE: +>>>>>>> c41654fb0 (Bump go-docappender to v2.1.3 (#13287)) Apache License Version 2.0, January 2004 diff --git a/changelogs/8.14.asciidoc b/changelogs/8.14.asciidoc index d371b804137..3bfc76b958c 100644 --- a/changelogs/8.14.asciidoc +++ b/changelogs/8.14.asciidoc @@ -18,6 +18,10 @@ https://github.com/elastic/apm-server/compare/v8.13.2\...v8.14.0[View commits] [float] ==== Intake API Changes +[float] +==== Bug fixes +- Remove error reason from logs when Elasticsearch returns unavailable_shards_exception {pull}13287[13287] + [float] ==== Added - OpenTelemetry Distro Name will now be used for `agent.name` and `agent.version` {pull}12940[12940] diff --git a/go.mod b/go.mod index 93dc95c9a0a..f5102fcf4b3 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,11 @@ require ( github.com/elastic/elastic-agent-libs v0.9.3 github.com/elastic/elastic-agent-system-metrics v0.9.2 github.com/elastic/gmux v0.3.2 +<<<<<<< HEAD github.com/elastic/go-docappender v1.1.1 +======= + github.com/elastic/go-docappender/v2 v2.1.3 +>>>>>>> c41654fb0 (Bump go-docappender to v2.1.3 (#13287)) github.com/elastic/go-elasticsearch/v8 v8.13.1 github.com/elastic/go-sysinfo v1.14.0 github.com/elastic/go-ucfg v0.8.8 diff --git a/go.sum b/go.sum index acda29368d8..435306a4761 100644 --- a/go.sum +++ b/go.sum @@ -161,8 +161,13 @@ github.com/elastic/elastic-transport-go/v8 v8.5.0 h1:v5membAl7lvQgBTexPRDBO/Rdnl github.com/elastic/elastic-transport-go/v8 v8.5.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/gmux v0.3.2 h1:cb721R+fe/rt/jVNyBP5HDQsEwLD2wSKfPD2Sk6adDk= github.com/elastic/gmux v0.3.2/go.mod h1:OD6oYrno+SV3pyl1ArdWCjlExZ+FJOfoSaFqnFeldBQ= +<<<<<<< HEAD github.com/elastic/go-docappender v1.1.1 h1:uIW/lrSo4TkTJLY0+uG1JZzRNR6wmd4dIyYnwlXJisU= github.com/elastic/go-docappender v1.1.1/go.mod h1:u0hkrzDr9w81uNFWUxeOyM0IX9aZUag/gHlOnHyCrzA= +======= +github.com/elastic/go-docappender/v2 v2.1.3 h1:2hMOR+h4aVNzcm+ZaAzNPDKj1qB+Y1M2dwopXo2/1HM= +github.com/elastic/go-docappender/v2 v2.1.3/go.mod h1:3kbAiLPY/IAtDywtcXCnqBxwumNnRoh7rAUYnOO412w= +>>>>>>> c41654fb0 (Bump go-docappender to v2.1.3 (#13287)) github.com/elastic/go-elasticsearch/v8 v8.13.1 h1:du5F8IzUUyCkzxyHdrO9AtopcG95I/qwi2WK8Kf1xlg= github.com/elastic/go-elasticsearch/v8 v8.13.1/go.mod h1:DIn7HopJs4oZC/w0WoJR13uMUxtHeq92eI5bqv5CRfI= github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f h1:TsPpU5EAwlt7YZoupKlxZ093qTZYdGou3EhfTF1U0B4=