From 448bf5e07614468280174b37daf445e61b3d079f Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 23:12:18 +0000 Subject: [PATCH] [8.15] Bump up apm-data to v1.8.1 (backport #13614) (#13617) * Bump up apm-data to v1.8.1 (#13614) (cherry picked from commit f56767d422c56d153ae0880ca8f975a0afb5dee5) # Conflicts: # go.mod # go.sum * Fix conflict --------- Co-authored-by: Vishal Raj --- NOTICE.txt | 4 ++-- changelogs/8.15.asciidoc | 1 + go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index ccf31f0cff9..075e1dc2d58 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -362,11 +362,11 @@ these terms. -------------------------------------------------------------------------------- Dependency : github.com/elastic/apm-data -Version: v1.8.0 +Version: v1.8.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.8.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.8.1/LICENSE: Apache License Version 2.0, January 2004 diff --git a/changelogs/8.15.asciidoc b/changelogs/8.15.asciidoc index 88a1e33490d..2c2eae9120b 100644 --- a/changelogs/8.15.asciidoc +++ b/changelogs/8.15.asciidoc @@ -14,6 +14,7 @@ https://github.com/elastic/apm-server/compare/v8.14.2\...v8.15.0[View commits] - Avoid data race due to reuse of `bytes.Buffer` in ES bulk requests {pull}13155[13155] - APM Server now relies on the Elasticsearch apm-data plugin's index templates, which reverts some unsafe uses of `flattened` field types {pull}12066[12066] - Add `error.id` to jaeger errors {pull}13196[13196] +- Process `host.ip` resource attribute for OTel {pull}13614[13614] [float] ==== Breaking Changes diff --git a/go.mod b/go.mod index fab75b15f2d..4c28b5fdca4 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.4 github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v1.0.1 - github.com/elastic/apm-data v1.8.0 + github.com/elastic/apm-data v1.8.1 github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240705174358-6e97683404dd github.com/elastic/elastic-agent-client/v7 v7.13.0 github.com/elastic/elastic-agent-libs v0.9.13 diff --git a/go.sum b/go.sum index 77d75d5e10a..251644c7d38 100644 --- a/go.sum +++ b/go.sum @@ -125,8 +125,8 @@ github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/elastic/apm-aggregation v1.0.1 h1:t4VKR6axu620Y9CtQE9kmZZcx+3BlfnqGywnvgWFcmA= github.com/elastic/apm-aggregation v1.0.1/go.mod h1:hmRuhkV01qMHk/Eu3xe9W/cNtBcRVf0DpFf9USVAE2Y= -github.com/elastic/apm-data v1.8.0 h1:niNw08FQ3WGJDMGhub9q4pZTLg2xfCWo0j9aaPqm/o8= -github.com/elastic/apm-data v1.8.0/go.mod h1:NE5PyUTnIADrV8yIRa5hRwOxlRI1hbnEVGb470veU8s= +github.com/elastic/apm-data v1.8.1 h1:q21kFswSUJsQ6SQBjpnj4yv1wi2SEFozajSOkH0rfB0= +github.com/elastic/apm-data v1.8.1/go.mod h1:NE5PyUTnIADrV8yIRa5hRwOxlRI1hbnEVGb470veU8s= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240705174358-6e97683404dd h1:Yb4ki43RUdw0hdkkexx/kRRUCFjCvAUHw9ky1wW+ZZw= github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240705174358-6e97683404dd/go.mod h1:2I8Zlyzdl1oYau3ojZP2VmzLOQkLVfpKMXzwLUbwd/k= github.com/elastic/elastic-agent-autodiscover v0.7.0 h1:FCrHXh5AZGrPlpAx8kBu/s/guw9d/EXt+GKlFCnrgsc=