Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLogan Ramos <lramos15@gmail.com>2022-07-07 05:23:30 +0300
committerGitHub <noreply@github.com>2022-07-07 05:23:30 +0300
commitd6114a70bea1c9163c7c3538e31243affd3b9fd4 (patch)
tree48a0cebb8a248ac058406ed9b0c83561b5f44659
parent93d1f7c88157cc4594ff7154b0f2ad6efc4db08c (diff)
Remove app insights (#154296)
* Remove app insights * Update product service to remove asimovKey
-rw-r--r--.eslintrc.json4
-rw-r--r--build/package.json1
-rw-r--r--build/yarn.lock73
-rw-r--r--package.json3
-rw-r--r--remote/package.json2
-rw-r--r--remote/web/package.json1
-rw-r--r--remote/web/yarn.lock63
-rw-r--r--remote/yarn.lock144
-rw-r--r--src/vs/base/common/product.ts2
-rw-r--r--src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts9
-rw-r--r--src/vs/code/node/cliProcessMain.ts10
-rw-r--r--src/vs/platform/telemetry/browser/appInsightsAppender.ts77
-rw-r--r--src/vs/platform/telemetry/common/1dsAppender.ts4
-rw-r--r--src/vs/platform/telemetry/node/1dsAppender.ts2
-rw-r--r--src/vs/platform/telemetry/node/appInsightsAppender.ts121
-rw-r--r--src/vs/platform/telemetry/test/electron-browser/1dsAppender.test.ts (renamed from src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts)25
-rw-r--r--src/vs/server/node/serverServices.ts14
-rw-r--r--src/vs/workbench/contrib/debug/node/telemetryApp.ts4
-rw-r--r--src/vs/workbench/services/telemetry/browser/telemetryService.ts13
-rw-r--r--yarn.lock161
20 files changed, 36 insertions, 697 deletions
diff --git a/.eslintrc.json b/.eslintrc.json
index 7a53aeaad5a..af34ee181a9 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -210,8 +210,7 @@
// - electron-browser
"when": "hasBrowser",
"allow": [
- "vs/css!./**/*",
- "@microsoft/applicationinsights-web"
+ "vs/css!./**/*"
]
},
{
@@ -226,7 +225,6 @@
"@vscode/vscode-languagedetection",
"@vscode/ripgrep",
"@vscode/iconv-lite-umd",
- "applicationinsights",
"assert",
"child_process",
"console",
diff --git a/build/package.json b/build/package.json
index b58f58be433..3b46323c250 100644
--- a/build/package.json
+++ b/build/package.json
@@ -43,7 +43,6 @@
"@typescript-eslint/experimental-utils": "^5.10.0",
"@typescript-eslint/parser": "^5.10.0",
"@vscode/iconv-lite-umd": "0.7.0",
- "applicationinsights": "1.4.2",
"byline": "^5.0.0",
"colors": "^1.4.0",
"commander": "^7.0.0",
diff --git a/build/yarn.lock b/build/yarn.lock
index bb6fcbcb482..4ea17c7f5d4 100644
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -847,16 +847,6 @@ anymatch@^3.0.0, anymatch@^3.1.1, anymatch@~3.1.1:
normalize-path "^3.0.0"
picomatch "^2.0.4"
-applicationinsights@1.4.2:
- version "1.4.2"
- resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.4.2.tgz#2f25f7a3f3e5bf0ab4486b63e42a48a9ec321d52"
- integrity sha512-1wE37G9zEMZTsPJVQ8BDrQtsGgG3DGMActLHwPAF8TYHAXkfqqpeZYCH0XV4lUZ7H4MffRMwN2Ln2nEtUmT8HQ==
- dependencies:
- cls-hooked "^4.2.2"
- continuation-local-storage "^3.2.1"
- diagnostic-channel "0.2.0"
- diagnostic-channel-publishers "^0.3.3"
-
aproba@^1.0.3:
version "1.2.0"
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -909,21 +899,6 @@ assign-symbols@^1.0.0:
resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-async-hook-jl@^1.7.6:
- version "1.7.6"
- resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68"
- integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==
- dependencies:
- stack-chain "^1.3.7"
-
-async-listener@^0.6.0:
- version "0.6.10"
- resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
- integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
- dependencies:
- semver "^5.3.0"
- shimmer "^1.1.0"
-
asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1185,15 +1160,6 @@ cloneable-readable@^1.0.0:
process-nextick-args "^2.0.0"
readable-stream "^2.3.5"
-cls-hooked@^4.2.2:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908"
- integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==
- dependencies:
- async-hook-jl "^1.7.6"
- emitter-listener "^1.0.1"
- semver "^5.4.1"
-
code-point-at@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -1290,14 +1256,6 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-continuation-local-storage@^3.2.1:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
- integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
- dependencies:
- async-listener "^0.6.0"
- emitter-listener "^1.1.1"
-
core-js@^3.6.5:
version "3.15.2"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61"
@@ -1427,18 +1385,6 @@ detect-node@^2.0.4:
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
-diagnostic-channel-publishers@^0.3.3:
- version "0.3.5"
- resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.5.tgz#a84a05fd6cc1d7619fdd17791c17e540119a7536"
- integrity sha512-AOIjw4T7Nxl0G2BoBPhkQ6i7T4bUd9+xvdYizwvG7vVAM1dvr+SDrcUudlmzwH0kbEwdR2V1EcnKT0wAeYLQNQ==
-
-diagnostic-channel@0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz#cc99af9612c23fb1fff13612c72f2cbfaa8d5a17"
- integrity sha1-zJmvlhLCP7H/8TYSxy8sv6qNWhc=
- dependencies:
- semver "^5.3.0"
-
dir-compare@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631"
@@ -1510,13 +1456,6 @@ electron-osx-sign@^0.4.16:
minimist "^1.2.0"
plist "^3.0.1"
-emitter-listener@^1.0.1, emitter-listener@^1.1.1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
- integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
- dependencies:
- shimmer "^1.2.0"
-
emoji-regex@^8.0.0:
version "8.0.0"
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -3011,7 +2950,7 @@ semver-compare@^1.0.0:
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
-semver@^5.1.0, semver@^5.3.0:
+semver@^5.1.0:
version "5.6.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
@@ -3064,11 +3003,6 @@ shebang-regex@^3.0.0:
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-shimmer@^1.1.0, shimmer@^1.2.0:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
- integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
-
side-channel@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -3122,11 +3056,6 @@ sprintf-js@~1.0.2:
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-stack-chain@^1.3.7:
- version "1.3.7"
- resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
- integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=
-
stoppable@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/stoppable/-/stoppable-1.1.0.tgz#32da568e83ea488b08e4d7ea2c3bcc9d75015d5b"
diff --git a/package.json b/package.json
index 5dec1737bc8..a0ed5de58f5 100644
--- a/package.json
+++ b/package.json
@@ -61,14 +61,12 @@
"dependencies": {
"@microsoft/1ds-core-js": "^3.2.2",
"@microsoft/1ds-post-js": "^3.2.2",
- "@microsoft/applicationinsights-web": "^2.8.4",
"@parcel/watcher": "2.0.5",
"@vscode/iconv-lite-umd": "0.7.0",
"@vscode/ripgrep": "^1.14.2",
"@vscode/sqlite3": "5.0.8",
"@vscode/sudo-prompt": "9.3.1",
"@vscode/vscode-languagedetection": "1.0.21",
- "applicationinsights": "1.4.2",
"graceful-fs": "4.2.8",
"http-proxy-agent": "^2.1.0",
"https-proxy-agent": "^2.2.3",
@@ -99,7 +97,6 @@
"devDependencies": {
"7zip": "0.0.6",
"@playwright/test": "1.21.0",
- "@types/applicationinsights": "0.20.0",
"@types/cookie": "^0.3.3",
"@types/copy-webpack-plugin": "^6.0.3",
"@types/cssnano": "^4.0.0",
diff --git a/remote/package.json b/remote/package.json
index 6accf3d3154..8da57bba60b 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -5,12 +5,10 @@
"dependencies": {
"@microsoft/1ds-core-js": "^3.2.2",
"@microsoft/1ds-post-js": "^3.2.2",
- "@microsoft/applicationinsights-web": "^2.8.4",
"@parcel/watcher": "2.0.5",
"@vscode/iconv-lite-umd": "0.7.0",
"@vscode/ripgrep": "^1.14.2",
"@vscode/vscode-languagedetection": "1.0.21",
- "applicationinsights": "1.4.2",
"cookie": "^0.4.0",
"graceful-fs": "4.2.8",
"http-proxy-agent": "^2.1.0",
diff --git a/remote/web/package.json b/remote/web/package.json
index 514de33e21c..c3a32f4d4ec 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -5,7 +5,6 @@
"dependencies": {
"@microsoft/1ds-core-js": "^3.2.2",
"@microsoft/1ds-post-js": "^3.2.2",
- "@microsoft/applicationinsights-web": "^2.8.4",
"@vscode/iconv-lite-umd": "0.7.0",
"@vscode/vscode-languagedetection": "1.0.21",
"jschardet": "3.0.0",
diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
index 275fa0853ef..75a41e50c82 100644
--- a/remote/web/yarn.lock
+++ b/remote/web/yarn.lock
@@ -20,35 +20,6 @@
"@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6"
-"@microsoft/applicationinsights-analytics-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-analytics-js/-/applicationinsights-analytics-js-2.8.4.tgz#3b32d8a2122be5d5993c74ef3217ebbf4876ea69"
- integrity sha512-n/FPs8SS6rB8h+u157fiRh0TwUWKctxGNvr4M+LKeSdgDvf9c759gUeMR7r8xF6kBBfgkbmyaVORjsA1WJsU4g==
- dependencies:
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
-"@microsoft/applicationinsights-channel-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-2.8.4.tgz#6de7210d87e61c72d3a9a06cbaeae14e1b543484"
- integrity sha512-aml49Jya8LxX4tvyBbIvcxSo7UGI0k3HeiJQRFLeO+QlA+Ocsl10PqphU/OYJ4hh/P5/2QhEAq5bBM/b9/PNrg==
- dependencies:
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
-"@microsoft/applicationinsights-common@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-2.8.4.tgz#45b422cf1804df06d5abb2ceda5ed65268a92135"
- integrity sha512-uDvd4zxNGNYFE0TF4h7tAg+eMIPatyd1QdkP8fA4UYwshF4/+UwS1wegjXLEWQRRH87+UAyvx4IKQjobzzEX0A==
- dependencies:
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
"@microsoft/applicationinsights-core-js@2.8.4":
version "2.8.4"
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596"
@@ -57,45 +28,11 @@
"@microsoft/applicationinsights-shims" "2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6"
-"@microsoft/applicationinsights-dependencies-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-dependencies-js/-/applicationinsights-dependencies-js-2.8.4.tgz#b9afbb81fb44aeb3033ecff1d2e4d33d71c1d41c"
- integrity sha512-dr11EBFBR+vmtTipubZv9KSWRXLk6XdutkEgilgzXdSFun0dqR+ZSHEmMWyqE8ZsJtW+1HzdKuGtODSQY6uHyw==
- dependencies:
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
-"@microsoft/applicationinsights-properties-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-properties-js/-/applicationinsights-properties-js-2.8.4.tgz#c52a6ce03b8f99b2110a097b4ef30686dfb433f8"
- integrity sha512-UI0afK5e8yUJ1qIdy+7FA/G9TB+st0++trx4bUMa+Hb6gJggdQPq94lBFJL0yzo4QsgQwozVwkInXy4534tTYQ==
- dependencies:
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
"@microsoft/applicationinsights-shims@2.0.1", "@microsoft/applicationinsights-shims@^2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd"
integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ==
-"@microsoft/applicationinsights-web@^2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web/-/applicationinsights-web-2.8.4.tgz#6b385d385790b9574dad0754b860e656cde470b7"
- integrity sha512-3CtZiM6e5Q0AA+1NE4k8A0+Y0FE1jsK4u0sb4AkvV7b4cwb86I9l7F7fQPU+V/ltkni0g2WtDrMNU93RuxSmNw==
- dependencies:
- "@microsoft/applicationinsights-analytics-js" "2.8.4"
- "@microsoft/applicationinsights-channel-js" "2.8.4"
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-dependencies-js" "2.8.4"
- "@microsoft/applicationinsights-properties-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
"@microsoft/dynamicproto-js@^1.1.6":
version "1.1.6"
resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc"
diff --git a/remote/yarn.lock b/remote/yarn.lock
index 3d2078713be..bc084bb74dc 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -20,35 +20,6 @@
"@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6"
-"@microsoft/applicationinsights-analytics-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-analytics-js/-/applicationinsights-analytics-js-2.8.4.tgz#3b32d8a2122be5d5993c74ef3217ebbf4876ea69"
- integrity sha512-n/FPs8SS6rB8h+u157fiRh0TwUWKctxGNvr4M+LKeSdgDvf9c759gUeMR7r8xF6kBBfgkbmyaVORjsA1WJsU4g==
- dependencies:
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
-"@microsoft/applicationinsights-channel-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-2.8.4.tgz#6de7210d87e61c72d3a9a06cbaeae14e1b543484"
- integrity sha512-aml49Jya8LxX4tvyBbIvcxSo7UGI0k3HeiJQRFLeO+QlA+Ocsl10PqphU/OYJ4hh/P5/2QhEAq5bBM/b9/PNrg==
- dependencies:
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
-"@microsoft/applicationinsights-common@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-2.8.4.tgz#45b422cf1804df06d5abb2ceda5ed65268a92135"
- integrity sha512-uDvd4zxNGNYFE0TF4h7tAg+eMIPatyd1QdkP8fA4UYwshF4/+UwS1wegjXLEWQRRH87+UAyvx4IKQjobzzEX0A==
- dependencies:
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
"@microsoft/applicationinsights-core-js@2.8.4":
version "2.8.4"
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596"
@@ -57,45 +28,11 @@
"@microsoft/applicationinsights-shims" "2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6"
-"@microsoft/applicationinsights-dependencies-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-dependencies-js/-/applicationinsights-dependencies-js-2.8.4.tgz#b9afbb81fb44aeb3033ecff1d2e4d33d71c1d41c"
- integrity sha512-dr11EBFBR+vmtTipubZv9KSWRXLk6XdutkEgilgzXdSFun0dqR+ZSHEmMWyqE8ZsJtW+1HzdKuGtODSQY6uHyw==
- dependencies:
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
-"@microsoft/applicationinsights-properties-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-properties-js/-/applicationinsights-properties-js-2.8.4.tgz#c52a6ce03b8f99b2110a097b4ef30686dfb433f8"
- integrity sha512-UI0afK5e8yUJ1qIdy+7FA/G9TB+st0++trx4bUMa+Hb6gJggdQPq94lBFJL0yzo4QsgQwozVwkInXy4534tTYQ==
- dependencies:
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
"@microsoft/applicationinsights-shims@2.0.1", "@microsoft/applicationinsights-shims@^2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd"
integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ==
-"@microsoft/applicationinsights-web@^2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web/-/applicationinsights-web-2.8.4.tgz#6b385d385790b9574dad0754b860e656cde470b7"
- integrity sha512-3CtZiM6e5Q0AA+1NE4k8A0+Y0FE1jsK4u0sb4AkvV7b4cwb86I9l7F7fQPU+V/ltkni0g2WtDrMNU93RuxSmNw==
- dependencies:
- "@microsoft/applicationinsights-analytics-js" "2.8.4"
- "@microsoft/applicationinsights-channel-js" "2.8.4"
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-dependencies-js" "2.8.4"
- "@microsoft/applicationinsights-properties-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
"@microsoft/dynamicproto-js@^1.1.6":
version "1.1.6"
resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc"
@@ -168,16 +105,6 @@ ansi-regex@^5.0.1:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-applicationinsights@1.4.2:
- version "1.4.2"
- resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.4.2.tgz#2f25f7a3f3e5bf0ab4486b63e42a48a9ec321d52"
- integrity sha512-1wE37G9zEMZTsPJVQ8BDrQtsGgG3DGMActLHwPAF8TYHAXkfqqpeZYCH0XV4lUZ7H4MffRMwN2Ln2nEtUmT8HQ==
- dependencies:
- cls-hooked "^4.2.2"
- continuation-local-storage "^3.2.1"
- diagnostic-channel "0.2.0"
- diagnostic-channel-publishers "^0.3.3"
-
aproba@^1.0.3:
version "1.2.0"
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -191,21 +118,6 @@ are-we-there-yet@~1.1.2:
delegates "^1.0.0"
readable-stream "^2.0.6"
-async-hook-jl@^1.7.6:
- version "1.7.6"
- resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68"
- integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==
- dependencies:
- stack-chain "^1.3.7"
-
-async-listener@^0.6.0:
- version "0.6.10"
- resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
- integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
- dependencies:
- semver "^5.3.0"
- shimmer "^1.1.0"
-
base64-js@^1.3.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -245,15 +157,6 @@ chownr@^1.1.1:
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-cls-hooked@^4.2.2:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908"
- integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==
- dependencies:
- async-hook-jl "^1.7.6"
- emitter-listener "^1.0.1"
- semver "^5.4.1"
-
code-point-at@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -264,14 +167,6 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-continuation-local-storage@^3.2.1:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
- integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
- dependencies:
- async-listener "^0.6.0"
- emitter-listener "^1.1.1"
-
cookie@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
@@ -325,25 +220,6 @@ detect-libc@^2.0.0:
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
-diagnostic-channel-publishers@^0.3.3:
- version "0.3.5"
- resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.5.tgz#a84a05fd6cc1d7619fdd17791c17e540119a7536"
- integrity sha512-AOIjw4T7Nxl0G2BoBPhkQ6i7T4bUd9+xvdYizwvG7vVAM1dvr+SDrcUudlmzwH0kbEwdR2V1EcnKT0wAeYLQNQ==
-
-diagnostic-channel@0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz#cc99af9612c23fb1fff13612c72f2cbfaa8d5a17"
- integrity sha512-awkcaaNNi0RfUGJf7r2+K4oJs1OyiIG2m/Jwvyi0OeQxdw+UU/iwbiejTPa3tUeyXtBcp2fef0JOJNdD62r/zg==
- dependencies:
- semver "^5.3.0"
-
-emitter-listener@^1.0.1, emitter-listener@^1.1.1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
- integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
- dependencies:
- shimmer "^1.2.0"
-
emoji-regex@^8.0.0:
version "8.0.0"
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -706,16 +582,6 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-semver@^5.3.0:
- version "5.6.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
- integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
-semver@^5.4.1:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
- integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
semver@^7.3.5:
version "7.3.5"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
@@ -728,11 +594,6 @@ set-blocking@~2.0.0:
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-shimmer@^1.1.0, shimmer@^1.2.0:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
- integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
-
signal-exit@^3.0.0:
version "3.0.6"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
@@ -783,11 +644,6 @@ spdlog@^0.13.0:
mkdirp "^0.5.5"
nan "^2.14.0"
-stack-chain@^1.3.7:
- version "1.3.7"
- resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
- integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=
-
string-width@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 0e9dcdcba96..1ae8079810e 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -99,9 +99,7 @@ export interface IProductConfiguration {
readonly enableTelemetry?: boolean;
readonly openToWelcomeMainPage?: boolean;
readonly aiConfig?: {
- readonly asimovKey: string;
readonly ariaKey: string;
- readonly preferAria: boolean;
};
readonly sendASmile?: {
diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
index f166be81aeb..9cf505e2470 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -64,7 +64,6 @@ import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetry
import { TelemetryLogAppender } from 'vs/platform/telemetry/common/telemetryLogAppender';
import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
import { supportsTelemetry, ITelemetryAppender, NullAppender, NullTelemetryService, getPiiPathsFromEnvironment } from 'vs/platform/telemetry/common/telemetryUtils';
-import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
import { CustomEndpointTelemetryService } from 'vs/platform/telemetry/node/customEndpointTelemetryService';
import { LocalReconnectConstants, TerminalIpcChannels, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
import { ILocalPtyService } from 'vs/platform/terminal/electron-sandbox/terminal';
@@ -282,16 +281,10 @@ class SharedProcessMain extends Disposable {
const logAppender = new TelemetryLogAppender(loggerService, environmentService);
appenders.push(logAppender);
const { installSourcePath } = environmentService;
- const internalTesting = configurationService.getValue<boolean>('telemetry.internalTesting');
- if (internalTesting && productService.aiConfig?.ariaKey) {
+ if (productService.aiConfig?.ariaKey) {
const collectorAppender = new OneDataSystemWebAppender(configurationService, 'monacoworkbench', null, productService.aiConfig.ariaKey);
this._register(toDisposable(() => collectorAppender.flush())); // Ensure the 1DS appender is disposed so that it flushes remaining data
appenders.push(collectorAppender);
- } else if (productService.aiConfig && productService.aiConfig.asimovKey) {
- // Application Insights
- const appInsightsAppender = new AppInsightsAppender('monacoworkbench', null, productService.aiConfig.asimovKey);
- this._register(toDisposable(() => appInsightsAppender.flush())); // Ensure the AI appender is disposed so that it flushes remaining data
- appenders.push(appInsightsAppender);
}
telemetryService = new TelemetryService({
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index bc4ca25f492..79c5b02e686 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -53,7 +53,7 @@ import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProp
import { ITelemetryService, machineIdKey } from 'vs/platform/telemetry/common/telemetry';
import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
import { supportsTelemetry, NullTelemetryService, getPiiPathsFromEnvironment } from 'vs/platform/telemetry/common/telemetryUtils';
-import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
+import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
import { buildTelemetryMessage } from 'vs/platform/telemetry/node/telemetry';
import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
@@ -104,7 +104,7 @@ class CliMain extends Disposable {
});
}
- private async initServices(): Promise<[IInstantiationService, AppInsightsAppender[]]> {
+ private async initServices(): Promise<[IInstantiationService, OneDataSystemAppender[]]> {
const services = new ServiceCollection();
// Product
@@ -186,10 +186,10 @@ class CliMain extends Disposable {
services.set(ILanguagePackService, new SyncDescriptor(NativeLanguagePackService));
// Telemetry
- const appenders: AppInsightsAppender[] = [];
+ const appenders: OneDataSystemAppender[] = [];
if (supportsTelemetry(productService, environmentService)) {
- if (productService.aiConfig && productService.aiConfig.asimovKey) {
- appenders.push(new AppInsightsAppender('monacoworkbench', null, productService.aiConfig.asimovKey));
+ if (productService.aiConfig && productService.aiConfig.ariaKey) {
+ appenders.push(new OneDataSystemAppender(configurationService, 'monacoworkbench', null, productService.aiConfig.ariaKey));
}
const { installSourcePath } = environmentService;
diff --git a/src/vs/platform/telemetry/browser/appInsightsAppender.ts b/src/vs/platform/telemetry/browser/appInsightsAppender.ts
deleted file mode 100644
index cd4b32c13af..00000000000
--- a/src/vs/platform/telemetry/browser/appInsightsAppender.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import type { ApplicationInsights } from '@microsoft/applicationinsights-web';
-import { ITelemetryAppender, validateTelemetryData } from 'vs/platform/telemetry/common/telemetryUtils';
-
-export class WebAppInsightsAppender implements ITelemetryAppender {
- private _aiClient: ApplicationInsights | undefined;
- private _aiClientLoaded = false;
- private _telemetryCache: { eventName: string; data: any }[] = [];
-
- constructor(private _eventPrefix: string, aiKey: string) {
- const endpointUrl = 'https://vscode.vortex.data.microsoft.com/collect/v1';
- import('@microsoft/applicationinsights-web').then(aiLibrary => {
- this._aiClient = new aiLibrary.ApplicationInsights({
- config: {
- instrumentationKey: aiKey,
- endpointUrl,
- disableAjaxTracking: true,
- disableExceptionTracking: true,
- disableFetchTracking: true,
- disableCorrelationHeaders: true,
- disableCookiesUsage: true,
- autoTrackPageVisitTime: false,
- emitLineDelimitedJson: true,
- },
- });
- this._aiClient.loadAppInsights();
- // Client is loaded we can now flush the cached events
- this._aiClientLoaded = true;
- this._telemetryCache.forEach(cacheEntry => this.log(cacheEntry.eventName, cacheEntry.data));
- this._telemetryCache = [];
-
- // If we cannot access the endpoint this most likely means it's being blocked
- // and we should not attempt to send any telemetry.
- fetch(endpointUrl, { method: 'POST' }).catch(() => (this._aiClient = undefined));
- }).catch(err => {
- console.error(err);
- });
- }
-
- /**
- * Logs a telemetry event with eventName and data
- * @param eventName The event name
- * @param data The data associated with the events
- */
- public log(eventName: string, data: any): void {
- if (!this._aiClient && this._aiClientLoaded) {
- return;
- } else if (!this._aiClient && !this._aiClientLoaded) {
- this._telemetryCache.push({ eventName, data });
- return;
- }
-
- data = validateTelemetryData(data);
-
- // Web does not expect properties and measurements so we must
- // spread them out. This is different from desktop which expects them
- data = { ...data.properties, ...data.measurements };
-
- // undefined assertion is ok since above two if statements cover both cases
- this._aiClient!.trackEvent({ name: this._eventPrefix + '/' + eventName }, data);
- }
-
- /**
- * Flushes all the telemetry data still in the buffer
- */
- public flush(): Promise<any> {
- if (this._aiClient) {
- this._aiClient.flush();
- this._aiClient = undefined;
- }
- return Promise.resolve(undefined);
- }
-}
diff --git a/src/vs/platform/telemetry/common/1dsAppender.ts b/src/vs/platform/telemetry/common/1dsAppender.ts
index 8023931f50f..ba7cac9d693 100644
--- a/src/vs/platform/telemetry/common/1dsAppender.ts
+++ b/src/vs/platform/telemetry/common/1dsAppender.ts
@@ -63,7 +63,7 @@ export abstract class AbstractOneDataSystemAppender implements ITelemetryAppende
protected readonly endPointUrl = endpointUrl;
constructor(
- private readonly _configurationService: IConfigurationService,
+ private readonly _configurationService: IConfigurationService | undefined,
private _eventPrefix: string,
private _defaultData: { [key: string]: any } | null,
iKeyOrClientFactory: string | (() => AppInsightsCore), // allow factory function for testing
@@ -92,7 +92,7 @@ export abstract class AbstractOneDataSystemAppender implements ITelemetryAppende
}
if (!this._asyncAiCore) {
- const isInternal = this._configurationService.getValue<boolean>('telemetry.internalTesting');
+ const isInternal = this._configurationService?.getValue<boolean>('telemetry.internalTesting');
this._asyncAiCore = getClient(this._aiCoreOrKey, isInternal, this._xhrOverride);
}
diff --git a/src/vs/platform/telemetry/node/1dsAppender.ts b/src/vs/platform/telemetry/node/1dsAppender.ts
index 2e7b1b6f491..c7b6442cf7a 100644
--- a/src/vs/platform/telemetry/node/1dsAppender.ts
+++ b/src/vs/platform/telemetry/node/1dsAppender.ts
@@ -13,7 +13,7 @@ import { AbstractOneDataSystemAppender } from 'vs/platform/telemetry/common/1dsA
export class OneDataSystemAppender extends AbstractOneDataSystemAppender {
constructor(
- configurationService: IConfigurationService,
+ configurationService: IConfigurationService | undefined,
eventPrefix: string,
defaultData: { [key: string]: any } | null,
iKeyOrClientFactory: string | (() => AppInsightsCore), // allow factory function for testing
diff --git a/src/vs/platform/telemetry/node/appInsightsAppender.ts b/src/vs/platform/telemetry/node/appInsightsAppender.ts
deleted file mode 100644
index d5fc5987438..00000000000
--- a/src/vs/platform/telemetry/node/appInsightsAppender.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import type { TelemetryClient } from 'applicationinsights';
-import { onUnexpectedError } from 'vs/base/common/errors';
-import { mixin } from 'vs/base/common/objects';
-import { ITelemetryAppender, validateTelemetryData } from 'vs/platform/telemetry/common/telemetryUtils';
-
-async function getClient(aiKey: string): Promise<TelemetryClient> {
- const appInsights = await import('applicationinsights');
- let client: TelemetryClient;
- if (appInsights.defaultClient) {
- client = new appInsights.TelemetryClient(aiKey);
- client.channel.setUseDiskRetryCaching(true);
- } else {
- appInsights.setup(aiKey)
- .setAutoCollectRequests(false)
- .setAutoCollectPerformance(false)
- .setAutoCollectExceptions(false)
- .setAutoCollectDependencies(false)
- .setAutoDependencyCorrelation(false)
- .setAutoCollectConsole(false)
- .setInternalLogging(false, false)
- .setUseDiskRetryCaching(true)
- .start();
- client = appInsights.defaultClient;
- }
-
- if (aiKey.indexOf('AIF-') === 0) {
- client.config.endpointUrl = 'https://mobile.events.data.microsoft.com/collect/v1';
- }
- return client;
-}
-
-
-export class AppInsightsAppender implements ITelemetryAppender {
-
- private _aiClient: string | TelemetryClient | undefined;
- private _asyncAIClient: Promise<TelemetryClient> | null;
-
- constructor(
- private _eventPrefix: string,
- private _defaultData: { [key: string]: any } | null,
- aiKeyOrClientFactory: string | (() => TelemetryClient), // allow factory function for testing
- ) {
- if (!this._defaultData) {
- this._defaultData = Object.create(null);
- }
-
- if (typeof aiKeyOrClientFactory === 'function') {
- this._aiClient = aiKeyOrClientFactory();
- } else {
- this._aiClient = aiKeyOrClientFactory;
- }
- this._asyncAIClient = null;
- }
-
- private _withAIClient(callback: (aiClient: TelemetryClient) => void): void {
- if (!this._aiClient) {
- return;
- }
-
- if (typeof this._aiClient !== 'string') {
- callback(this._aiClient);
- return;
- }
-
- if (!this._asyncAIClient) {
- this._asyncAIClient = getClient(this._aiClient);
- }
-
- this._asyncAIClient.then(
- (aiClient) => {
- callback(aiClient);
- },
- (err) => {
- onUnexpectedError(err);
- console.error(err);
- }
- );
- }
-
- log(eventName: string, data?: any): void {
- if (!this._aiClient) {
- return;
- }
- data = mixin(data, this._defaultData);
- data = validateTelemetryData(data);
-
- // Attemps to suppress https://github.com/microsoft/vscode/issues/140624
- try {
- this._withAIClient((aiClient) => aiClient.trackEvent({
- name: this._eventPrefix + '/' + eventName,
- properties: data.properties,
- measurements: data.measurements
- }));
- } catch { }
- }
-
- flush(): Promise<any> {
- if (this._aiClient) {
- return new Promise(resolve => {
- this._withAIClient((aiClient) => {
- // Attempts to suppress https://github.com/microsoft/vscode/issues/140624
- try {
- aiClient.flush({
- callback: () => {
- // all data flushed
- this._aiClient = undefined;
- resolve(undefined);
- }
- });
- } catch { }
- });
- });
- }
- return Promise.resolve(undefined);
- }
-}
diff --git a/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts b/src/vs/platform/telemetry/test/electron-browser/1dsAppender.test.ts
index 09f1f611da9..3b734414796 100644
--- a/src/vs/platform/telemetry/test/electron-browser/appInsightsAppender.test.ts
+++ b/src/vs/platform/telemetry/test/electron-browser/1dsAppender.test.ts
@@ -2,23 +2,22 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
-import { Contracts, TelemetryClient } from 'applicationinsights';
+import { AppInsightsCore } from '@microsoft/1ds-core-js';
import * as assert from 'assert';
-import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
+import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
-class AppInsightsMock extends TelemetryClient {
+class AppInsightsCoreMock extends AppInsightsCore {
public override config: any;
- public override channel: any;
- public events: Contracts.EventTelemetry[] = [];
+ public events: any[] = [];
public IsTrackingPageView: boolean = false;
public exceptions: any[] = [];
constructor() {
- super('testKey');
+ super();
}
- public override trackEvent(event: any) {
- this.events.push(event);
+ public override track(event: any) {
+ this.events.push(event.baseData);
}
public override flush(options: any): void {
@@ -27,14 +26,14 @@ class AppInsightsMock extends TelemetryClient {
}
suite('AIAdapter', () => {
- let appInsightsMock: AppInsightsMock;
- let adapter: AppInsightsAppender;
+ let appInsightsMock: AppInsightsCoreMock;
+ let adapter: OneDataSystemAppender;
const prefix = 'prefix';
setup(() => {
- appInsightsMock = new AppInsightsMock();
- adapter = new AppInsightsAppender(prefix, undefined!, () => appInsightsMock);
+ appInsightsMock = new AppInsightsCoreMock();
+ adapter = new OneDataSystemAppender(undefined, prefix, undefined!, () => appInsightsMock);
});
teardown(() => {
@@ -49,7 +48,7 @@ suite('AIAdapter', () => {
});
test('addional data', () => {
- adapter = new AppInsightsAppender(prefix, { first: '1st', second: 2, third: true }, () => appInsightsMock);
+ adapter = new OneDataSystemAppender(undefined, prefix, { first: '1st', second: 2, third: true }, () => appInsightsMock);
adapter.log('testEvent');
assert.strictEqual(appInsightsMock.events.length, 1);
diff --git a/src/vs/server/node/serverServices.ts b/src/vs/server/node/serverServices.ts
index 797f29fd9e5..c20bd776c55 100644
--- a/src/vs/server/node/serverServices.ts
+++ b/src/vs/server/node/serverServices.ts
@@ -50,7 +50,6 @@ import { resolveCommonProperties } from 'vs/platform/telemetry/common/commonProp
import { ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
import { ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
import { getPiiPathsFromEnvironment, ITelemetryAppender, NullAppender, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
-import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
import ErrorTelemetry from 'vs/platform/telemetry/node/errorTelemetry';
import { IPtyService, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
import { PtyHostService } from 'vs/platform/terminal/node/ptyHostService';
@@ -73,6 +72,7 @@ import { ExtensionsScannerService } from 'vs/server/node/extensionsScannerServic
import { ExtensionsProfileScannerService, IExtensionsProfileScannerService } from 'vs/platform/extensionManagement/common/extensionsProfileScannerService';
import { IUserDataProfilesService, UserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
import { NullPolicyService } from 'vs/platform/policy/common/policy';
+import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
const eventPrefix = 'monacoworkbench';
@@ -128,16 +128,16 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
// Request
services.set(IRequestService, new SyncDescriptor(RequestService));
- let appInsightsAppender: ITelemetryAppender = NullAppender;
+ let oneDsAppender: ITelemetryAppender = NullAppender;
const machineId = await getMachineId();
if (supportsTelemetry(productService, environmentService)) {
- if (productService.aiConfig && productService.aiConfig.asimovKey) {
- appInsightsAppender = new AppInsightsAppender(eventPrefix, null, productService.aiConfig.asimovKey);
- disposables.add(toDisposable(() => appInsightsAppender!.flush())); // Ensure the AI appender is disposed so that it flushes remaining data
+ if (productService.aiConfig && productService.aiConfig.ariaKey) {
+ oneDsAppender = new OneDataSystemAppender(configurationService, eventPrefix, null, productService.aiConfig.ariaKey);
+ disposables.add(toDisposable(() => oneDsAppender?.flush())); // Ensure the AI appender is disposed so that it flushes remaining data
}
const config: ITelemetryServiceConfig = {
- appenders: [appInsightsAppender],
+ appenders: [oneDsAppender],
commonProperties: resolveCommonProperties(fileService, release(), hostname(), process.arch, productService.commit, productService.version + '-remote', machineId, productService.msftInternalDomains, environmentService.installSourcePath, 'remoteAgent'),
piiPaths: getPiiPathsFromEnvironment(environmentService)
};
@@ -193,7 +193,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
const remoteExtensionEnvironmentChannel = new RemoteAgentEnvironmentChannel(connectionToken, environmentService, userDataProfilesService, extensionManagementCLIService, logService, extensionHostStatusService, extensionsScannerService);
socketServer.registerChannel('remoteextensionsenvironment', remoteExtensionEnvironmentChannel);
- const telemetryChannel = new ServerTelemetryChannel(accessor.get(IServerTelemetryService), appInsightsAppender);
+ const telemetryChannel = new ServerTelemetryChannel(accessor.get(IServerTelemetryService), oneDsAppender);
socketServer.registerChannel('telemetry', telemetryChannel);
socketServer.registerChannel(REMOTE_TERMINAL_CHANNEL_NAME, new RemoteTerminalChannel(environmentService, logService, ptyService, productService, extensionManagementService));
diff --git a/src/vs/workbench/contrib/debug/node/telemetryApp.ts b/src/vs/workbench/contrib/debug/node/telemetryApp.ts
index ab6d37993ca..601ff4f9b1e 100644
--- a/src/vs/workbench/contrib/debug/node/telemetryApp.ts
+++ b/src/vs/workbench/contrib/debug/node/telemetryApp.ts
@@ -4,10 +4,10 @@
*--------------------------------------------------------------------------------------------*/
import { Server } from 'vs/base/parts/ipc/node/ipc.cp';
-import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetryIpc';
+import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
-const appender = new AppInsightsAppender(process.argv[2], JSON.parse(process.argv[3]), process.argv[4]);
+const appender = new OneDataSystemAppender(undefined, process.argv[2], JSON.parse(process.argv[3]), process.argv[4]);
process.once('exit', () => appender.flush());
const channel = new TelemetryAppenderChannel([appender]);
diff --git a/src/vs/workbench/services/telemetry/browser/telemetryService.ts b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
index 75701e1a088..3ad179570b6 100644
--- a/src/vs/workbench/services/telemetry/browser/telemetryService.ts
+++ b/src/vs/workbench/services/telemetry/browser/telemetryService.ts
@@ -11,7 +11,6 @@ import { ILoggerService } from 'vs/platform/log/common/log';
import { IProductService } from 'vs/platform/product/common/productService';
import { IStorageService } from 'vs/platform/storage/common/storage';
import { OneDataSystemWebAppender } from 'vs/platform/telemetry/browser/1dsAppender';
-import { WebAppInsightsAppender } from 'vs/platform/telemetry/browser/appInsightsAppender';
import { ClassifiedEvent, GDPRClassification, StrictPropertyCheck } from 'vs/platform/telemetry/common/gdprTypings';
import { ITelemetryData, ITelemetryInfo, ITelemetryService, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
import { TelemetryLogAppender } from 'vs/platform/telemetry/common/telemetryLogAppender';
@@ -38,17 +37,11 @@ export class TelemetryService extends Disposable implements ITelemetryService {
) {
super();
- if (supportsTelemetry(productService, environmentService) && productService.aiConfig?.asimovKey && productService.aiConfig?.ariaKey) {
+ if (supportsTelemetry(productService, environmentService) && productService.aiConfig?.ariaKey) {
// If remote server is present send telemetry through that, else use the client side appender
- const internalTesting = configurationService.getValue<boolean>('telemetry.internalTesting');
const appenders = [];
- if (internalTesting || productService.aiConfig?.preferAria) {
- const telemetryProvider: ITelemetryAppender = remoteAgentService.getConnection() !== null ? { log: remoteAgentService.logTelemetry.bind(remoteAgentService), flush: remoteAgentService.flushTelemetry.bind(remoteAgentService) } : new OneDataSystemWebAppender(configurationService, 'monacoworkbench', null, productService.aiConfig?.ariaKey);
- appenders.push(telemetryProvider);
- } else {
- const telemetryProvider: ITelemetryAppender = remoteAgentService.getConnection() !== null ? { log: remoteAgentService.logTelemetry.bind(remoteAgentService), flush: remoteAgentService.flushTelemetry.bind(remoteAgentService) } : new WebAppInsightsAppender('monacoworkbench', productService.aiConfig?.asimovKey);
- appenders.push(telemetryProvider);
- }
+ const telemetryProvider: ITelemetryAppender = remoteAgentService.getConnection() !== null ? { log: remoteAgentService.logTelemetry.bind(remoteAgentService), flush: remoteAgentService.flushTelemetry.bind(remoteAgentService) } : new OneDataSystemWebAppender(configurationService, 'monacoworkbench', null, productService.aiConfig?.ariaKey);
+ appenders.push(telemetryProvider);
appenders.push(new TelemetryLogAppender(loggerService, environmentService));
const config: ITelemetryServiceConfig = {
appenders,
diff --git a/yarn.lock b/yarn.lock
index 4189162c56a..9c823e24f88 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -850,35 +850,6 @@
"@microsoft/applicationinsights-shims" "^2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6"
-"@microsoft/applicationinsights-analytics-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-analytics-js/-/applicationinsights-analytics-js-2.8.4.tgz#3b32d8a2122be5d5993c74ef3217ebbf4876ea69"
- integrity sha512-n/FPs8SS6rB8h+u157fiRh0TwUWKctxGNvr4M+LKeSdgDvf9c759gUeMR7r8xF6kBBfgkbmyaVORjsA1WJsU4g==
- dependencies:
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
-"@microsoft/applicationinsights-channel-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-2.8.4.tgz#6de7210d87e61c72d3a9a06cbaeae14e1b543484"
- integrity sha512-aml49Jya8LxX4tvyBbIvcxSo7UGI0k3HeiJQRFLeO+QlA+Ocsl10PqphU/OYJ4hh/P5/2QhEAq5bBM/b9/PNrg==
- dependencies:
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
-"@microsoft/applicationinsights-common@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-2.8.4.tgz#45b422cf1804df06d5abb2ceda5ed65268a92135"
- integrity sha512-uDvd4zxNGNYFE0TF4h7tAg+eMIPatyd1QdkP8fA4UYwshF4/+UwS1wegjXLEWQRRH87+UAyvx4IKQjobzzEX0A==
- dependencies:
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
"@microsoft/applicationinsights-core-js@2.8.3":
version "2.8.3"
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.3.tgz#d07abd6e8bfec7d101518494ad4bd62516df5c51"
@@ -887,53 +858,11 @@
"@microsoft/applicationinsights-shims" "2.0.1"
"@microsoft/dynamicproto-js" "^1.1.6"
-"@microsoft/applicationinsights-core-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596"
- integrity sha512-FoA0FNOsFbJnLyTyQlYs6+HR7HMEa6nAOE6WOm9WVejBHMHQ/Bdb+hfVFi6slxwCimr/ner90jchi4/sIYdnyQ==
- dependencies:
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
-"@microsoft/applicationinsights-dependencies-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-dependencies-js/-/applicationinsights-dependencies-js-2.8.4.tgz#b9afbb81fb44aeb3033ecff1d2e4d33d71c1d41c"
- integrity sha512-dr11EBFBR+vmtTipubZv9KSWRXLk6XdutkEgilgzXdSFun0dqR+ZSHEmMWyqE8ZsJtW+1HzdKuGtODSQY6uHyw==
- dependencies:
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
-"@microsoft/applicationinsights-properties-js@2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-properties-js/-/applicationinsights-properties-js-2.8.4.tgz#c52a6ce03b8f99b2110a097b4ef30686dfb433f8"
- integrity sha512-UI0afK5e8yUJ1qIdy+7FA/G9TB+st0++trx4bUMa+Hb6gJggdQPq94lBFJL0yzo4QsgQwozVwkInXy4534tTYQ==
- dependencies:
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
"@microsoft/applicationinsights-shims@2.0.1", "@microsoft/applicationinsights-shims@^2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd"
integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ==
-"@microsoft/applicationinsights-web@^2.8.4":
- version "2.8.4"
- resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web/-/applicationinsights-web-2.8.4.tgz#6b385d385790b9574dad0754b860e656cde470b7"
- integrity sha512-3CtZiM6e5Q0AA+1NE4k8A0+Y0FE1jsK4u0sb4AkvV7b4cwb86I9l7F7fQPU+V/ltkni0g2WtDrMNU93RuxSmNw==
- dependencies:
- "@microsoft/applicationinsights-analytics-js" "2.8.4"
- "@microsoft/applicationinsights-channel-js" "2.8.4"
- "@microsoft/applicationinsights-common" "2.8.4"
- "@microsoft/applicationinsights-core-js" "2.8.4"
- "@microsoft/applicationinsights-dependencies-js" "2.8.4"
- "@microsoft/applicationinsights-properties-js" "2.8.4"
- "@microsoft/applicationinsights-shims" "2.0.1"
- "@microsoft/dynamicproto-js" "^1.1.6"
-
"@microsoft/dynamicproto-js@^1.1.6":
version "1.1.6"
resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc"
@@ -1191,13 +1120,6 @@
resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
-"@types/applicationinsights@0.20.0":
- version "0.20.0"
- resolved "https://registry.yarnpkg.com/@types/applicationinsights/-/applicationinsights-0.20.0.tgz#fa7b36dc954f635fa9037cad27c378446b1048fb"
- integrity sha512-dQ3Hb58ERe5YNKFVyvU9BrEvpgKeb6Ht9HkCyBvsOZxhx6yKSwF3e+xml3PJQ3JiVOvf6gM/PmE3MdWDl1L6aA==
- dependencies:
- applicationinsights "*"
-
"@types/color-name@^1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -2217,26 +2139,6 @@ append-buffer@^1.0.2:
dependencies:
buffer-equal "^1.0.0"
-applicationinsights@*:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.5.0.tgz#074df9e525dcfd592822e7b80723b9284d2716fd"
- integrity sha512-D+JyPrDx9RWVNIwukoe03ANKNdyVe/ejExbR7xMvZTm09553TzXenW2oPZmfN9jeguKSDugzIWdbILMPNSRRlg==
- dependencies:
- cls-hooked "^4.2.2"
- continuation-local-storage "^3.2.1"
- diagnostic-channel "0.2.0"
- diagnostic-channel-publishers "^0.3.3"
-
-applicationinsights@1.4.2:
- version "1.4.2"
- resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.4.2.tgz#2f25f7a3f3e5bf0ab4486b63e42a48a9ec321d52"
- integrity sha512-1wE37G9zEMZTsPJVQ8BDrQtsGgG3DGMActLHwPAF8TYHAXkfqqpeZYCH0XV4lUZ7H4MffRMwN2Ln2nEtUmT8HQ==
- dependencies:
- cls-hooked "^4.2.2"
- continuation-local-storage "^3.2.1"
- diagnostic-channel "0.2.0"
- diagnostic-channel-publishers "^0.3.3"
-
aproba@^1.0.3, aproba@^1.1.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -2452,21 +2354,6 @@ async-each@^1.0.1:
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
-async-hook-jl@^1.7.6:
- version "1.7.6"
- resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68"
- integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==
- dependencies:
- stack-chain "^1.3.7"
-
-async-listener@^0.6.0:
- version "0.6.10"
- resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
- integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
- dependencies:
- semver "^5.3.0"
- shimmer "^1.1.0"
-
async-settle@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-1.0.0.tgz#1d0a914bb02575bec8a8f3a74e5080f72b2c0c6b"
@@ -3236,15 +3123,6 @@ cloneable-readable@^1.0.0:
process-nextick-args "^2.0.0"
readable-stream "^2.3.5"
-cls-hooked@^4.2.2:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908"
- integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==
- dependencies:
- async-hook-jl "^1.7.6"
- emitter-listener "^1.0.1"
- semver "^5.4.1"
-
co@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -3477,14 +3355,6 @@ content-type@^1.0.4:
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-continuation-local-storage@^3.2.1:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
- integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
- dependencies:
- async-listener "^0.6.0"
- emitter-listener "^1.1.1"
-
convert-source-map@^1.0.0, convert-source-map@^1.5.0, convert-source-map@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
@@ -4147,18 +4017,6 @@ detect-node@^2.0.4:
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
-diagnostic-channel-publishers@^0.3.3:
- version "0.3.3"
- resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.3.tgz#376b7798f4fa90f37eb4f94d2caca611b0e9c330"
- integrity sha512-qIocRYU5TrGUkBlDDxaziAK1+squ8Yf2Ls4HldL3xxb/jzmWO2Enux7CvevNKYmF2kDXZ9HiRqwjPsjk8L+i2Q==
-
-diagnostic-channel@0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz#cc99af9612c23fb1fff13612c72f2cbfaa8d5a17"
- integrity sha1-zJmvlhLCP7H/8TYSxy8sv6qNWhc=
- dependencies:
- semver "^5.3.0"
-
diff-sequences@^27.4.0:
version "27.4.0"
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.4.0.tgz#d783920ad8d06ec718a060d00196dfef25b132a5"
@@ -4357,13 +4215,6 @@ elliptic@^6.5.3:
minimalistic-assert "^1.0.1"
minimalistic-crypto-utils "^1.0.1"
-emitter-listener@^1.0.1, emitter-listener@^1.1.1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
- integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
- dependencies:
- shimmer "^1.2.0"
-
emoji-regex@^7.0.1:
version "7.0.3"
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@@ -10155,7 +10006,7 @@ semver-greatest-satisfied-range@^1.1.0:
dependencies:
sver-compat "^1.5.0"
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
version "5.7.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -10296,11 +10147,6 @@ shell-quote@^1.6.1:
resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
-shimmer@^1.1.0, shimmer@^1.2.0:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
- integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
-
sigmund@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
@@ -10610,11 +10456,6 @@ stable@^0.1.8:
resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
-stack-chain@^1.3.7:
- version "1.3.7"
- resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
- integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=
-
stack-trace@0.0.10:
version "0.0.10"
resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"