github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.9] Bump elastic-apm-node 3.49.0 -> 3.49.1 (#163522) (#163541)

Browse source 
# Backport

This will backport the following commits from `main` to `8.9`:
- [Bump elastic-apm-node 3.49.0 -> 3.49.1
(#163522)](https://github.com/elastic/kibana/pull/163522)

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

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

<!--BACKPORT [{"author":{"name":"Jeramy
Soucy","email":"jeramy.soucy@elastic.co"},"sourceCommit":{"committedDate":"2023-08-09T20:39:34Z","message":"Bump
elastic-apm-node 3.49.0 -> 3.49.1 (#163522)\n\n##
Summary\r\n\r\nUpgrades `elastic-apm-node` from 3.49.0 to
3.49.1","sha":"53965c97a1176127916870d2ac01f2ec2fdb95bb","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Security","release_note:skip","backport:all-open","v8.10.0"],"number":163522,"url":"https://github.com/elastic/kibana/pull/163522","mergeCommit":{"message":"Bump
elastic-apm-node 3.49.0 -> 3.49.1 (#163522)\n\n##
Summary\r\n\r\nUpgrades `elastic-apm-node` from 3.49.0 to
3.49.1","sha":"53965c97a1176127916870d2ac01f2ec2fdb95bb"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/163522","number":163522,"mergeCommit":{"message":"Bump
elastic-apm-node 3.49.0 -> 3.49.1 (#163522)\n\n##
Summary\r\n\r\nUpgrades `elastic-apm-node` from 3.49.0 to
3.49.1","sha":"53965c97a1176127916870d2ac01f2ec2fdb95bb"}}]}]
BACKPORT-->
This commit is contained in:
Jeramy Soucy 2023-08-10 11:37:51 -04:00 • committed by GitHub
parent 6c664aeb22
commit 0559e6636e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -816,7 +816,7 @@
"deepmerge": "^4.2.2",
"del": "^6.1.0",
"elastic-apm-http-client": "^11.0.1",
"elastic-apm-node": "^3.46.0",
"elastic-apm-node": "^3.49.1",
"email-addresses": "^5.0.0",
"execa": "^4.0.2",
"expiry-js": "0.1.7",

1
packages/kbn-test/src/jest/mocks/apm_agent_mock.ts
View file

@ -33,6 +33,7 @@ const agent: jest.Mocked<Agent> = {
startSpan: jest.fn(),
currentSpan: null,
setLabel: jest.fn().mockReturnValue(false),
setGlobalLabel: jest.fn(),
addLabels: jest.fn().mockReturnValue(false),
setUserContext: jest.fn(),
setCustomContext: jest.fn(),

68
yarn.lock
View file

@ -10082,10 +10082,10 @@ acorn-globals@^7.0.0:
acorn "^8.1.0"
acorn-walk "^8.0.2"
acorn-import-assertions@^1.7.6:
version "1.8.0"
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
acorn-import-assertions@^1.7.6, acorn-import-assertions@^1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
acorn-jsx@^5.3.1:
version "5.3.2"
@ -10126,10 +10126,10 @@ acorn@^7.0.0, acorn@^7.4.0, acorn@^7.4.1:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
acorn@^8.0.4, acorn@^8.1.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0:
version "8.8.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
acorn@^8.0.4, acorn@^8.1.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.2:
version "8.10.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
address@^1.0.1:
version "1.1.2"
@ -12176,6 +12176,11 @@ cjs-module-lexer@^1.0.0:
resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"
integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
cjs-module-lexer@^1.2.2:
version "1.2.3"
resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
clamp@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/clamp/-/clamp-1.0.1.tgz#66a0e64011816e37196828fdc8c8c147312c8634"
@ -14417,7 +14422,7 @@ ejs@^3.1.8:
dependencies:
jake "^10.8.5"
elastic-apm-http-client@11.2.0, elastic-apm-http-client@^11.0.1:
elastic-apm-http-client@11.2.0:
version "11.2.0"
resolved "https://registry.yarnpkg.com/elastic-apm-http-client/-/elastic-apm-http-client-11.2.0.tgz#4da8b975ca326c1e5beb59746ab1124c4feddad3"
integrity sha512-XHXK+gQmd34eRN/ffrml7AN4h1VwujB79WEO2C/J59ufvEk+mT1OGBhl6pntHPUWn4Um52C5m84O6jIXzaQwfw==
@ -14432,7 +14437,7 @@ elastic-apm-http-client@11.2.0, elastic-apm-http-client@^11.0.1:
semver "^6.3.0"
stream-chopper "^3.0.1"
elastic-apm-http-client@11.4.0:
elastic-apm-http-client@^11.0.1:
version "11.4.0"
resolved "https://registry.yarnpkg.com/elastic-apm-http-client/-/elastic-apm-http-client-11.4.0.tgz#781a69d958628e11c51f94249131a3d04875962f"
integrity sha512-DxPy8MFrcL04qxMG4sxmI5yIKrFCIhJc2xx0eupE3qjCIIPHeLJaUrjFbQbsAnnuhC9sljWsEebtFweHj+Vmug==
@ -14487,28 +14492,31 @@ elastic-apm-node@^3.38.0:
traverse "^0.6.6"
unicode-byte-truncate "^1.0.0"
elastic-apm-node@^3.46.0:
version "3.46.0"
resolved "https://registry.yarnpkg.com/elastic-apm-node/-/elastic-apm-node-3.46.0.tgz#38a8cf8ee1da73d10d62eca59a770643171d16b2"
integrity sha512-MuM7Xe+5K7AkfFqrKWrvBJVFcS+hPcTKGj7yR/0/WHR5/r/ZjkBEX/t2bUMjgyHHG4lu5LH/RN86ScGdw1GG2w==
elastic-apm-node@^3.49.1:
version "3.49.1"
resolved "https://registry.yarnpkg.com/elastic-apm-node/-/elastic-apm-node-3.49.1.tgz#c000936a1b7f062e4dd502cd3617ebe97d4d9786"
integrity sha512-k1kQ/exFqodZOoZSRJ3Csbdo7dtRs/uORBlRTyV2takYa1OIN7o9dvZwd8+eEPOUz4qaeRyVY8X9X2krk9GO/g==
dependencies:
"@elastic/ecs-pino-format" "^1.2.0"
"@opentelemetry/api" "^1.4.1"
"@opentelemetry/core" "^1.11.0"
"@opentelemetry/sdk-metrics" "^1.12.0"
after-all-results "^2.0.0"
agentkeepalive "^4.2.1"
async-cache "^1.1.0"
async-value-promise "^1.1.1"
basic-auth "^2.0.1"
breadth-filter "^2.0.0"
cookie "^0.5.0"
core-util-is "^1.0.2"
elastic-apm-http-client "11.4.0"
end-of-stream "^1.4.4"
error-callsites "^2.0.4"
error-stack-parser "^2.0.6"
escape-string-regexp "^4.0.0"
fast-safe-stringify "^2.0.7"
fast-stream-to-buffer "^1.0.0"
http-headers "^3.0.2"
import-in-the-middle "1.4.2"
is-native "^1.0.1"
lru-cache "^6.0.0"
measured-reporting "^1.51.1"
@ -14518,13 +14526,14 @@ elastic-apm-node@^3.46.0:
object-identity-map "^1.0.2"
original-url "^1.2.3"
pino "^6.11.2"
readable-stream "^3.4.0"
relative-microtime "^2.0.0"
require-in-the-middle "^7.0.1"
semver "^6.3.0"
require-in-the-middle "^7.1.1"
semver "^6.3.1"
shallow-clone-shim "^2.0.0"
source-map "^0.8.0-beta.0"
sql-summary "^1.0.1"
traverse "^0.6.6"
stream-chopper "^3.0.1"
unicode-byte-truncate "^1.0.0"
elasticsearch@^16.4.0:
@ -17776,6 +17785,16 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
parent-module "^1.0.0"
resolve-from "^4.0.0"
import-in-the-middle@1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.4.2.tgz#2a266676e3495e72c04bbaa5ec14756ba168391b"
integrity sha512-9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw==
dependencies:
acorn "^8.8.2"
acorn-import-assertions "^1.9.0"
cjs-module-lexer "^1.2.2"
module-details-from-path "^1.0.3"
import-lazy@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
@ -25203,10 +25222,10 @@ require-in-the-middle@^6.0.0:
module-details-from-path "^1.0.3"
resolve "^1.22.1"
require-in-the-middle@^7.0.1:
version "7.1.0"
resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-7.1.0.tgz#8ab4089383e7b7879ed134d8e9d1887bd48195ec"
integrity sha512-6f86Mh0vWCxqKKatRPwgY6VzYmcVay3WUTIpJ1ILBCNh+dTWabMR1swKGKz3XcEZ5mgjndzRu7fQ+44G2H9Gew==
require-in-the-middle@^7.1.1:
version "7.2.0"
resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-7.2.0.tgz#b539de8f00955444dc8aed95e17c69b0a4f10fcf"
integrity sha512-3TLx5TGyAY6AOqLBoXmHkNql0HIf2RGbuMgCDT2WO/uGVAPJs6h7Kl+bN6TIZGd9bWhWPwnDnTHGtW8Iu77sdw==
dependencies:
debug "^4.1.1"
module-details-from-path "^1.0.3"
@ -25734,6 +25753,11 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semve
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
semver@^6.3.1:
version "6.3.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
semver@^7.2.1, semver@^7.3.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3:
version "7.5.3"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"