maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Upgrade apm nodejs and rum agents (#102723) (#102812)

Browse source 
* bump apm nodejs agent version to 3.16.0

* bump apm-rum agents

* use ApmConfigOptions exported from rum agent

Co-authored-by: Mikhail Shustov <restrry@gmail.com>
This commit is contained in:
Kibana Machine 2021-06-21 17:54:58 -04:00 committed by GitHub
parent 72b434df8b
commit 1095236dd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -94,8 +94,8 @@
"yarn": "^1.21.1"
},
"dependencies": {
"@elastic/apm-rum": "^5.6.1",
"@elastic/apm-rum-react": "^1.2.5",
"@elastic/apm-rum": "^5.8.0",
"@elastic/apm-rum-react": "^1.2.11",
"@elastic/charts": "30.1.0",
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@7.14.0-canary.6",
@ -221,7 +221,7 @@
"deep-freeze-strict": "^1.1.1",
"deepmerge": "^4.2.2",
"del": "^5.1.0",
"elastic-apm-node": "^3.14.0",
"elastic-apm-node": "^3.16.0",
"elasticsearch": "^16.7.0",
"execa": "^4.0.2",
"exit-hook": "^2.2.0",

7
src/core/public/apm_system.ts
View file

@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
import type { ApmBase } from '@elastic/apm-rum';
import type { ApmBase, AgentConfigOptions } from '@elastic/apm-rum';
import { modifyUrl } from '@kbn/std';
import type { InternalApplicationStart } from './application';
@ -18,9 +18,8 @@ const HTTP_REQUEST_TRANSACTION_NAME_REGEX = /^(GET|POST|PUT|HEAD|PATCH|DELETE|OP
* that lives in the Kibana Platform.
*/
interface ApmConfig {
// AgentConfigOptions is not exported from @elastic/apm-rum
active?: boolean;
interface ApmConfig extends AgentConfigOptions {
// Kibana-specific config settings:
globalLabels?: Record<string, string>;
}

82
yarn.lock
View file

@ -1328,29 +1328,29 @@
is-absolute "^1.0.0"
is-negated-glob "^1.0.0"
"@elastic/apm-rum-core@^5.7.0":
version "5.7.0"
resolved "https://registry.yarnpkg.com/@elastic/apm-rum-core/-/apm-rum-core-5.7.0.tgz#2213987285324781e2ebeca607f3a71245da5a84"
integrity sha512-YxfyDwlPDRy05ERb8h79eXq2ebDamlyII3sdc8zsfL6Hc1wOHK3uBGelDQjQzkUkRJqJL1Sy6LJqok2mpxQJyw==
"@elastic/apm-rum-core@^5.11.0":
version "5.11.0"
resolved "https://registry.yarnpkg.com/@elastic/apm-rum-core/-/apm-rum-core-5.11.0.tgz#6cfebb62d5ac33cf5ec9dfbe206f120ff5d17ecc"
integrity sha512-JqxsVU6/gHfWe3DiJ7uN0h0e+zFd8LbcC5i/Pa14useiKOVn4r7dHeKoWkBSJCY63cl76hotCbtgqkuVgWVzmA==
dependencies:
error-stack-parser "^1.3.5"
opentracing "^0.14.3"
promise-polyfill "^8.1.3"
"@elastic/apm-rum-react@^1.2.5":
version "1.2.5"
resolved "https://registry.yarnpkg.com/@elastic/apm-rum-react/-/apm-rum-react-1.2.5.tgz#ac715a192808e14e62e537e41b70cc8296854051"
integrity sha512-5+5Q2ztOQT0EbWFZqV2N78tcuA9qPuO5QAtSTQIYgb5lH27Sfa9G4xlTgCbJs9DzCKmhuu27E4DTArrU3tyNzA==
"@elastic/apm-rum-react@^1.2.11":
version "1.2.11"
resolved "https://registry.yarnpkg.com/@elastic/apm-rum-react/-/apm-rum-react-1.2.11.tgz#945436cbe90507fda85016c0e3a44984c3f0a9c8"
integrity sha512-kl+NdNZ0eANAD7DlN3fFR7M9NeEW21rINh9aLSmEMQedUNNn+3K9oQzD4MirjV1TA5hsLSeGiCKrfPzja9Ynjw==
dependencies:
"@elastic/apm-rum" "^5.6.1"
"@elastic/apm-rum" "^5.8.0"
hoist-non-react-statics "^3.3.0"
"@elastic/apm-rum@^5.6.1":
version "5.6.1"
resolved "https://registry.yarnpkg.com/@elastic/apm-rum/-/apm-rum-5.6.1.tgz#0d1bbef774866064795f7a9c6db0c951a900de35"
integrity sha512-q6ZkDb+m2z29h6/JKqBL/nBf6/x5yYmW1vUpdW3zy03jTQp+A7LpVaPI1HNquyGryqqT/BQl4QivFcNC28pr4w==
"@elastic/apm-rum@^5.8.0":
version "5.8.0"
resolved "https://registry.yarnpkg.com/@elastic/apm-rum/-/apm-rum-5.8.0.tgz#ab88dc9e955b7fa2f00d5541d242a91a44c0c931"
integrity sha512-lje3SxwqhRkogCsBUsK9y0cn1Kv3dj4Ukbt4VbmNr44KRYoY9A3gTm5e5qKLF6DgsPCOc9EZBF36a0Wtjlkt/g==
dependencies:
"@elastic/apm-rum-core" "^5.7.0"
"@elastic/apm-rum-core" "^5.11.0"
"@elastic/app-search-javascript@^7.3.0":
version "7.8.0"
@ -12159,10 +12159,10 @@ ejs@^3.1.2, ejs@^3.1.5, ejs@^3.1.6:
dependencies:
jake "^10.6.1"
elastic-apm-http-client@^9.8.0:
version "9.8.0"
resolved "https://registry.yarnpkg.com/elastic-apm-http-client/-/elastic-apm-http-client-9.8.0.tgz#caa738c2663b3ec8521ebede86cc841e4c77863c"
integrity sha512-JrlQbijs4dY8539zH+QNKLqLDCNyNymyy720tDaj+/i5pcwWYz5ipPARAdrKkor56AmKBxib8Fd6KsSWtIYjcA==
elastic-apm-http-client@^9.8.1:
version "9.8.1"
resolved "https://registry.yarnpkg.com/elastic-apm-http-client/-/elastic-apm-http-client-9.8.1.tgz#62a0352849e2d7a75696a1c777ad90ddb55083b0"
integrity sha512-tVU7+y4nSDUEZp/TXbXDxE+kXbWHsGVG1umk0OOV71UEPc/AqC7xSP5ACirOlDkewkfCOFXkvNThgu2zlx8PUw==
dependencies:
breadth-filter "^2.0.0"
container-info "^1.0.1"
@ -12174,24 +12174,28 @@ elastic-apm-http-client@^9.8.0:
stream-chopper "^3.0.1"
unicode-byte-truncate "^1.0.0"
elastic-apm-node@^3.14.0:
version "3.14.0"
resolved "https://registry.yarnpkg.com/elastic-apm-node/-/elastic-apm-node-3.14.0.tgz#942d6e86bd9d3710f51f0e43f04965d63c3fefd3"
integrity sha512-B7Xkz6UL44mm+2URdZy2yxpEB2C5CvZLOP3sGpf2h/hepXr4NgrVoRxGqO1F2b2wCB48smPv4a3v35b396VSwA==
elastic-apm-node@^3.16.0:
version "3.16.0"
resolved "https://registry.yarnpkg.com/elastic-apm-node/-/elastic-apm-node-3.16.0.tgz#b55ba5c54acd2f40be704dc48c664ddb1729f20f"
integrity sha512-WR56cjpvt9ZAAw+4Ct2XjCtmy+lgn5kXZH220TRgC7W71c5uuRdioRJpIdvBPMZmeLnHwzok2+acUB7bxnYvVA==
dependencies:
"@elastic/ecs-pino-format" "^1.1.0"
after-all-results "^2.0.0"
async-cache "^1.1.0"
async-value-promise "^1.1.1"
basic-auth "^2.0.1"
cookie "^0.4.0"
core-util-is "^1.0.2"
elastic-apm-http-client "^9.8.0"
elastic-apm-http-client "^9.8.1"
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"
http-headers "^3.0.2"
is-native "^1.0.1"
load-source-map "^2.0.0"
lru-cache "^6.0.0"
measured-reporting "^1.51.1"
monitor-event-loop-delay "^1.0.0"
object-filter-sequence "^1.0.0"
@ -12205,7 +12209,6 @@ elastic-apm-node@^3.14.0:
set-cookie-serde "^1.0.0"
shallow-clone-shim "^2.0.0"
sql-summary "^1.0.1"
stackman "^4.0.1"
traceparent "^1.0.0"
traverse "^0.6.6"
unicode-byte-truncate "^1.0.0"
@ -12459,10 +12462,10 @@ errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
dependencies:
prr "~1.0.1"
error-callsites@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/error-callsites/-/error-callsites-2.0.3.tgz#c9278de0d7d4b4861150af295bb92891393ff24a"
integrity sha512-v036z4IEffZFE5kBkV5/F2MzhLnG0vuDyN+VXpzCf4yWXvX/1WJCI0A+TGTr8HWzBfCw5k8gr9rwAo09V+obTA==
error-callsites@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/error-callsites/-/error-callsites-2.0.4.tgz#44f09e6a201e9a1603ead81eacac5ba258fca76e"
integrity sha512-V877Ch4FC4FN178fDK1fsrHN4I1YQIBdtjKrHh3BUHMnh3SMvwUVrqkaOgDpUuevgSNna0RBq6Ox9SGlxYrigA==
error-ex@^1.2.0, error-ex@^1.3.1:
version "1.3.1"
@ -18328,14 +18331,12 @@ load-json-file@^6.2.0:
strip-bom "^4.0.0"
type-fest "^0.6.0"
load-source-map@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/load-source-map/-/load-source-map-1.0.0.tgz#318f49905ce8a709dfb7cc3f16f3efe3bcf1dd05"
integrity sha1-MY9JkFzopwnft8w/FvPv47zx3QU=
load-source-map@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/load-source-map/-/load-source-map-2.0.0.tgz#48f1c7002d7d9e20dd119da6e566104ec46a5683"
integrity sha512-QNZzJ2wMrTmCdeobMuMNEXHN1QGk8HG6louEkzD/zwQ7EU2RarrzlhQ4GnUYEFzLhK+Jq7IGyF/qy+XYBSO7AQ==
dependencies:
in-publish "^2.0.0"
semver "^5.3.0"
source-map "^0.5.6"
source-map "^0.7.3"
loader-runner@^2.4.0:
version "2.4.0"
@ -25595,17 +25596,6 @@ stackframe@^1.1.0, stackframe@^1.1.1:
resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.1.1.tgz#ffef0a3318b1b60c3b58564989aca5660729ec71"
integrity sha512-0PlYhdKh6AfFxRyK/v+6/k+/mMfyiEBbTM5L94D0ZytQnJ166wuwoTYLHFWGbs2dpA8Rgq763KGWmN1EQEYHRQ==
stackman@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/stackman/-/stackman-4.0.1.tgz#b5709446f078db9b9dadbb317f296224d9a35b5b"
integrity sha512-lntIge3BFEElgvpZT2ld5f4U+mF84fRtJ8vA3ymUVx1euVx43ZMkd09+5RWW4FmvYDFhZwPh1gvtdsdnJyF4Fg==
dependencies:
after-all-results "^2.0.0"
async-cache "^1.1.0"
debug "^4.1.1"
error-callsites "^2.0.3"
load-source-map "^1.0.0"
stacktrace-gps@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.0.3.tgz#b89f84cc13bb925b96607e737b617c8715facf57"