Skip to content

Commit 9061b79

Browse files
bobbrowbobbrow
authored
Update to the latest telemetry API (#12367)
1 parent cf35bbc commit 9061b79

File tree

4 files changed

+218
-43
lines changed

4 files changed

+218
-43
lines changed

‎Extension/ThirdPartyNotices.txt‎

Lines changed: 124 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -762,11 +762,12 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
762762

763763
---------------------------------------------------------
764764

765-
@microsoft/applicationinsights-core-js 2.8.18 - MIT
765+
@microsoft/applicationinsights-channel-js 3.2.2 - MIT
766766
https://github.com/microsoft/ApplicationInsights-JS#readme
767767

768768
Copyright (c) Microsoft Corporation
769769
Copyright (c) Microsoft and contributors
770+
Copyright (c) NevWare21 and contributors
770771

771772
The MIT License (MIT)
772773

@@ -795,11 +796,12 @@ SOFTWARE.
795796

796797
---------------------------------------------------------
797798

798-
@microsoft/applicationinsights-shims 2.0.2 - MIT
799-
https://github.com/microsoft/ApplicationInsights-JS/tree/master/tools/shims
799+
@microsoft/applicationinsights-common 3.2.2 - MIT
800+
https://github.com/microsoft/ApplicationInsights-JS#readme
800801

801802
Copyright (c) Microsoft Corporation
802803
Copyright (c) Microsoft and contributors
804+
Copyright (c) NevWare21 and contributors
803805

804806
The MIT License (MIT)
805807

@@ -828,8 +830,42 @@ SOFTWARE.
828830

829831
---------------------------------------------------------
830832

831-
@microsoft/dynamicproto-js 1.1.11 - MIT
832-
https://github.com/microsoft/DynamicProto-JS#readme
833+
@microsoft/applicationinsights-core-js 3.2.2 - MIT
834+
https://github.com/microsoft/ApplicationInsights-JS#readme
835+
836+
Copyright (c) Microsoft Corporation
837+
Copyright (c) Microsoft and contributors
838+
Copyright (c) NevWare21 and contributors
839+
840+
The MIT License (MIT)
841+
842+
Copyright (c) Microsoft Corporation
843+
844+
Permission is hereby granted, free of charge, to any person obtaining a copy
845+
of this software and associated documentation files (the "Software"), to deal
846+
in the Software without restriction, including without limitation the rights
847+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
848+
copies of the Software, and to permit persons to whom the Software is
849+
furnished to do so, subject to the following conditions:
850+
851+
The above copyright notice and this permission notice shall be included in all
852+
copies or substantial portions of the Software.
853+
854+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
855+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
856+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
857+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
858+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
859+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
860+
SOFTWARE.
861+
862+
863+
---------------------------------------------------------
864+
865+
---------------------------------------------------------
866+
867+
@microsoft/applicationinsights-shims 3.0.1 - MIT
868+
https://github.com/microsoft/ApplicationInsights-JS/tree/main/tools/shims
833869

834870
Copyright (c) Microsoft Corporation
835871
Copyright (c) Microsoft and contributors
@@ -857,6 +893,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
857893
SOFTWARE.
858894

859895

896+
---------------------------------------------------------
897+
898+
---------------------------------------------------------
899+
900+
@microsoft/dynamicproto-js 2.0.3 - MIT
901+
https://github.com/microsoft/DynamicProto-JS#readme
902+
903+
Copyright (c) 2022 Nevware21
904+
Copyright (c) Microsoft Corporation
905+
Copyright (c) Microsoft and contributors
906+
860907
The MIT License (MIT)
861908

862909
Copyright (c) Microsoft Corporation
@@ -880,6 +927,77 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
880927
SOFTWARE.
881928

882929

930+
---------------------------------------------------------
931+
932+
---------------------------------------------------------
933+
934+
@nevware21/ts-async 0.5.1 - MIT
935+
https://github.com/nevware21/ts-async
936+
937+
Copyright (c) 2022 Nevware21
938+
Copyright (c) 2023 Nevware21
939+
Copyright (c) 2024 Nevware21
940+
Copyright (c) NevWare21 and contributors
941+
942+
MIT License
943+
944+
Copyright (c) 2022 Nevware21
945+
946+
Permission is hereby granted, free of charge, to any person obtaining a copy
947+
of this software and associated documentation files (the "Software"), to deal
948+
in the Software without restriction, including without limitation the rights
949+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
950+
copies of the Software, and to permit persons to whom the Software is
951+
furnished to do so, subject to the following conditions:
952+
953+
The above copyright notice and this permission notice shall be included in all
954+
copies or substantial portions of the Software.
955+
956+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
957+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
958+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
959+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
960+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
961+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
962+
SOFTWARE.
963+
964+
965+
---------------------------------------------------------
966+
967+
---------------------------------------------------------
968+
969+
@nevware21/ts-utils 0.11.2 - MIT
970+
https://github.com/nevware21/ts-utils
971+
972+
Copyright (c) 2022 NevWare21
973+
Copyright (c) 2022 Nevware21
974+
Copyright (c) 2023 Nevware21
975+
Copyright (c) 2024 Nevware21
976+
Copyright (c) NevWare21 and contributors
977+
978+
MIT License
979+
980+
Copyright (c) 2022 NevWare21
981+
982+
Permission is hereby granted, free of charge, to any person obtaining a copy
983+
of this software and associated documentation files (the "Software"), to deal
984+
in the Software without restriction, including without limitation the rights
985+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
986+
copies of the Software, and to permit persons to whom the Software is
987+
furnished to do so, subject to the following conditions:
988+
989+
The above copyright notice and this permission notice shall be included in all
990+
copies or substantial portions of the Software.
991+
992+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
993+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
994+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
995+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
996+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
997+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
998+
SOFTWARE.
999+
1000+
8831001
---------------------------------------------------------
8841002

8851003
---------------------------------------------------------
@@ -916,11 +1034,10 @@ SOFTWARE.
9161034

9171035
---------------------------------------------------------
9181036

919-
@vscode/extension-telemetry 0.6.2 - MIT
1037+
@vscode/extension-telemetry 0.9.6 - MIT
9201038
https://github.com/Microsoft/vscode-extension-telemetry#readme
9211039

9221040
Copyright (c) Microsoft Corporation
923-
Copyright (c) Microsoft and contributors
9241041

9251042
vscode-extension-telemetry
9261043

‎Extension/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6525,7 +6525,7 @@
65256525
"xml2js": "^0.6.2"
65266526
},
65276527
"dependencies": {
6528-
"@vscode/extension-telemetry": "^0.6.2",
6528+
"@vscode/extension-telemetry": "^0.9.6",
65296529
"chokidar": "^3.6.0",
65306530
"comment-json": "^4.2.3",
65316531
"editorconfig": "^2.0.0",

‎Extension/src/telemetry.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export function activate(): void {
6666
const packageInfo: IPackageInfo = getPackageInfo();
6767
if (packageInfo) {
6868
const targetPopulation: TargetPopulation = util.getCppToolsTargetPopulation();
69-
experimentationTelemetry = new ExperimentationTelemetry(new TelemetryReporter(packageInfo.name, packageInfo.version, appInsightsKey));
69+
experimentationTelemetry = new ExperimentationTelemetry(new TelemetryReporter(appInsightsKey));
7070
initializationPromise = getExperimentationServiceAsync(packageInfo.name, packageInfo.version, targetPopulation, experimentationTelemetry, util.extensionContext.globalState);
7171
}
7272
}

‎Extension/yarn.lock‎

Lines changed: 92 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -156,41 +156,98 @@
156156
"@jridgewell/resolve-uri" "^3.1.0"
157157
"@jridgewell/sourcemap-codec" "^1.4.14"
158158

159-
"@microsoft/1ds-core-js@3.2.18", "@microsoft/1ds-core-js@^3.2.3":
160-
version "3.2.18"
161-
resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.18.tgz#2be0dd31df0d9001a60b45eb263886fab145613b"
162-
integrity sha512-ytlFv3dfb8OGqvbZP8tSIlNvn3QNYxdsF0k6ikRMWSr6CmBxBi1sliaxc2Q5KuYOuaeWkd8WRm25Rx/UtHcyMg==
159+
"@microsoft/1ds-core-js@4.2.2", "@microsoft/1ds-core-js@^4.1.2":
160+
version "4.2.2"
161+
resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-4.2.2.tgz#7681f6a369e391abb2d72a96c4a60721b124b2de"
162+
integrity sha512-4c1AXzOj7ZyX7/97v8fEDYcQ8ymTTmj+j9HYYlcO0/cUbDzZGA7/xzb34chvvAbV60qDEbX0Ha/ea7wzgefORg==
163163
dependencies:
164-
"@microsoft/applicationinsights-core-js" "2.8.18"
165-
"@microsoft/applicationinsights-shims" "^2.0.2"
166-
"@microsoft/dynamicproto-js" "^1.1.11"
164+
"@microsoft/applicationinsights-core-js" "3.2.2"
165+
"@microsoft/applicationinsights-shims" "3.0.1"
166+
"@microsoft/dynamicproto-js" "^2.0.3"
167+
"@nevware21/ts-async" ">= 0.5.1 < 2.x"
168+
"@nevware21/ts-utils" ">= 0.11.1 < 2.x"
167169

168-
"@microsoft/1ds-post-js@^3.2.3":
169-
version "3.2.18"
170-
resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.18.tgz#efbb445f486d9f92e10ff30564a6c5060aa53909"
171-
integrity sha512-Tzjcja4SMyws3UP58kD2edFPNb7BJtx5uCgwf/PWXwDyfbUY1/crsTQdEyR98wy/vorvLDZdQlcL++VMChfYnQ==
170+
"@microsoft/1ds-post-js@^4.1.2":
171+
version "4.2.2"
172+
resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-4.2.2.tgz#8b5a96f9a8bbdc9fc92ee7da5152b205832f9804"
173+
integrity sha512-0k1aSxD03r3ugLaYhI8Y8AonI/whOzSQd66XBYURVTs6uheMMxDQdSnAk/4Dwn/TUK3TCEJZBIwZRVpUJtJX9w==
174+
dependencies:
175+
"@microsoft/1ds-core-js" "4.2.2"
176+
"@microsoft/applicationinsights-shims" "3.0.1"
177+
"@microsoft/dynamicproto-js" "^2.0.3"
178+
"@nevware21/ts-async" ">= 0.5.1 < 2.x"
179+
"@nevware21/ts-utils" ">= 0.11.1 < 2.x"
180+
181+
"@microsoft/applicationinsights-channel-js@3.2.2":
182+
version "3.2.2"
183+
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.2.2.tgz#68c58a2498158abc452ca153962547062b9c9cf7"
184+
integrity sha512-4ruoKxgZYYa+K8JJu8RMY0egKazS8xClbx70NQHa/rJ7JYFgN3OIEIBZtFoMcHR8Vg7MEsNE5/wV6o7WWJkVIA==
185+
dependencies:
186+
"@microsoft/applicationinsights-common" "3.2.2"
187+
"@microsoft/applicationinsights-core-js" "3.2.2"
188+
"@microsoft/applicationinsights-shims" "3.0.1"
189+
"@microsoft/dynamicproto-js" "^2.0.3"
190+
"@nevware21/ts-async" ">= 0.5.1 < 2.x"
191+
"@nevware21/ts-utils" ">= 0.11.1 < 2.x"
192+
193+
"@microsoft/applicationinsights-common@3.2.2":
194+
version "3.2.2"
195+
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-common/-/applicationinsights-common-3.2.2.tgz#86c353256fbac7297b3ba07e7c9cd56d4ebecccd"
196+
integrity sha512-e1C35gdkFSzWyUUR1S8FvisXW3nT3p6wWsLNs+vUKLOTQzsvW3XpNMVtNCq4MfHWiYDuz1lPSzo2eENaij1fVA==
197+
dependencies:
198+
"@microsoft/applicationinsights-core-js" "3.2.2"
199+
"@microsoft/applicationinsights-shims" "3.0.1"
200+
"@microsoft/dynamicproto-js" "^2.0.3"
201+
"@nevware21/ts-utils" ">= 0.11.1 < 2.x"
202+
203+
"@microsoft/applicationinsights-core-js@3.2.2":
204+
version "3.2.2"
205+
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.2.2.tgz#28e22bb5d26a021160b65467efd5711fbd9f82bf"
206+
integrity sha512-dF6LZ4ahdhoHufw+N7OXRDzWT8QN193Dvpd8GLqEZdR/KtCTofPSI63yumu+ZkzKYadf1S3w2xg0OmbdyXexoQ==
207+
dependencies:
208+
"@microsoft/applicationinsights-shims" "3.0.1"
209+
"@microsoft/dynamicproto-js" "^2.0.3"
210+
"@nevware21/ts-async" ">= 0.5.1 < 2.x"
211+
"@nevware21/ts-utils" ">= 0.11.1 < 2.x"
212+
213+
"@microsoft/applicationinsights-shims@3.0.1":
214+
version "3.0.1"
215+
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz#3865b73ace8405b9c4618cc5c571f2fe3876f06f"
216+
integrity sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==
172217
dependencies:
173-
"@microsoft/1ds-core-js" "3.2.18"
174-
"@microsoft/applicationinsights-shims" "^2.0.2"
175-
"@microsoft/dynamicproto-js" "^1.1.11"
218+
"@nevware21/ts-utils" ">= 0.9.4 < 2.x"
176219

177-
"@microsoft/applicationinsights-core-js@2.8.18":
178-
version "2.8.18"
179-
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.18.tgz#b3ce9e834f4a09aceb82465e2410851461f5f68a"
180-
integrity sha512-yPHRZFLpnEO0uSgFPM1BLMRRwjoten9YBbn4pJRbCT4PigLnj748knmWsMwXIdcehtkRTYz78kPYa/LWP7nvmA==
220+
"@microsoft/applicationinsights-web-basic@^3.1.2":
221+
version "3.2.2"
222+
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.2.2.tgz#d91bbf9002df4fac2ee543b481a0cbd58ed3975c"
223+
integrity sha512-4OdgTurRr/Awm2DcWuAhidFON2UFiirabeO9SSAeTefDCdtzv5fWzntq9zvdV47c+w6WzZkz8nX/bQTgNRb2+w==
181224
dependencies:
182-
"@microsoft/applicationinsights-shims" "2.0.2"
183-
"@microsoft/dynamicproto-js" "^1.1.11"
225+
"@microsoft/applicationinsights-channel-js" "3.2.2"
226+
"@microsoft/applicationinsights-common" "3.2.2"
227+
"@microsoft/applicationinsights-core-js" "3.2.2"
228+
"@microsoft/applicationinsights-shims" "3.0.1"
229+
"@microsoft/dynamicproto-js" "^2.0.3"
230+
"@nevware21/ts-async" ">= 0.5.1 < 2.x"
231+
"@nevware21/ts-utils" ">= 0.11.1 < 2.x"
184232

185-
"@microsoft/applicationinsights-shims@2.0.2", "@microsoft/applicationinsights-shims@^2.0.2":
186-
version "2.0.2"
187-
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.2.tgz#92b36a09375e2d9cb2b4203383b05772be837085"
188-
integrity sha512-PoHEgsnmcqruLNHZ/amACqdJ6YYQpED0KSRe6J7gIJTtpZC1FfFU9b1fmDKDKtFoUSrPzEh1qzO3kmRZP0betg==
233+
"@microsoft/dynamicproto-js@^2.0.3":
234+
version "2.0.3"
235+
resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz#ae2b408061e3ff01a97078429fc768331e239256"
236+
integrity sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==
237+
dependencies:
238+
"@nevware21/ts-utils" ">= 0.10.4 < 2.x"
189239

190-
"@microsoft/dynamicproto-js@^1.1.11":
191-
version "1.1.11"
192-
resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.11.tgz#c737e1a50db9453354729ddaeb2c3b16927ed92e"
193-
integrity sha512-gNw9z9LbqLV+WadZ6/MMrWwO3e0LuoUH1wve/1iPsBNbgqeVCiB0EZFNNj2lysxS2gkqoF9hmyVaG3MoM1BkxA==
240+
"@nevware21/ts-async@>= 0.5.1 < 2.x":
241+
version "0.5.1"
242+
resolved "https://registry.yarnpkg.com/@nevware21/ts-async/-/ts-async-0.5.1.tgz#3f55fa5222b0af5a5bb019f67092cdcd6a5f82e6"
243+
integrity sha512-O2kN8n2HpDWJ7Oji+oTMnhITrCndmrNvrHbGDwAIBydx+FWvLE/vrw4QwnRRMvSCa2AJrcP59Ryklxv30KfkWQ==
244+
dependencies:
245+
"@nevware21/ts-utils" ">= 0.11.2 < 2.x"
246+
247+
"@nevware21/ts-utils@>= 0.10.4 < 2.x", "@nevware21/ts-utils@>= 0.11.1 < 2.x", "@nevware21/ts-utils@>= 0.11.2 < 2.x", "@nevware21/ts-utils@>= 0.9.4 < 2.x":
248+
version "0.11.2"
249+
resolved "https://registry.yarnpkg.com/@nevware21/ts-utils/-/ts-utils-0.11.2.tgz#5836f338c091f47358298da1f77a67a88219a6a5"
250+
integrity sha512-80W8BkS09kkGuUHJX50Fqq+QqAslxUaOQytH+3JhRacXs1EpEt2JOOkYKytqFZAYir3SeH9fahniEaDzIBxlUw==
194251

195252
"@nodelib/fs.scandir@2.1.5":
196253
version "2.1.5"
@@ -554,13 +611,14 @@
554611
minimist "^1.2.8"
555612
prompts "^2.4.2"
556613

557-
"@vscode/extension-telemetry@^0.6.2":
558-
version "0.6.2"
559-
resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.2.tgz#b86814ee680615730da94220c2b03ea9c3c14a8e"
560-
integrity sha512-yb/wxLuaaCRcBAZtDCjNYSisAXz3FWsSqAha5nhHcYxx2ZPdQdWuZqVXGKq0ZpHVndBWWtK6XqtpCN2/HB4S1w==
614+
"@vscode/extension-telemetry@^0.9.6":
615+
version "0.9.6"
616+
resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.9.6.tgz#97041986ddae1ae80d3dec577e4ae107e8122f3f"
617+
integrity sha512-qWK2GNw+b69QRYpjuNM9g3JKToMICoNIdc0rQMtvb4gIG9vKKCZCVCz+ZOx6XM/YlfWAyuPiyxcjIY0xyF+Djg==
561618
dependencies:
562-
"@microsoft/1ds-core-js" "^3.2.3"
563-
"@microsoft/1ds-post-js" "^3.2.3"
619+
"@microsoft/1ds-core-js" "^4.1.2"
620+
"@microsoft/1ds-post-js" "^4.1.2"
621+
"@microsoft/applicationinsights-web-basic" "^3.1.2"
564622

565623
"@vscode/test-electron@^2.3.10":
566624
version "2.4.0"

0 commit comments

Comments
 (0)