Skip to content

Commit

Permalink
[7.17] Upgrading APM Node (#205440) (#205576)
Browse files Browse the repository at this point in the history
# 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]>
  • Loading branch information
kc13greiner and kibanamachine authored Jan 8, 2025
1 parent 120a0f0 commit 8c5bfe7
Show file tree
Hide file tree
Showing 6 changed files with 15,223 additions and 16,769 deletions.
2 changes: 1 addition & 1 deletion NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Kibana source code with Kibana X-Pack source code
Copyright 2012-2024 Elasticsearch B.V.
Copyright 2012-2025 Elasticsearch B.V.

---
Pretty handling of logarithmic axes.
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@
"dedent": "^0.7.0",
"deep-freeze-strict": "^1.1.1",
"deepmerge": "^4.2.2",
"del": "^5.1.0",
"elastic-apm-node": "^3.49.1",
"del": "^6.1.0",
"elastic-apm-node": "^4.10.0",
"email-addresses": "^5.0.0",
"execa": "^5.1.1",
"exit-hook": "^2.2.0",
Expand Down
2 changes: 0 additions & 2 deletions packages/kbn-apm-config-loader/src/config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ describe('ApmConfiguration', () => {
"centralConfig": false,
"environment": "development",
"globalLabels": Object {},
"logUncaughtExceptions": true,
"metricsInterval": "30s",
"propagateTracestate": true,
"secretToken": "JpBCcOQxN81D5yucs2",
Expand All @@ -114,7 +113,6 @@ describe('ApmConfiguration', () => {
"globalLabels": Object {
"git_rev": "sha",
},
"logUncaughtExceptions": true,
"metricsInterval": "120s",
"propagateTracestate": true,
"secretToken": "JpBCcOQxN81D5yucs2",
Expand Down
1 change: 0 additions & 1 deletion packages/kbn-apm-config-loader/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import type { AgentConfigOptions as RUMAgentConfigOptions } from '@elastic/apm-r
const DEFAULT_CONFIG: AgentConfigOptions = {
active: false,
environment: 'development',
logUncaughtExceptions: true,
globalLabels: {},
};

Expand Down
Loading

0 comments on commit 8c5bfe7

Please sign in to comment.