Consolidate Elastic APM dependencies (#162686)

This commit is contained in:
Thomas Watson 2023-08-04 11:30:54 +02:00 committed by GitHub
parent bf6dab0921
commit 43364f6655
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 78 additions and 155 deletions

View file

@ -837,7 +837,6 @@
"deep-freeze-strict": "^1.1.1",
"deepmerge": "^4.2.2",
"del": "^6.1.0",
"elastic-apm-http-client": "^11.0.1",
"elastic-apm-node": "^3.48.0",
"email-addresses": "^5.0.0",
"execa": "^4.0.2",
@ -1391,7 +1390,7 @@
"babel-plugin-require-context-hook": "^1.0.0",
"babel-plugin-styled-components": "^2.0.7",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"backport": "^8.9.7",
"backport": "^8.9.8",
"blob-polyfill": "^7.0.20220408",
"callsites": "^3.1.0",
"chance": "1.0.18",

View file

@ -1,83 +0,0 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
// eslint-disable-next-line max-classes-per-file
declare module 'elastic-apm-http-client' {
import EventEmitter from 'events';
class Client extends EventEmitter {
constructor(opts: ClientOptions);
sent: number;
public setExtraMetadata(metadata: import('././intake_v2/metadata').Metadata): void;
public sendSpan(span: import('././intake_v2/span').Span, callback: () => void): void;
public sendTransaction(
transaction: import('././intake_v2/transaction').Transaction,
callback: () => void
): void;
public sendError(error: import('././intake_v2/error').Error, callback: () => void): void;
public flush(opts: FlushOptions, callback: () => void): void;
public destroy(): void;
public _getStats(): ClientStats;
}
interface ClientStats {
numEvents: number;
numEventsDropped: number;
numEventsEnqueued: number;
numEventsSent: number;
slowWriteBatch: number;
backoffReconnectCount: number;
}
interface ClientOptions {
/** (required) The HTTP user agent that your module should identify itself as */
userAgent: string;
/** The Elastic APM intake API secret token */
secretToken?: string;
/** Elastic APM API key */
apiKey?: string;
/** The APM Server URL (default: http://localhost:8200) */
serverUrl: string;
maxQueueSize?: number;
bufferWindowSize?: number;
/** (required) The APM agent name */
agentName: string;
/** (required) The APM agent version */
agentVersion: string;
/** The name of the service being instrumented */
serviceName: string;
/** Unique name of the service being instrumented */
serviceNodeName?: string;
/** The version of the service being instrumented */
serviceVersion?: string;
/** If the service being instrumented is running a specific framework, use this config option to log its name */
frameworkName?: string;
/** If the service being instrumented is running a specific framework, use this config option to log its version */
frameworkVersion?: string;
/** Custom hostname (default: OS hostname) */
hostname?: string;
/** Environment name (default: process.env.NODE_ENV || 'development') */
environment?: string;
/** Docker container id, if not given will be parsed from /proc/self/cgroup */
containerId?: string;
/** Kubernetes node name */
kubernetesNodeName?: string;
/** Kubernetes namespace */
kubernetesNamespace?: string;
/** Kubernetes pod name, if not given will be the hostname */
kubernetesPodName?: string;
/** Kubernetes pod id, if not given will be parsed from /proc/self/cgroup */
kubernetesPodUID?: string;
/** An object of key/value pairs to use to label all data reported (only applied when using APM Server 7.1+) */
globalLabels?: Record<string, string>;
}
class FlushOptions {}
export = Client;
}

147
yarn.lock
View file

@ -6381,16 +6381,16 @@
dependencies:
"@octokit/types" "^6.0.3"
"@octokit/core@^4.0.0":
version "4.0.4"
resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.0.4.tgz#335d9b377691e3264ce57a9e5a1f6cda783e5838"
integrity sha512-sUpR/hc4Gc7K34o60bWC7WUH6Q7T6ftZ2dUmepSyJr9PRF76/qqkWjE2SOEzCqLA5W83SaISymwKtxks+96hPQ==
"@octokit/core@^4.2.1":
version "4.2.4"
resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.2.4.tgz#d8769ec2b43ff37cc3ea89ec4681a20ba58ef907"
integrity sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==
dependencies:
"@octokit/auth-token" "^3.0.0"
"@octokit/graphql" "^5.0.0"
"@octokit/request" "^6.0.0"
"@octokit/request-error" "^3.0.0"
"@octokit/types" "^6.0.3"
"@octokit/types" "^9.0.0"
before-after-hook "^2.2.0"
universal-user-agent "^6.0.0"
@ -6426,10 +6426,10 @@
resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.10.1.tgz#57b5cc6c7b4e55d8642c93d06401fb1af4839899"
integrity sha512-P+SukKanjFY0ZhsK6wSVnQmxTP2eVPPE8OPSNuxaMYtgVzwJZgfGdwlYjf4RlRU4vLEw4ts2fsE2icG4nZ5ddQ==
"@octokit/openapi-types@^13.4.0":
version "13.4.0"
resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-13.4.0.tgz#06fe8fda93bf21bdd397fe7ef8805249efda6c06"
integrity sha512-2mVzW0X1+HDO3jF80/+QFZNzJiTefELKbhMu6yaBYbp/1gSMkVDm4rT472gJljTokWUlXaaE63m7WrWENhMDLw==
"@octokit/openapi-types@^18.0.0":
version "18.0.0"
resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-18.0.0.tgz#f43d765b3c7533fd6fb88f3f25df079c24fccf69"
integrity sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw==
"@octokit/plugin-paginate-rest@^1.1.1":
version "1.1.2"
@ -6438,12 +6438,13 @@
dependencies:
"@octokit/types" "^2.0.1"
"@octokit/plugin-paginate-rest@^4.0.0":
version "4.1.0"
resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-4.1.0.tgz#670ac9ac369448c69a2371bfcd7e2b37d95534f2"
integrity sha512-2O5K5fpajYG5g62wjzHR7/cWYaCA88CextAW3vFP+yoIHD0KEdlVMHfM5/i5LyV+JMmqiYW7w5qfg46FR+McNw==
"@octokit/plugin-paginate-rest@^6.1.2":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.1.2.tgz#f86456a7a1fe9e58fec6385a85cf1b34072341f8"
integrity sha512-qhrmtQeHU/IivxucOV1bbI/xZyC/iOBhclokv7Sut5vnejAIAEXVcGQeRpQlU39E0WwK9lNvJHphHri/DB6lbQ==
dependencies:
"@octokit/types" "^7.1.1"
"@octokit/tsconfig" "^1.0.2"
"@octokit/types" "^9.2.3"
"@octokit/plugin-request-log@^1.0.0", "@octokit/plugin-request-log@^1.0.4":
version "1.0.4"
@ -6458,13 +6459,12 @@
"@octokit/types" "^2.0.1"
deprecation "^2.3.1"
"@octokit/plugin-rest-endpoint-methods@^6.0.0":
version "6.1.1"
resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.1.1.tgz#8c67e5dd3963505bf458ff9f5b0d2bc71d1b2f00"
integrity sha512-u0+4nEVCPL5dsXibKR9qNJU2T0NBnVhmvlPxNjPzt7wp2QfFAbI+dyxIltSP7NOm6KWkXyYG9YLsUKi8D6uohw==
"@octokit/plugin-rest-endpoint-methods@^7.1.2":
version "7.2.3"
resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.2.3.tgz#37a84b171a6cb6658816c82c4082ac3512021797"
integrity sha512-I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA==
dependencies:
"@octokit/types" "6.40.0"
deprecation "^2.3.1"
"@octokit/types" "^10.0.0"
"@octokit/request-error@^1.0.2":
version "1.2.1"
@ -6539,22 +6539,27 @@
once "^1.4.0"
universal-user-agent "^4.0.0"
"@octokit/rest@^19.0.4":
version "19.0.4"
resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.4.tgz#fd8bed1cefffa486e9ae46a9dc608ce81bcfcbdd"
integrity sha512-LwG668+6lE8zlSYOfwPj4FxWdv/qFXYBpv79TWIQEpBLKA9D/IMcWsF/U9RGpA3YqMVDiTxpgVpEW3zTFfPFTA==
"@octokit/rest@^19.0.7":
version "19.0.13"
resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.13.tgz#e799393264edc6d3c67eeda9e5bd7832dcf974e4"
integrity sha512-/EzVox5V9gYGdbAI+ovYj3nXQT1TtTHRT+0eZPcuC05UFSWO3mdO9UY1C0i2eLF9Un1ONJkAk+IEtYGAC+TahA==
dependencies:
"@octokit/core" "^4.0.0"
"@octokit/plugin-paginate-rest" "^4.0.0"
"@octokit/core" "^4.2.1"
"@octokit/plugin-paginate-rest" "^6.1.2"
"@octokit/plugin-request-log" "^1.0.4"
"@octokit/plugin-rest-endpoint-methods" "^6.0.0"
"@octokit/plugin-rest-endpoint-methods" "^7.1.2"
"@octokit/types@6.40.0", "@octokit/types@^6.0.0", "@octokit/types@^6.0.3", "@octokit/types@^6.16.1":
version "6.40.0"
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.40.0.tgz#f2e665196d419e19bb4265603cf904a820505d0e"
integrity sha512-MFZOU5r8SwgJWDMhrLUSvyJPtVsqA6VnbVI3TNbsmw+Jnvrktzvq2fYES/6RiJA/5Ykdwq4mJmtlYUfW7CGjmw==
"@octokit/tsconfig@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@octokit/tsconfig/-/tsconfig-1.0.2.tgz#59b024d6f3c0ed82f00d08ead5b3750469125af7"
integrity sha512-I0vDR0rdtP8p2lGMzvsJzbhdOWy405HcGovrspJ8RRibHnyRgggUSNO5AIox5LmqiwmatHKYsvj6VGFHkqS7lA==
"@octokit/types@^10.0.0":
version "10.0.0"
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-10.0.0.tgz#7ee19c464ea4ada306c43f1a45d444000f419a4a"
integrity sha512-Vm8IddVmhCgU1fxC1eyinpwqzXPEYu0NrYzD3YZjlGjyftdLBTeqNblRC0jmJmgxbJIsQlyogVeGnrNaaMVzIg==
dependencies:
"@octokit/openapi-types" "^12.10.0"
"@octokit/openapi-types" "^18.0.0"
"@octokit/types@^2.0.0", "@octokit/types@^2.0.1":
version "2.16.2"
@ -6570,12 +6575,19 @@
dependencies:
"@types/node" ">= 8"
"@octokit/types@^7.1.1":
version "7.1.1"
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-7.1.1.tgz#a30fd6ca3279d59d532fa75583d65d93b7588e6d"
integrity sha512-Dx6cNTORyVaKY0Yeb9MbHksk79L8GXsihbG6PtWqTpkyA2TY1qBWE26EQXVG3dHwY9Femdd/WEeRUEiD0+H3TQ==
"@octokit/types@^6.0.0", "@octokit/types@^6.0.3", "@octokit/types@^6.16.1":
version "6.40.0"
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.40.0.tgz#f2e665196d419e19bb4265603cf904a820505d0e"
integrity sha512-MFZOU5r8SwgJWDMhrLUSvyJPtVsqA6VnbVI3TNbsmw+Jnvrktzvq2fYES/6RiJA/5Ykdwq4mJmtlYUfW7CGjmw==
dependencies:
"@octokit/openapi-types" "^13.4.0"
"@octokit/openapi-types" "^12.10.0"
"@octokit/types@^9.0.0", "@octokit/types@^9.2.3":
version "9.3.2"
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.3.2.tgz#3f5f89903b69f6a2d196d78ec35f888c0013cac5"
integrity sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==
dependencies:
"@octokit/openapi-types" "^18.0.0"
"@openpgp/web-stream-tools@^0.0.10":
version "0.0.10"
@ -11168,7 +11180,7 @@ axios@^0.27.2:
follow-redirects "^1.14.9"
form-data "^4.0.0"
axios@^1.1.2, axios@^1.4.0:
axios@^1.3.4, axios@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
@ -11395,21 +11407,21 @@ babel-runtime@6.x, babel-runtime@^6.26.0:
core-js "^2.4.0"
regenerator-runtime "^0.11.0"
backport@^8.9.7:
version "8.9.7"
resolved "https://registry.yarnpkg.com/backport/-/backport-8.9.7.tgz#52b4b4f49e57278e171e99568a3a8b1b06649115"
integrity sha512-TNToeh+3QSvlywc1tUu8Hs+7L8ibyj3Y+LC/Ict+Qrb6wNVQMn+8KgNL99l3kcD7ynvin6Q34f6MGJ5c0KhHzQ==
backport@^8.9.8:
version "8.9.8"
resolved "https://registry.yarnpkg.com/backport/-/backport-8.9.8.tgz#020a242370c8617b09a5ac57c1f027d4b7b9eb28"
integrity sha512-CjAf6BTEZCHddxngC7nZSQCE8U3aioyrCCWyT2CjLlAmrQZwnRk1/qb4bA01c6AjIxmYMq0lh4nHfry/adXSNA==
dependencies:
"@octokit/rest" "^19.0.4"
axios "^1.1.2"
"@octokit/rest" "^19.0.7"
axios "^1.3.4"
dedent "^0.7.0"
del "^6.1.1"
dotenv "^16.0.3"
elastic-apm-node "^3.38.0"
elastic-apm-node "3.46.0"
find-up "^5.0.0"
graphql "^16.6.0"
graphql-tag "^2.12.6"
inquirer "^8.2.3"
inquirer "^8.2.5"
lodash "^4.17.21"
make-dir "^3.1.0"
ora "^5.4.1"
@ -11418,7 +11430,7 @@ backport@^8.9.7:
terminal-link "^2.1.1"
utility-types "^3.10.0"
winston "^3.8.2"
yargs "^17.6.0"
yargs "^17.7.1"
yargs-parser "^21.1.1"
bail@^1.0.0:
@ -14696,10 +14708,10 @@ ejs@^3.1.8:
dependencies:
jake "^10.8.5"
elastic-apm-http-client@11.2.0, elastic-apm-http-client@^11.0.1:
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==
elastic-apm-http-client@11.4.0:
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==
dependencies:
agentkeepalive "^4.2.1"
breadth-filter "^2.0.0"
@ -14726,21 +14738,22 @@ elastic-apm-http-client@12.0.0:
semver "^6.3.0"
stream-chopper "^3.0.1"
elastic-apm-node@^3.38.0:
version "3.42.0"
resolved "https://registry.yarnpkg.com/elastic-apm-node/-/elastic-apm-node-3.42.0.tgz#22c11e98708a0df7a7de8c8fb195929b4fc90c00"
integrity sha512-Q9sugfpaw6jQ8xDeP09LlyF0MwE5k0hphQmUiap+qQKE2jrLvY00zk4WierDQ2GF/AguE6BtRZmXpUELDbHFyA==
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==
dependencies:
"@elastic/ecs-pino-format" "^1.2.0"
"@opentelemetry/api" "^1.1.0"
"@opentelemetry/api" "^1.4.1"
"@opentelemetry/core" "^1.11.0"
"@opentelemetry/sdk-metrics" "^1.12.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.5.0"
core-util-is "^1.0.2"
debug "^4.1.1"
elastic-apm-http-client "11.2.0"
elastic-apm-http-client "11.4.0"
end-of-stream "^1.4.4"
error-callsites "^2.0.4"
error-stack-parser "^2.0.6"
@ -14757,9 +14770,8 @@ elastic-apm-node@^3.38.0:
original-url "^1.2.3"
pino "^6.11.2"
relative-microtime "^2.0.0"
resolve "^1.22.1"
require-in-the-middle "^7.0.1"
semver "^6.3.0"
set-cookie-serde "^1.0.0"
shallow-clone-shim "^2.0.0"
source-map "^0.8.0-beta.0"
sql-summary "^1.0.1"
@ -18149,10 +18161,10 @@ inquirer@^7.0.0, inquirer@^7.3.3:
strip-ansi "^6.0.0"
through "^2.3.6"
inquirer@^8.2.3:
version "8.2.4"
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.4.tgz#ddbfe86ca2f67649a67daa6f1051c128f684f0b4"
integrity sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==
inquirer@^8.2.5:
version "8.2.5"
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8"
integrity sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==
dependencies:
ansi-escapes "^4.2.1"
chalk "^4.1.1"
@ -26199,11 +26211,6 @@ set-blocking@^2.0.0:
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
set-cookie-serde@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/set-cookie-serde/-/set-cookie-serde-1.0.0.tgz#bcf9c260ed2212ac4005a53eacbaaa37c07ac452"
integrity sha512-Vq8e5GsupfJ7okHIvEPcfs5neCo7MZ1ZuWrO3sllYi3DOWt6bSSCpADzqXjz3k0fXehnoFIrmmhty9IN6U6BXQ==
set-getter@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.1.tgz#a3110e1b461d31a9cfc8c5c9ee2e9737ad447102"
@ -30259,7 +30266,7 @@ yargs@^15.0.2, yargs@^15.3.1, yargs@^15.4.1:
y18n "^4.0.0"
yargs-parser "^18.1.2"
yargs@^17.2.1, yargs@^17.3.1, yargs@^17.4.0, yargs@^17.6.0, yargs@^17.7.2:
yargs@^17.2.1, yargs@^17.3.1, yargs@^17.4.0, yargs@^17.6.0, yargs@^17.7.1, yargs@^17.7.2:
version "17.7.2"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==