Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.15] Bump up apm-data to v1.8.1 (backport #13614) #13617

Merged
merged 3 commits into from
Jul 6, 2024
Merged

[8.15] Bump up apm-data to v1.8.1 (backport #13614) #13617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a83278
Bump up apm-data to v1.8.1 (#13614)
lahsivjar Jul 5, 2024
9fae829
Fix conflict
lahsivjar Jul 6, 2024
6c74cd1
Merge remote-tracking branch 'origin/8.15' into mergify/bp/8.15/pr-13614
lahsivjar Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected].0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].1/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
1 change: 1 addition & 0 deletions changelogs/8.15.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down