Skip to content

[9.3] (backport #20199) build(deps): bump github.com/elastic/apm-data from 1.19.5 to 1.19.6#20210

Merged
mergify[bot] merged 3 commits into9.3from
mergify/bp/9.3/pr-20199
Feb 3, 2026
Merged

[9.3] (backport #20199) build(deps): bump github.com/elastic/apm-data from 1.19.5 to 1.19.6#20210
mergify[bot] merged 3 commits into9.3from
mergify/bp/9.3/pr-20199

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 28, 2026

Bumps github.com/elastic/apm-data from 1.19.5 to 1.19.6.

Release notes

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

v1.19.6

What's Changed

New Contributors

Full Changelog: elastic/apm-data@v1.19.5...v1.19.6

Commits
  • b8f480b fix: add missing span kind to otel traces (#559)
  • 9cf189a build(deps): bump golang.org/x/tools in the golang-org-x group (#570)
  • 51cb54f build(deps): bump github.com/elastic/opentelemetry-lib (#573)
  • df67c09 chore: Fix typo (#572)
  • 9fd2302 build(deps): bump google.golang.org/grpc from 1.77.0 to 1.78.0 (#568)
  • 57c85df build(deps): bump google.golang.org/protobuf from 1.36.10 to 1.36.11 (#565)
  • 33a2d99 build(deps): bump github.com/elastic/opentelemetry-lib (#567)
  • 8a5ee36 build(deps): bump golang.org/x/tools in the golang-org-x group (#564)
  • 3810cc5 build(deps): bump the otel group with 3 updates (#566)
  • f9f6571 build(deps): bump the otel group with 5 updates (#562)
  • 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 #20199 done by [Mergify](https://mergify.com).

…20199)

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

Bumps [github.com/elastic/apm-data](https://github.com/elastic/apm-data) from 1.19.5 to 1.19.6.
- [Release notes](https://github.com/elastic/apm-data/releases)
- [Commits](elastic/apm-data@v1.19.5...v1.19.6)

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

Signed-off-by: dependabot[bot] <support@github.com>

* Update NOTICE.txt

* Update NOTICE-fips.txt

---------

Signed-off-by: dependabot[bot] <support@github.com>
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 3f43a1a)

# Conflicts:
#	go.mod
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 28, 2026
@mergify mergify bot requested a review from a team as a code owner January 28, 2026 11:13
@mergify
Copy link
Contributor Author

mergify bot commented Jan 28, 2026

Cherry-pick of 3f43a1a has failed:

On branch mergify/bp/9.3/pr-20199
Your branch is up to date with 'origin/9.3'.

You are currently cherry-picking commit 3f43a1ad.
  (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-fips.txt
	modified:   NOTICE.txt
	modified:   go.sum

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

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 backport conflicts There is a conflict in the backported pull request labels Jan 28, 2026
@github-actions
Copy link
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor Author

mergify bot commented Feb 2, 2026

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

@carsonip
Copy link
Member

carsonip commented Feb 3, 2026

@dependabot recreate

@mergify
Copy link
Contributor Author

mergify bot commented Feb 3, 2026

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/9.3/pr-20199 upstream/mergify/bp/9.3/pr-20199
git merge upstream/9.3
git push upstream mergify/bp/9.3/pr-20199

@carsonip
Copy link
Member

carsonip commented Feb 3, 2026

@dependabot rebase

@mergify mergify bot added the queued label Feb 3, 2026
mergify bot added a commit that referenced this pull request Feb 3, 2026
@mergify
Copy link
Contributor Author

mergify bot commented Feb 3, 2026

Merge Queue Status

✅ The pull request has been merged at 6625e45

This pull request spent 9 minutes 19 seconds in the queue, including 8 minutes 58 seconds running CI.
The checks were run on draft #20274.

Required conditions to merge

mergify bot added a commit that referenced this pull request Feb 3, 2026
@mergify mergify bot merged commit 7d5b438 into 9.3 Feb 3, 2026
22 of 23 checks passed
@mergify mergify bot deleted the mergify/bp/9.3/pr-20199 branch February 3, 2026 14:26
@mergify mergify bot removed the queued label Feb 3, 2026
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

@github-actions github-actions bot mentioned this pull request Feb 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants