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

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

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Oct 31, 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)

@dependabot dependabot bot requested a review from a team as a code owner October 31, 2024 22:27
@dependabot dependabot bot added dependency go Pull requests that update Go code labels Oct 31, 2024
Copy link
Contributor

mergify bot commented Oct 31, 2024

This pull request does not have a backport label. Could you fix it @dependabot[bot]? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.17 is the label to automatically backport to the 7.17 branch.
  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
  • backport-8.x is the label to automatically backport to the 8.x branch.

Copy link
Contributor

mergify bot commented Oct 31, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Oct 31, 2024
kruskall
kruskall previously approved these changes Oct 31, 2024
@kruskall kruskall closed this Oct 31, 2024
@kruskall kruskall reopened this Oct 31, 2024
Copy link
Contributor Author

dependabot bot commented on behalf of github Oct 31, 2024

OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting @dependabot ignore this major version or @dependabot ignore this minor version. You can also ignore all major, minor, or patch releases for a dependency by adding an ignore condition with the desired update_types to your config file.

If you change your mind, just re-open this PR and I'll resolve any conflicts on it.

@kruskall kruskall enabled auto-merge (squash) October 31, 2024 22:35
@kruskall
Copy link
Member

kruskall commented Nov 4, 2024

@dependabot recreate

Copy link
Contributor

mergify bot commented Nov 4, 2024

This pull request is now in conflicts. Could you fix it @dependabot[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 dependabot/go_modules/github.com/elastic/apm-data-1.14.1 upstream/dependabot/go_modules/github.com/elastic/apm-data-1.14.1
git merge upstream/main
git push upstream dependabot/go_modules/github.com/elastic/apm-data-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]>
@dependabot dependabot bot force-pushed the dependabot/go_modules/github.com/elastic/apm-data-1.14.1 branch from 4d6386a to dc55bbd Compare November 4, 2024 21:42
@kruskall kruskall closed this Nov 4, 2024
auto-merge was automatically disabled November 4, 2024 21:46

Pull request was closed

@kruskall kruskall reopened this Nov 4, 2024
@kruskall kruskall requested a review from a team November 4, 2024 22:46
Copy link
Contributor

mergify bot commented Nov 5, 2024

This pull request is now in conflicts. Could you fix it @dependabot[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 dependabot/go_modules/github.com/elastic/apm-data-1.14.1 upstream/dependabot/go_modules/github.com/elastic/apm-data-1.14.1
git merge upstream/main
git push upstream dependabot/go_modules/github.com/elastic/apm-data-1.14.1

@kruskall kruskall merged commit ae2798c into main Nov 6, 2024
12 checks passed
@kruskall kruskall deleted the dependabot/go_modules/github.com/elastic/apm-data-1.14.1 branch November 6, 2024 13:41
mergify bot pushed a commit that referenced this pull request Nov 6, 2024
…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 bot added a commit that referenced this pull request Nov 12, 2024
…14.1 (backport #14501) (#14550)

* build(deps): bump github.com/elastic/apm-data from 1.13.1 to 1.14.1 (#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

* Update go.mod

* Update go.sum

---------

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: kruskall <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify dependency go Pull requests that update Go code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants