-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into split-types-from-code-on-kbn-ace
- Loading branch information
Showing
350 changed files
with
3,845 additions
and
553 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,208 @@ | ||
| # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. | ||
| # yarn lockfile v1 | ||
|
|
||
|
|
||
| "@octokit/auth-token@^2.4.4": | ||
| version "2.4.4" | ||
| resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.4.tgz#ee31c69b01d0378c12fd3ffe406030f3d94d3b56" | ||
| integrity sha512-LNfGu3Ro9uFAYh10MUZVaT7X2CnNm2C8IDQmabx+3DygYIQjs9FwzFAHN/0t6mu5HEPhxcb1XOuxdpY82vCg2Q== | ||
| dependencies: | ||
| "@octokit/types" "^6.0.0" | ||
|
|
||
| "@octokit/core@^3.5.1": | ||
| version "3.5.1" | ||
| resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.5.1.tgz#8601ceeb1ec0e1b1b8217b960a413ed8e947809b" | ||
| integrity sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw== | ||
| dependencies: | ||
| "@octokit/auth-token" "^2.4.4" | ||
| "@octokit/graphql" "^4.5.8" | ||
| "@octokit/request" "^5.6.0" | ||
| "@octokit/request-error" "^2.0.5" | ||
| "@octokit/types" "^6.0.3" | ||
| before-after-hook "^2.2.0" | ||
| universal-user-agent "^6.0.0" | ||
|
|
||
| "@octokit/endpoint@^6.0.1": | ||
| version "6.0.6" | ||
| resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.6.tgz#4f09f2b468976b444742a1d5069f6fa45826d999" | ||
| integrity sha512-7Cc8olaCoL/mtquB7j/HTbPM+sY6Ebr4k2X2y4JoXpVKQ7r5xB4iGQE0IoO58wIPsUk4AzoT65AMEpymSbWTgQ== | ||
| dependencies: | ||
| "@octokit/types" "^5.0.0" | ||
| is-plain-object "^5.0.0" | ||
| universal-user-agent "^6.0.0" | ||
|
|
||
| "@octokit/graphql@^4.5.8": | ||
| version "4.5.8" | ||
| resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.8.tgz#d42373633c3015d0eafce64a8ce196be167fdd9b" | ||
| integrity sha512-WnCtNXWOrupfPJgXe+vSmprZJUr0VIu14G58PMlkWGj3cH+KLZEfKMmbUQ6C3Wwx6fdhzVW1CD5RTnBdUHxhhA== | ||
| dependencies: | ||
| "@octokit/request" "^5.3.0" | ||
| "@octokit/types" "^6.0.0" | ||
| universal-user-agent "^6.0.0" | ||
|
|
||
| "@octokit/openapi-types@^11.2.0": | ||
| version "11.2.0" | ||
| resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-11.2.0.tgz#b38d7fc3736d52a1e96b230c1ccd4a58a2f400a6" | ||
| integrity sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA== | ||
|
|
||
| "@octokit/openapi-types@^2.2.0": | ||
| version "2.2.0" | ||
| resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-2.2.0.tgz#123e0438a0bc718ccdac3b5a2e69b3dd00daa85b" | ||
| integrity sha512-274lNUDonw10kT8wHg8fCcUc1ZjZHbWv0/TbAwb0ojhBQqZYc1cQ/4yqTVTtPMDeZ//g7xVEYe/s3vURkRghPg== | ||
|
|
||
| "@octokit/plugin-paginate-rest@^2.16.8": | ||
| version "2.17.0" | ||
| resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz#32e9c7cab2a374421d3d0de239102287d791bce7" | ||
| integrity sha512-tzMbrbnam2Mt4AhuyCHvpRkS0oZ5MvwwcQPYGtMv4tUa5kkzG58SVB0fcsLulOZQeRnOgdkZWkRUiyBlh0Bkyw== | ||
| dependencies: | ||
| "@octokit/types" "^6.34.0" | ||
|
|
||
| "@octokit/plugin-request-log@^1.0.4": | ||
| version "1.0.4" | ||
| resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85" | ||
| integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA== | ||
|
|
||
| "@octokit/plugin-rest-endpoint-methods@^5.12.0": | ||
| version "5.13.0" | ||
| resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.13.0.tgz#8c46109021a3412233f6f50d28786f8e552427ba" | ||
| integrity sha512-uJjMTkN1KaOIgNtUPMtIXDOjx6dGYysdIFhgA52x4xSadQCz3b/zJexvITDVpANnfKPW/+E0xkOvLntqMYpviA== | ||
| dependencies: | ||
| "@octokit/types" "^6.34.0" | ||
| deprecation "^2.3.1" | ||
|
|
||
| "@octokit/request-error@^2.0.0": | ||
| version "2.0.2" | ||
| resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.2.tgz#0e76b83f5d8fdda1db99027ea5f617c2e6ba9ed0" | ||
| integrity sha512-2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw== | ||
| dependencies: | ||
| "@octokit/types" "^5.0.1" | ||
| deprecation "^2.0.0" | ||
| once "^1.4.0" | ||
|
|
||
| "@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0": | ||
| version "2.1.0" | ||
| resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677" | ||
| integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg== | ||
| dependencies: | ||
| "@octokit/types" "^6.0.3" | ||
| deprecation "^2.0.0" | ||
| once "^1.4.0" | ||
|
|
||
| "@octokit/request@^5.3.0": | ||
| version "5.4.12" | ||
| resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.12.tgz#b04826fa934670c56b135a81447be2c1723a2ffc" | ||
| integrity sha512-MvWYdxengUWTGFpfpefBBpVmmEYfkwMoxonIB3sUGp5rhdgwjXL1ejo6JbgzG/QD9B/NYt/9cJX1pxXeSIUCkg== | ||
| dependencies: | ||
| "@octokit/endpoint" "^6.0.1" | ||
| "@octokit/request-error" "^2.0.0" | ||
| "@octokit/types" "^6.0.3" | ||
| deprecation "^2.0.0" | ||
| is-plain-object "^5.0.0" | ||
| node-fetch "^2.6.1" | ||
| once "^1.4.0" | ||
| universal-user-agent "^6.0.0" | ||
|
|
||
| "@octokit/request@^5.6.0": | ||
| version "5.6.2" | ||
| resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.2.tgz#1aa74d5da7b9e04ac60ef232edd9a7438dcf32d8" | ||
| integrity sha512-je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA== | ||
| dependencies: | ||
| "@octokit/endpoint" "^6.0.1" | ||
| "@octokit/request-error" "^2.1.0" | ||
| "@octokit/types" "^6.16.1" | ||
| is-plain-object "^5.0.0" | ||
| node-fetch "^2.6.1" | ||
| universal-user-agent "^6.0.0" | ||
|
|
||
| "@octokit/rest@^18.10.0": | ||
| version "18.12.0" | ||
| resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.12.0.tgz#f06bc4952fc87130308d810ca9d00e79f6988881" | ||
| integrity sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q== | ||
| dependencies: | ||
| "@octokit/core" "^3.5.1" | ||
| "@octokit/plugin-paginate-rest" "^2.16.8" | ||
| "@octokit/plugin-request-log" "^1.0.4" | ||
| "@octokit/plugin-rest-endpoint-methods" "^5.12.0" | ||
|
|
||
| "@octokit/types@^5.0.0", "@octokit/types@^5.0.1": | ||
| version "5.5.0" | ||
| resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.5.0.tgz#e5f06e8db21246ca102aa28444cdb13ae17a139b" | ||
| integrity sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ== | ||
| dependencies: | ||
| "@types/node" ">= 8" | ||
|
|
||
| "@octokit/types@^6.0.0", "@octokit/types@^6.0.3": | ||
| version "6.2.1" | ||
| resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.2.1.tgz#7f881fe44475ab1825776a4a59ca1ae082ed1043" | ||
| integrity sha512-jHs9OECOiZxuEzxMZcXmqrEO8GYraHF+UzNVH2ACYh8e/Y7YoT+hUf9ldvVd6zIvWv4p3NdxbQ0xx3ku5BnSiA== | ||
| dependencies: | ||
| "@octokit/openapi-types" "^2.2.0" | ||
| "@types/node" ">= 8" | ||
|
|
||
| "@octokit/types@^6.16.1", "@octokit/types@^6.34.0": | ||
| version "6.34.0" | ||
| resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.34.0.tgz#c6021333334d1ecfb5d370a8798162ddf1ae8218" | ||
| integrity sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw== | ||
| dependencies: | ||
| "@octokit/openapi-types" "^11.2.0" | ||
|
|
||
| "@types/node@>= 8": | ||
| version "16.10.2" | ||
| resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.2.tgz#5764ca9aa94470adb4e1185fe2e9f19458992b2e" | ||
| integrity sha512-zCclL4/rx+W5SQTzFs9wyvvyCwoK9QtBpratqz2IYJ3O8Umrn0m3nsTv0wQBk9sRGpvUe9CwPDrQFB10f1FIjQ== | ||
|
|
||
| axios@^0.21.4: | ||
| version "0.21.4" | ||
| resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" | ||
| integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== | ||
| dependencies: | ||
| follow-redirects "^1.14.0" | ||
|
|
||
| before-after-hook@^2.2.0: | ||
| version "2.2.2" | ||
| resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e" | ||
| integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ== | ||
|
|
||
| deprecation@^2.0.0, deprecation@^2.3.1: | ||
| version "2.3.1" | ||
| resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" | ||
| integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== | ||
|
|
||
| follow-redirects@^1.14.0: | ||
| version "1.14.4" | ||
| resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379" | ||
| integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g== | ||
|
|
||
| is-plain-object@^5.0.0: | ||
| version "5.0.0" | ||
| resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" | ||
| integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== | ||
|
|
||
| kibana-buildkite-library@elastic/kibana-buildkite-library: | ||
| version "1.0.0" | ||
| resolved "https://codeload.github.com/elastic/kibana-buildkite-library/tar.gz/ee34f75c00712b639124cbef60f68132fa662643" | ||
| dependencies: | ||
| "@octokit/rest" "^18.10.0" | ||
| axios "^0.21.4" | ||
|
|
||
| node-fetch@^2.6.1: | ||
| version "2.6.1" | ||
| resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" | ||
| integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== | ||
|
|
||
| once@^1.4.0: | ||
| version "1.4.0" | ||
| resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" | ||
| integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= | ||
| dependencies: | ||
| wrappy "1" | ||
|
|
||
| universal-user-agent@^6.0.0: | ||
| version "6.0.0" | ||
| resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee" | ||
| integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w== | ||
|
|
||
| wrappy@1: | ||
| version "1.0.2" | ||
| resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" | ||
| integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
packages/kbn-apm-config-loader/src/rum_agent_configuration.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
| import { shouldInstrumentClient } from './rum_agent_configuration'; | ||
| describe('shouldInstrumentClient', () => { | ||
| it('returns false if apm is disabled', () => { | ||
| expect(shouldInstrumentClient({ active: false })).toBe(false); | ||
| }); | ||
|
|
||
| it('returns false if apm is enabled with contextPropagationOnly: true', () => { | ||
| expect(shouldInstrumentClient({ active: true, contextPropagationOnly: true })).toBe(false); | ||
| }); | ||
|
|
||
| it('returns false if apm is enabled with disableSend: true', () => { | ||
| expect(shouldInstrumentClient({ active: true, disableSend: true })).toBe(false); | ||
| }); | ||
|
|
||
| it('returns true if apm is enabled', () => { | ||
| expect(shouldInstrumentClient({ active: true })).toBe(true); | ||
| expect(shouldInstrumentClient({ active: true, contextPropagationOnly: false })).toBe(true); | ||
| expect(shouldInstrumentClient({ active: true, disableSend: false })).toBe(true); | ||
| }); | ||
| }); |
14 changes: 14 additions & 0 deletions
14
packages/kbn-apm-config-loader/src/rum_agent_configuration.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
| import type { AgentConfigOptions } from 'elastic-apm-node'; | ||
|
|
||
| export function shouldInstrumentClient(config?: AgentConfigOptions): boolean { | ||
| return Boolean( | ||
| config?.active === true && config.contextPropagationOnly !== true && config.disableSend !== true | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.