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.16.0 to 1.18.0 (backport #15702) #15770

Open
wants to merge 2 commits into
base: 8.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 18, 2025

Bumps github.com/elastic/apm-data from 1.16.0 to 1.18.0.

Release notes

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

v1.18.0

What's Changed

Full Changelog: elastic/apm-data@v1.17.0...v1.18.0

v1.17.0

What's Changed

New Contributors

Full Changelog: elastic/apm-data@v1.16.0...v1.17.0

Commits
  • 1e73b0c Update support for semconv versions up to semconv 1.27.0 (#440)
  • da36b71 build(deps): bump golang.org/x/sync in the golang-org-x group (#436)
  • 811313e fix: Truncate string slice attributes in OTLP labels (#434)
  • 58bbb4a build(deps): bump google.golang.org/grpc from 1.69.4 to 1.70.0 (#430)
  • 99f84c0 build(deps): bump go.elastic.co/apm/v2 in the go-agent group (#425)
  • 184e8d7 build(deps): bump google.golang.org/grpc from 1.69.2 to 1.69.4 (#424)
  • 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 #15702 done by [Mergify](https://mergify.com).

…15702)

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

Bumps [github.com/elastic/apm-data](https://github.com/elastic/apm-data) from 1.16.0 to 1.18.0.
- [Release notes](https://github.com/elastic/apm-data/releases)
- [Commits](elastic/apm-data@v1.16.0...v1.18.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>
(cherry picked from commit ea604f0)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner February 18, 2025 11:47
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 18, 2025
Copy link
Contributor Author

mergify bot commented Feb 18, 2025

Cherry-pick of ea604f0 has failed:

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

You are currently cherry-picking commit ea604f0e.
  (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)

Changes to be committed:
	modified:   NOTICE.txt

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

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

@github-actions github-actions bot added dependency go Pull requests that update Go code labels Feb 18, 2025
@simitt simitt requested a review from carsonip February 18, 2025 11:57
@simitt simitt added v8.19.0 and removed conflicts There is a conflict in the backported pull request labels Feb 18, 2025
Copy link
Contributor Author

mergify bot commented Feb 24, 2025

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.x/pr-15702 upstream/mergify/bp/8.x/pr-15702
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-15702

Copy link
Contributor Author

mergify bot commented Feb 24, 2025

This pull request has not been merged yet. Could you please review and merge it @? 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport dependency go Pull requests that update Go code v8.19.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants