Skip to content

Commit 8c5bfe7

Browse files
[7.17] Upgrading APM Node (elastic#205440) (elastic#205576)
# Backport This will backport the following commits from `main` to `7.17`: - [Upgrading APM Node (elastic#205440)](elastic#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 (elastic#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 (elastic#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 (elastic#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]>
1 parent 120a0f0 commit 8c5bfe7

File tree

6 files changed

+15223
-16769
lines changed

6 files changed

+15223
-16769
lines changed

NOTICE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Kibana source code with Kibana X-Pack source code
2-
Copyright 2012-2024 Elasticsearch B.V.
2+
Copyright 2012-2025 Elasticsearch B.V.
33

44
---
55
Pretty handling of logarithmic axes.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@
224224
"dedent": "^0.7.0",
225225
"deep-freeze-strict": "^1.1.1",
226226
"deepmerge": "^4.2.2",
227-
"del": "^5.1.0",
228-
"elastic-apm-node": "^3.49.1",
227+
"del": "^6.1.0",
228+
"elastic-apm-node": "^4.10.0",
229229
"email-addresses": "^5.0.0",
230230
"execa": "^5.1.1",
231231
"exit-hook": "^2.2.0",

packages/kbn-apm-config-loader/src/config.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ describe('ApmConfiguration', () => {
9090
"centralConfig": false,
9191
"environment": "development",
9292
"globalLabels": Object {},
93-
"logUncaughtExceptions": true,
9493
"metricsInterval": "30s",
9594
"propagateTracestate": true,
9695
"secretToken": "JpBCcOQxN81D5yucs2",
@@ -114,7 +113,6 @@ describe('ApmConfiguration', () => {
114113
"globalLabels": Object {
115114
"git_rev": "sha",
116115
},
117-
"logUncaughtExceptions": true,
118116
"metricsInterval": "120s",
119117
"propagateTracestate": true,
120118
"secretToken": "JpBCcOQxN81D5yucs2",

packages/kbn-apm-config-loader/src/config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import type { AgentConfigOptions as RUMAgentConfigOptions } from '@elastic/apm-r
1919
const DEFAULT_CONFIG: AgentConfigOptions = {
2020
active: false,
2121
environment: 'development',
22-
logUncaughtExceptions: true,
2322
globalLabels: {},
2423
};
2524

0 commit comments

Comments
 (0)