From ca8057b59966807fbf4e3df32d72052411200654 Mon Sep 17 00:00:00 2001 From: simitt Date: Tue, 19 Dec 2023 13:26:54 +0100 Subject: [PATCH] Update apm-data to require one exception.{type,message} for log exceptions --- changelogs/8.12.asciidoc | 1 + go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/changelogs/8.12.asciidoc b/changelogs/8.12.asciidoc index a66d992e56b..94abff210f4 100644 --- a/changelogs/8.12.asciidoc +++ b/changelogs/8.12.asciidoc @@ -19,6 +19,7 @@ https://github.com/elastic/apm-server/compare/8.11\...8.12[View commits] - Switch built-in ILM rollover policies from max_size to max_primary_shard_size {pull}11729[11729]. - Handle empty request bodies gracefully {pull}12242[12242]. - Wrap processor errors to provide more details {pull}12242[12242]. +- Require only one of exception.{type,message} for log exceptions {pull}12242[12242]. [float] ==== Added diff --git a/go.mod b/go.mod index 506078a1d9f..714d1dee50c 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 - github.com/elastic/apm-data v0.1.1-0.20231109140428-5541ce489bcb + github.com/elastic/apm-data v0.1.1-0.20231120111210-bd8f3ecad5bb github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231218141841-a633696068ed github.com/elastic/elastic-agent-client/v7 v7.5.0 github.com/elastic/elastic-agent-libs v0.7.2 diff --git a/go.sum b/go.sum index 12d7ea2041f..d87ed10ad75 100644 --- a/go.sum +++ b/go.sum @@ -132,8 +132,8 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HEE0a5BDFmhEmJV/Uo4uzj/paHjd7yl6+KYguw= github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= -github.com/elastic/apm-data v0.1.1-0.20231109140428-5541ce489bcb h1:EQu3AMZgLoWyvpKhlaHCjW0hPoPi/cJ3x2E8wfB2WZ0= -github.com/elastic/apm-data v0.1.1-0.20231109140428-5541ce489bcb/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= +github.com/elastic/apm-data v0.1.1-0.20231120111210-bd8f3ecad5bb h1:mpfOadQBl6amJQzbXa0d9oy9GTvrlx0kqAb4R1soNoU= +github.com/elastic/apm-data v0.1.1-0.20231120111210-bd8f3ecad5bb/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231218141841-a633696068ed h1:2ABWyeeCuBbi4ReJFeEAvfPUctfYLc0x5x3ZaQCAuWs= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231218141841-a633696068ed/go.mod h1:IyDGwc1d+ERmSiMOZZ2mJIJfCnFnIl85zQP7ZvtkSfY= github.com/elastic/elastic-agent-autodiscover v0.6.5 h1:5DeMpuNc8c/tN6HN0A4A2uOFTNFHSg7xrKApzfhvF1U=