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-aggregation from 1.1.0 to 1.2.0 #15056

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Dec 25, 2024

Bumps github.com/elastic/apm-aggregation from 1.1.0 to 1.2.0.

Release notes

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

v1.2.0

What's Changed

New Contributors

Full Changelog: elastic/apm-aggregation@v1.1.0...v1.2.0

Commits
  • e25bba7 testing: expose convert and merge functions as part of public API (#233)
  • ff9f9fb build(deps): bump google.golang.org/protobuf from 1.36.0 to 1.36.1 (#236)
  • a6599e2 build(deps): bump google.golang.org/protobuf from 1.35.2 to 1.36.0 (#232)
  • b98a86c build(deps): bump the otel group with 5 updates (#231)
  • 0df725b build(deps): bump golang.org/x/tools in /tools in the dependencies group (#230)
  • 81af5a1 build(deps): bump the golang-org-x group across 1 directory with 2 updates (#...
  • 878b285 build(deps): bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (#224)
  • 0a6c8ab build(deps): bump google.golang.org/protobuf from 1.35.1 to 1.35.2 (#223)
  • 071da8c build(deps): bump golang.org/x/tools in /tools in the dependencies group (#222)
  • 3878da7 build(deps): bump the otel group with 5 updates (#220)
  • 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 will merge this PR once it's up-to-date and CI passes on it, as requested by @lahsivjar.


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)

Bumps [github.com/elastic/apm-aggregation](https://github.com/elastic/apm-aggregation) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/elastic/apm-aggregation/releases)
- [Commits](elastic/apm-aggregation@v1.1.0...v1.2.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot requested a review from a team as a code owner December 25, 2024 18:02
@dependabot dependabot bot added dependency go Pull requests that update Go code labels Dec 25, 2024
Copy link
Contributor

mergify bot commented Dec 25, 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 Dec 25, 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 Dec 25, 2024
@lahsivjar
Copy link
Contributor

@dependabot squash and merge

@kruskall kruskall enabled auto-merge (squash) December 27, 2024 13:26
@kruskall kruskall merged commit d367e64 into main Dec 27, 2024
12 checks passed
@kruskall kruskall deleted the dependabot/go_modules/github.com/elastic/apm-aggregation-1.2.0 branch December 27, 2024 13:35
mergify bot pushed a commit that referenced this pull request Dec 27, 2024
…2.0 (#15056)

* build(deps): bump github.com/elastic/apm-aggregation from 1.1.0 to 1.2.0

Bumps [github.com/elastic/apm-aggregation](https://github.com/elastic/apm-aggregation) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/elastic/apm-aggregation/releases)
- [Commits](elastic/apm-aggregation@v1.1.0...v1.2.0)

---
updated-dependencies:
- dependency-name: github.com/elastic/apm-aggregation
  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 d367e64)

# Conflicts:
#	go.mod
#	go.sum
mergify bot added a commit that referenced this pull request Dec 27, 2024
… to 1.2.0 (backport #15056) (#15059)

* build(deps): bump github.com/elastic/apm-aggregation from 1.1.0 to 1.2.0 (#15056)

* build(deps): bump github.com/elastic/apm-aggregation from 1.1.0 to 1.2.0

Bumps [github.com/elastic/apm-aggregation](https://github.com/elastic/apm-aggregation) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/elastic/apm-aggregation/releases)
- [Commits](elastic/apm-aggregation@v1.1.0...v1.2.0)

---
updated-dependencies:
- dependency-name: github.com/elastic/apm-aggregation
  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 d367e64)

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