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.13.1 to 1.14.1 (backport #14501) #14550

Merged
merged 5 commits into from
Nov 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 6, 2024

Bumps github.com/elastic/apm-data from 1.13.1 to 1.14.1.

Release notes

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

v1.14.1

What's Changed

Full Changelog: elastic/apm-data@v1.14.0...v1.14.1

v1.14.0

What's Changed

Full Changelog: elastic/apm-data@v1.13.1...v1.14.0

Commits
  • 46f8e38 build(deps): bump github.com/elastic/opentelemetry-lib (#385)
  • 8e3a1a7 Handle otlp semconv deployment.environment.name alongside deprecated deployme...
  • ed18118 build(deps): bump the otel group with 5 updates (#383)
  • 218d72d build(deps): bump github.com/elastic/opentelemetry-lib (#382)
  • 44e3a29 Remove incorrect or unnecessary fields from documents from otlp span event (#...
  • 330078b build(deps): bump github.com/jaegertracing/jaeger in the otel group (#379)
  • b994fdc github-actions: use ephemeral tokens for add the different projects board and...
  • e54a20f build(deps): bump golang.org/x/tools in the golang-org-x group (#378)
  • 4568ea8 build(deps): bump the otel group with 4 updates (#377)
  • 0906388 build(deps): bump github.com/elastic/opentelemetry-lib (#376)
  • Additional commits viewable 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 #14501 done by [Mergify](https://mergify.com).

…14501)

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

Bumps [github.com/elastic/apm-data](https://github.com/elastic/apm-data) from 1.13.1 to 1.14.1.
- [Release notes](https://github.com/elastic/apm-data/releases)
- [Commits](elastic/apm-data@v1.13.1...v1.14.1)

---
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

* test: update approvals docs

---------

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: kruskal <[email protected]>
(cherry picked from commit ae2798c)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner November 6, 2024 13:43
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 6, 2024
Copy link
Contributor Author

mergify bot commented Nov 6, 2024

Cherry-pick of ae2798c has failed:

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

You are currently cherry-picking commit ae2798c20.
  (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
	modified:   systemtest/approvals/TestIntake/Errors.approved.json
	modified:   systemtest/approvals/TestIntake/MinimalEvents.approved.json
	modified:   systemtest/approvals/TestJaeger/batch_1.approved.json
	modified:   systemtest/approvals/TestRUMErrorSourcemapping/absolute_bundle_filepath/standalone.approved.json
	modified:   systemtest/approvals/TestRUMErrorSourcemapping/relative_bundle_filepath/standalone.approved.json

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

@kruskall kruskall removed the conflicts There is a conflict in the backported pull request label Nov 6, 2024
Copy link
Contributor Author

mergify bot commented Nov 6, 2024

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-14501 upstream/mergify/bp/8.x/pr-14501
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-14501

Copy link
Contributor Author

mergify bot commented Nov 11, 2024

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

@kruskall
Copy link
Member

@Mergifyio queue

Copy link
Contributor Author

mergify bot commented Nov 12, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 31f6df3

@mergify mergify bot merged commit 31f6df3 into 8.x Nov 12, 2024
12 of 13 checks passed
@mergify mergify bot deleted the mergify/bp/8.x/pr-14501 branch November 12, 2024 14:28
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