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.

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.x] build(deps): bump github.com/elastic/apm-data from 1.14.4 to 1.15.0 (backport #15092) #15105

Merged
merged 4 commits into from
Jan 2, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 2, 2025

Bumps github.com/elastic/apm-data from 1.14.4 to 1.15.0.

Release notes

Sourced from github.com/elastic/apm-data's releases.

v1.15.0

What's Changed

Deps updates

New Contributors

Full Changelog: elastic/apm-data@v1.14.4...v1.15.0

Commits
  • 20bb1f9 build(deps): bump github.com/elastic/opentelemetry-lib (#419)
  • cadcbb9 build(deps): bump google.golang.org/protobuf from 1.35.2 to 1.36.0 (#413)
  • 560cc4b Add field for span http request body to IntakeV2 (#366)
  • e8b8d0a build(deps): bump google.golang.org/grpc from 1.69.0 to 1.69.2 (#417)
  • 11bea6a build(deps): bump the otel group with 4 updates (#415)
  • c7b04dc Add specific type and subtype for otlp gen_ai spans (#414)
  • See full diff in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

This is an automatic backport of pull request #15092 done by [Mergify](https://mergify.com).

…15092)

* build(deps): bump github.com/elastic/apm-data from 1.14.4 to 1.15.0

Bumps [github.com/elastic/apm-data](https://github.com/elastic/apm-data) from 1.14.4 to 1.15.0.
- [Release notes](https://github.com/elastic/apm-data/releases)
- [Commits](elastic/apm-data@v1.14.4...v1.15.0)

---
updated-dependencies:
- dependency-name: github.com/elastic/apm-data
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update NOTICE.txt

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: kruskall <[email protected]>
(cherry picked from commit 7ed5ced)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
Copy link
Contributor Author

mergify bot commented Jan 2, 2025

Cherry-pick of 7ed5ced has failed:

On branch mergify/bp/8.x/pr-15092
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 7ed5cede.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the backport label Jan 2, 2025
@mergify mergify bot requested a review from a team as a code owner January 2, 2025 15:29
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jan 2, 2025
@kruskall kruskall removed the conflicts There is a conflict in the backported pull request label Jan 2, 2025
@mergify mergify bot merged commit d64ac95 into 8.x Jan 2, 2025
14 checks passed
@mergify mergify bot deleted the mergify/bp/8.x/pr-15092 branch January 2, 2025 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant