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

Upgrading APM Node #205440

Merged

Conversation

kc13greiner
Copy link
Contributor

@kc13greiner kc13greiner commented Jan 2, 2025

Summary

Upgrade elastic-apm-node from 4.9.0 to 4.10.0

CHANGELOG

@kc13greiner kc13greiner self-assigned this Jan 2, 2025
@kc13greiner kc13greiner added chore Team:Security Team focused on: Auth, Users, Roles, Spaces, Audit Logging, and more! backport:all-open Backport to all branches that could still receive a release release_note:skip Skip the PR/issue when compiling release notes labels Jan 3, 2025
@kc13greiner kc13greiner marked this pull request as ready for review January 3, 2025 13:09
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-security (Team:Security)

@kc13greiner kc13greiner requested a review from azasypkin January 3, 2025 19:04
Copy link
Member

@azasypkin azasypkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

cc @kc13greiner

@kc13greiner kc13greiner merged commit 283bcf5 into elastic:main Jan 3, 2025
8 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 7.17, 8.16, 8.17, 8.x

https://github.com/elastic/kibana/actions/runs/12603649442

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jan 3, 2025
## Summary

Upgrade `elastic-apm-node` from 4.9.0 to 4.10.0

[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)

(cherry picked from commit 283bcf5)
@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

Status Branch Result
7.17 Backport failed because of merge conflicts
8.16 Backport failed because of merge conflicts

You might need to backport the following PRs to 8.16:
- Upgrade cypress to 13.17.0 (#205437)
8.17 Backport failed because of merge conflicts

You might need to backport the following PRs to 8.17:
- Upgrade cypress to 13.17.0 (#205437)
8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Manual backport

To create the backport manually run:

node scripts/backport --pr 205440

Questions ?

Please refer to the Backport tool documentation

kc13greiner added a commit to kc13greiner/kibana that referenced this pull request Jan 6, 2025
## Summary

Upgrade `elastic-apm-node` from 4.9.0 to 4.10.0

[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)

(cherry picked from commit 283bcf5)

# Conflicts:
#	package.json
#	yarn.lock
kc13greiner added a commit to kc13greiner/kibana that referenced this pull request Jan 6, 2025
## Summary

Upgrade `elastic-apm-node` from 4.9.0 to 4.10.0

[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)

(cherry picked from commit 283bcf5)

# Conflicts:
#	package.json
#	yarn.lock
kc13greiner added a commit to kc13greiner/kibana that referenced this pull request Jan 6, 2025
## Summary

Upgrade `elastic-apm-node` from 4.9.0 to 4.10.0

[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)

(cherry picked from commit 283bcf5)

# Conflicts:
#	package.json
#	yarn.lock
@kc13greiner
Copy link
Contributor Author

kc13greiner commented Jan 6, 2025

💚 All backports created successfully

Status Branch Result
8.17
8.16
7.17
8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

azasypkin pushed a commit that referenced this pull request Jan 6, 2025
# Backport

This will backport the following commits from `main` to `8.x`:
- [Upgrading APM Node
(#205440)](#205440)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"Kurt","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-03T20:39:25Z","message":"Upgrading
APM Node (#205440)\n\n## Summary\r\n\r\nUpgrade `elastic-apm-node` from
4.9.0 to
4.10.0\r\n\r\n\r\n[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)","sha":"283bcf5a155ae14c4217a02d6850da43eb8eea15","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Security","release_note:skip","v9.0.0","backport:all-open"],"title":"Upgrading
APM
Node","number":205440,"url":"https://github.com/elastic/kibana/pull/205440","mergeCommit":{"message":"Upgrading
APM Node (#205440)\n\n## Summary\r\n\r\nUpgrade `elastic-apm-node` from
4.9.0 to
4.10.0\r\n\r\n\r\n[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)","sha":"283bcf5a155ae14c4217a02d6850da43eb8eea15"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205440","number":205440,"mergeCommit":{"message":"Upgrading
APM Node (#205440)\n\n## Summary\r\n\r\nUpgrade `elastic-apm-node` from
4.9.0 to
4.10.0\r\n\r\n\r\n[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)","sha":"283bcf5a155ae14c4217a02d6850da43eb8eea15"}}]}]
BACKPORT-->

---------

Co-authored-by: Kurt <[email protected]>
azasypkin pushed a commit that referenced this pull request Jan 6, 2025
# Backport

This will backport the following commits from `main` to `8.17`:
- [Upgrading APM Node
(#205440)](#205440)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"Kurt","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-03T20:39:25Z","message":"Upgrading
APM Node (#205440)\n\n## Summary\r\n\r\nUpgrade `elastic-apm-node` from
4.9.0 to
4.10.0\r\n\r\n\r\n[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)","sha":"283bcf5a155ae14c4217a02d6850da43eb8eea15","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Security","release_note:skip","v9.0.0","backport:all-open"],"number":205440,"url":"https://github.com/elastic/kibana/pull/205440","mergeCommit":{"message":"Upgrading
APM Node (#205440)\n\n## Summary\r\n\r\nUpgrade `elastic-apm-node` from
4.9.0 to
4.10.0\r\n\r\n\r\n[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)","sha":"283bcf5a155ae14c4217a02d6850da43eb8eea15"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205440","number":205440,"mergeCommit":{"message":"Upgrading
APM Node (#205440)\n\n## Summary\r\n\r\nUpgrade `elastic-apm-node` from
4.9.0 to
4.10.0\r\n\r\n\r\n[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)","sha":"283bcf5a155ae14c4217a02d6850da43eb8eea15"}},{"url":"https://github.com/elastic/kibana/pull/205541","number":205541,"branch":"8.x","state":"OPEN"}]}]
BACKPORT-->
azasypkin pushed a commit that referenced this pull request Jan 6, 2025
# Backport

This will backport the following commits from `main` to `8.16`:
- [Upgrading APM Node
(#205440)](#205440)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"Kurt","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-03T20:39:25Z","message":"Upgrading
APM Node (#205440)\n\n## Summary\r\n\r\nUpgrade `elastic-apm-node` from
4.9.0 to
4.10.0\r\n\r\n\r\n[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)","sha":"283bcf5a155ae14c4217a02d6850da43eb8eea15","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Security","release_note:skip","v9.0.0","backport:all-open"],"number":205440,"url":"https://github.com/elastic/kibana/pull/205440","mergeCommit":{"message":"Upgrading
APM Node (#205440)\n\n## Summary\r\n\r\nUpgrade `elastic-apm-node` from
4.9.0 to
4.10.0\r\n\r\n\r\n[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)","sha":"283bcf5a155ae14c4217a02d6850da43eb8eea15"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205440","number":205440,"mergeCommit":{"message":"Upgrading
APM Node (#205440)\n\n## Summary\r\n\r\nUpgrade `elastic-apm-node` from
4.9.0 to
4.10.0\r\n\r\n\r\n[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)","sha":"283bcf5a155ae14c4217a02d6850da43eb8eea15"}},{"url":"https://github.com/elastic/kibana/pull/205541","number":205541,"branch":"8.x","state":"OPEN"}]}]
BACKPORT-->
@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Jan 7, 2025
kowalczyk-krzysztof pushed a commit to kowalczyk-krzysztof/kibana that referenced this pull request Jan 7, 2025
kc13greiner added a commit that referenced this pull request Jan 8, 2025
# Backport

This will backport the following commits from `main` to `7.17`:
- [Upgrading APM Node
(#205440)](#205440)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"Kurt","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-03T20:39:25Z","message":"Upgrading
APM Node (#205440)\n\n## Summary\r\n\r\nUpgrade `elastic-apm-node` from
4.9.0 to
4.10.0\r\n\r\n\r\n[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)","sha":"283bcf5a155ae14c4217a02d6850da43eb8eea15","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Security","release_note:skip","v9.0.0","backport:all-open"],"number":205440,"url":"https://github.com/elastic/kibana/pull/205440","mergeCommit":{"message":"Upgrading
APM Node (#205440)\n\n## Summary\r\n\r\nUpgrade `elastic-apm-node` from
4.9.0 to
4.10.0\r\n\r\n\r\n[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)","sha":"283bcf5a155ae14c4217a02d6850da43eb8eea15"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205440","number":205440,"mergeCommit":{"message":"Upgrading
APM Node (#205440)\n\n## Summary\r\n\r\nUpgrade `elastic-apm-node` from
4.9.0 to
4.10.0\r\n\r\n\r\n[CHANGELOG](https://github.com/elastic/apm-agent-nodejs/blob/main/CHANGELOG.asciidoc)","sha":"283bcf5a155ae14c4217a02d6850da43eb8eea15"}},{"url":"https://github.com/elastic/kibana/pull/205541","number":205541,"branch":"8.x","state":"OPEN"}]}]
BACKPORT-->

---------

Co-authored-by: kibanamachine <[email protected]>
@kibanamachine kibanamachine added v7.17.27 and removed backport missing Added to PRs automatically when the are determined to be missing a backport. labels Jan 8, 2025
CAWilson94 pushed a commit to CAWilson94/kibana that referenced this pull request Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:all-open Backport to all branches that could still receive a release chore release_note:skip Skip the PR/issue when compiling release notes Team:Security Team focused on: Auth, Users, Roles, Spaces, Audit Logging, and more! v7.17.27 v8.16.3 v8.17.1 v8.18.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants