From 062c286636369a57967e9a75441963d3b5764beb Mon Sep 17 00:00:00 2001 From: Carson Ip Date: Mon, 29 Jan 2024 18:20:12 +0800 Subject: [PATCH] Bump apm-data to detect OTel messaging.{system,operation} for transactions (#12506) --- NOTICE.txt | 4 ++-- changelogs/head.asciidoc | 1 + go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 83d7aeeb324..13d645b0423 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -362,11 +362,11 @@ these terms. -------------------------------------------------------------------------------- Dependency : github.com/elastic/apm-data -Version: v0.1.1-0.20240111111310-80b6af8d97e1 +Version: v0.1.1-0.20240128144153-31b0cd2b927c Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1-0.20240111111310-80b6af8d97e1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1-0.20240128144153-31b0cd2b927c/LICENSE: Apache License Version 2.0, January 2004 diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index da388e022c5..4f26df531a1 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -21,3 +21,4 @@ https://github.com/elastic/apm-server/compare/8.12\...main[View commits] - 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] diff --git a/go.mod b/go.mod index 27e20b21ef7..7b941534954 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.20240111111310-80b6af8d97e1 + github.com/elastic/apm-data v0.1.1-0.20240128144153-31b0cd2b927c github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240124140239-90228e66040f github.com/elastic/elastic-agent-client/v7 v7.6.0 github.com/elastic/elastic-agent-libs v0.7.3 diff --git a/go.sum b/go.sum index 94bb821fbf7..6173133af17 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.20240111111310-80b6af8d97e1 h1:Wvt3GnXk1KzWeC8E/PRpQgbHAQDQmFvc7wJlnW9viCk= -github.com/elastic/apm-data v0.1.1-0.20240111111310-80b6af8d97e1/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= +github.com/elastic/apm-data v0.1.1-0.20240128144153-31b0cd2b927c h1:R9OfYHW0qCEFJ/bh9Tj/+j4x7o8lnW7yXQNHlvuXjJ0= +github.com/elastic/apm-data v0.1.1-0.20240128144153-31b0cd2b927c/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240124140239-90228e66040f h1:WdivpZ1lhWJoVPIAa8jutj4rEw9cDJrgxtq0KQkfpHs= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240124140239-90228e66040f/go.mod h1:Gon1vwvNdIFrFhsYEH/YQ66Nb+oQ5POvOxqFLCcULa0= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g=