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

build(deps): bump github.com/elastic/apm-data from 1.13.1 to 1.14.1 #14501

Merged
merged 5 commits into from
Nov 6, 2024
Merged

build(deps): bump github.com/elastic/apm-data from 1.13.1 to 1.14.1 #14501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc55bbd
build(deps): bump github.com/elastic/apm-data from 1.13.1 to 1.14.1
dependabot[bot] Nov 4, 2024
f227ac6
Update NOTICE.txt
github-actions[bot] Nov 4, 2024
c5512fa
test: update approvals docs
kruskall Nov 4, 2024
847fc54
Merge branch 'main' into dependabot/go_modules/github.com/elastic/apm…
kruskall Nov 4, 2024
df619aa
Merge branch 'main' into dependabot/go_modules/github.com/elastic/apm…
kruskall Nov 5, 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
8 changes: 4 additions & 4 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.13.1
Version: v1.14.1
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.13.1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v1.14.1/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -10055,11 +10055,11 @@ limitations under the License.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/opentelemetry-lib
Version: v0.9.0
Version: v0.12.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.9.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/opentelemetry-lib@v0.12.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,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.1.0
github.com/elastic/apm-data v1.13.1
github.com/elastic/apm-data v1.14.1
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241105110521-38dfc52434ed
github.com/elastic/elastic-agent-client/v7 v7.16.0
github.com/elastic/elastic-agent-libs v0.17.1
Expand Down Expand Up @@ -90,7 +90,7 @@ require (
github.com/elastic/go-structform v0.0.10 // indirect
github.com/elastic/go-windows v1.0.2 // indirect
github.com/elastic/gosigar v0.14.3 // indirect
github.com/elastic/opentelemetry-lib v0.9.0 // indirect
github.com/elastic/opentelemetry-lib v0.12.0 // indirect
github.com/elastic/pkcs8 v1.0.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/frankban/quicktest v1.14.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ github.com/ebitengine/purego v0.8.0 h1:JbqvnEzRvPpxhCJzJJ2y0RbiZ8nyjccVUrSM3q+Gv
github.com/ebitengine/purego v0.8.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
github.com/elastic/apm-aggregation v1.1.0 h1:eTHGd5w99JoRFJ763MJP6nUX4hkkeSil3KWiip7YtJY=
github.com/elastic/apm-aggregation v1.1.0/go.mod h1:YBQ77Jt7vOy2/7w4q5SsEifhc0V02dJxRcyyeC6HsvQ=
github.com/elastic/apm-data v1.13.1 h1:vQUWqi9H6QC4FCZ05kILkE+2BeKWw6iT+NXXyadWJm8=
github.com/elastic/apm-data v1.13.1/go.mod h1:m2FSH7alN07VmtmN10KmgxAa8tgXlJDe/rC0g4FnZUI=
github.com/elastic/apm-data v1.14.1 h1:3G8gJ4wjdd5O6JnxtdiEzVrKuqPT9mVqo03d5i5sRJ4=
github.com/elastic/apm-data v1.14.1/go.mod h1:AlwPwWh15EWP5yLDm/X40mdw1z/pHdlcTgMUkS9tKmY=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241105110521-38dfc52434ed h1:S8dxSZfUpOusaNmgALz/TJEqCRVgkRlLbGtMIEvn9Sw=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241105110521-38dfc52434ed/go.mod h1:eCxJTNQhr9Uqd8AxN5ZmoEmwP3siol1GZ6cwu0CemVI=
github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0JojNasPgYIA47gpuuns=
Expand Down Expand Up @@ -162,8 +162,8 @@ github.com/elastic/go-windows v1.0.2 h1:yoLLsAsV5cfg9FLhZ9EXZ2n2sQFKeDYrHenkcivY
github.com/elastic/go-windows v1.0.2/go.mod h1:bGcDpBzXgYSqM0Gx3DM4+UxFj300SZLixie9u9ixLM8=
github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/uo=
github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
github.com/elastic/opentelemetry-lib v0.9.0 h1:auMnq5zxqnB3eQNNdfz8+mtooy0D8+2ZEusU0sHeDj4=
github.com/elastic/opentelemetry-lib v0.9.0/go.mod h1:H4ECk7whGn41etgYL4zQWJ2BWN5xwP2A5HUIIwNrM9Y=
github.com/elastic/opentelemetry-lib v0.12.0 h1:SiCGkT7gLOzkl0wQosQrIWjHWb5eJY18Cm3V3GmdU0o=
github.com/elastic/opentelemetry-lib v0.12.0/go.mod h1:fdpkzh517xJqSGq3bo/fkdoX/Ag0OoanJoMoIDC3bBk=
github.com/elastic/pkcs8 v1.0.0 h1:HhitlUKxhN288kcNcYkjW6/ouvuwJWd9ioxpjnD9jVA=
github.com/elastic/pkcs8 v1.0.0/go.mod h1:ipsZToJfq1MxclVTwpG7U/bgeDtf+0HkUiOxebk95+0=
github.com/elastic/sarama v1.19.1-0.20210823122811-11c3ef800752 h1:5/RUNg7rkIvayjPhAIoI3v8p45NfWcfWs5DZSElycis=
Expand Down
3 changes: 3 additions & 0 deletions systemtest/approvals/TestIntake/Errors.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,9 @@
"error.id": [
"xFoaabb123FFFFFF"
],
"error.log.level": [
"error"
],
"error.log.message": [
"no user found"
],
Expand Down
3 changes: 3 additions & 0 deletions systemtest/approvals/TestIntake/MinimalEvents.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
"error.id": [
"abcdef0123456789"
],
"error.log.level": [
"error"
],
"error.log.message": [
"error log message"
],
Expand Down
3 changes: 0 additions & 3 deletions systemtest/approvals/TestJaeger/batch_1.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,6 @@
"observer.version": [
"dynamic"
],
"parent.id": [
"7be2fd98d0973be3"
],
"service.language.name": [
"Go"
],
Expand Down
3 changes: 3 additions & 0 deletions ...est/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
"error.id": [
"aba2688e033848ce9c4e4005f1caa534"
],
"error.log.level": [
"error"
],
"error.log.message": [
"Uncaught Error: log timeout test error"
],
Expand Down
3 changes: 3 additions & 0 deletions ...est/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
"error.id": [
"aba2688e033848ce9c4e4005f1caa534"
],
"error.log.level": [
"error"
],
"error.log.message": [
"Uncaught Error: log timeout test error"
],
Expand Down