Upgrading typescript and vscode-extension-telemetry (#2704)

Upgrading typescript and vscode-extension-telemetry and making changes to support the upgrades
microsoft · Jan 17, 2025 · f5f257c · f5f257c
1 parent 2355757
commit f5f257c
Show file tree

Hide file tree

Showing 16 changed files with 157 additions and 288 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -677,19 +677,18 @@
     },
     "dependencies": {
         "@vscode/codicons": "0.0.36",
+        "@vscode/extension-telemetry":"0.9.4",
         "bufferutil": "4.0.8",
         "lit-html": "^3.2.0",
         "puppeteer-core": "22.12.1",
         "utf-8-validate": "6.0.4",
         "vscode-chrome-debug-core": "6.8.11",
-        "vscode-extension-telemetry": "0.4.1",
         "vscode-webhint": "2.1.15",
         "ws": "8.18.0",
         "xmlhttprequest": "1.8.0"
     },
     "devDependencies": {
         "@opentelemetry/tracing": "0.24.0",
-        "@types/copy-webpack-plugin": "8.0.1",
         "@types/fs-extra": "11.0.4",
         "@types/jest": "29.5.14",
         "@types/node": "22.5.4",
@@ -707,12 +706,11 @@
         "jest": "29.7.0",
         "ts-jest": " 29.2.5",
         "ts-loader": "9.5.1",
-        "typescript": "4.9.4",
+        "typescript": "5.5.2",
         "uglify-js": "3.19.3",
         "unzipper": "0.12.3",
         "jest-environment-jsdom": "^29.7.0",
         "vscode-languageclient": "9.0.1",
-        "vscode-test": "1.6.1",
         "webpack": "5.94.0",
         "webpack-cli": "5.1.4"
     }

diff --git a/src/cdpTargetsProvider.ts b/src/cdpTargetsProvider.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import * as vscode from 'vscode';
-import TelemetryReporter from 'vscode-extension-telemetry';
+import TelemetryReporter from '@vscode/extension-telemetry';
 import * as path from 'path';
 import * as fs from 'fs';
 import { CDPTarget } from './cdpTarget';

diff --git a/src/debugTelemetryReporter.ts b/src/debugTelemetryReporter.ts
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import TelemetryReporter from 'vscode-extension-telemetry';
+import TelemetryReporter from '@vscode/extension-telemetry';
 
 export class DebugTelemetryReporter extends TelemetryReporter {
     constructor() {
-        super('extensionId', 'extensionVersion', 'key');
+        super('key');
     }
 
     sendTelemetryEvent(

diff --git a/src/devtoolsPanel.ts b/src/devtoolsPanel.ts
@@ -4,7 +4,7 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import * as debugCore from 'vscode-chrome-debug-core';
 import { performance } from 'perf_hooks';
-import TelemetryReporter from 'vscode-extension-telemetry';
+import TelemetryReporter from '@vscode/extension-telemetry';
 import { SettingsProvider } from './common/settingsProvider';
 import {
     encodeMessageForChannel,

diff --git a/src/extension.ts b/src/extension.ts
@@ -4,7 +4,7 @@
 import { Browser, Target, TargetType } from 'puppeteer-core';
 import * as vscode from 'vscode';
 import * as debugCore from 'vscode-chrome-debug-core';
-import TelemetryReporter from 'vscode-extension-telemetry';
+import TelemetryReporter from '@vscode/extension-telemetry';
 import { CDPTarget } from './cdpTarget';
 import { CDPTargetsProvider } from './cdpTargetsProvider';
 import { DevToolsPanel } from './devtoolsPanel';

diff --git a/src/launchDebugProvider.ts b/src/launchDebugProvider.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import * as vscode from 'vscode';
-import TelemetryReporter from 'vscode-extension-telemetry';
+import TelemetryReporter from '@vscode/extension-telemetry';
 import {
     IUserConfig,
     SETTINGS_STORE_NAME,

diff --git a/src/screencastPanel.ts b/src/screencastPanel.ts
@@ -17,7 +17,7 @@ import {
     SETTINGS_SCREENCAST_WEBVIEW_NAME,
     SETTINGS_VIEW_NAME,
 } from './utils';
-import TelemetryReporter from 'vscode-extension-telemetry';
+import TelemetryReporter from '@vscode/extension-telemetry';
 import { DevToolsPanel } from './devtoolsPanel';
 import { providedHeadlessDebugConfig } from './launchConfigManager';
 

diff --git a/src/utils.ts b/src/utils.ts
@@ -9,7 +9,7 @@ import * as path from 'path';
 import * as url from 'url';
 import * as vscode from 'vscode';
 import * as debugCore from 'vscode-chrome-debug-core';
-import TelemetryReporter from 'vscode-extension-telemetry';
+import TelemetryReporter from '@vscode/extension-telemetry';
 import packageJson from '../package.json';
 import { DebugTelemetryReporter } from './debugTelemetryReporter';
 
@@ -338,7 +338,7 @@ export async function getJsDebugCDPProxyWebsocketUrl(debugSessionId: string): Pr
 export function createTelemetryReporter(_context: vscode.ExtensionContext): Readonly<TelemetryReporter> {
     if (packageJson && (_context.extensionMode === vscode.ExtensionMode.Production)) {
         // Use the real telemetry reporter
-        return new TelemetryReporter(packageJson.name, packageJson.version, packageJson.aiKey);
+        return new TelemetryReporter(packageJson.aiKey);
     }
         // Fallback to a fake telemetry reporter
         return new DebugTelemetryReporter();

diff --git a/test/cdpTargetsProvider.test.ts b/test/cdpTargetsProvider.test.ts
@@ -5,7 +5,7 @@
 // tslint:disable: variable-name
 
 import { ExtensionContext } from "vscode";
-import TelemetryReporter from "vscode-extension-telemetry";
+import TelemetryReporter from "@vscode/extension-telemetry";
 import { CDPTarget } from "../src/cdpTarget";
 import { createFakeExtensionContext, createFakeTelemetryReporter, createFakeVSCode, Mocked } from "./helpers/helpers";
 import { IRemoteTargetJson } from "../src/utils";

diff --git a/test/debugTelemetryReporter.test.ts b/test/debugTelemetryReporter.test.ts
@@ -7,7 +7,7 @@ import { createFakeVSCode } from "./helpers/helpers";
 // eslint-disable no-console
 
 jest.mock("vscode", () => createFakeVSCode(), { virtual: true });
-jest.mock("vscode-extension-telemetry");
+jest.mock("@vscode/extension-telemetry");
 
 describe("debugTelemetryReporter", () => {
     it("gets created successfully", async () => {

diff --git a/test/devtoolsPanel.test.ts b/test/devtoolsPanel.test.ts
@@ -5,7 +5,7 @@
 // tslint:disable: variable-name
 
 import { Disposable, ExtensionContext, WebviewPanel } from "vscode";
-import TelemetryReporter from "vscode-extension-telemetry";
+import TelemetryReporter from "@vscode/extension-telemetry";
 import { TelemetryData, webviewEventNames } from "../src/common/webviewEvents";
 import { PanelSocket } from "../src/panelSocket";
 import { JsDebugProxyPanelSocket } from "../src/JsDebugProxyPanelSocket";

diff --git a/test/extension.test.ts b/test/extension.test.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { ExtensionContext, Uri} from "vscode";
-import TelemetryReporter from "vscode-extension-telemetry";
+import TelemetryReporter from "@vscode/extension-telemetry";
 import { createFakeExtensionContext, createFakeTelemetryReporter, createFakeVSCode, createFakeLanguageClient, Mocked } from "./helpers/helpers";
 import {
     buttonCode,

diff --git a/test/helpers/helpers.ts b/test/helpers/helpers.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { ExtensionContext } from "vscode";
-import TelemetryReporter from "vscode-extension-telemetry";
+import TelemetryReporter from "@vscode/extension-telemetry";
 
 // Allow unused variables in the mocks to have leading underscore
 // tslint:disable: variable-name
@@ -162,9 +162,13 @@ export function createFakeExtensionContext() {
 export function createFakeTelemetryReporter(): Mocked<Readonly<TelemetryReporter>> {
     return {
         dispose: jest.fn(),
-        sendTelemetryErrorEvent: jest.fn(),
         sendTelemetryEvent: jest.fn(),
-        sendTelemetryException: jest.fn(),
+        sendRawTelemetryEvent: jest.fn(),
+        sendDangerousTelemetryEvent: jest.fn(),
+        sendTelemetryErrorEvent: jest.fn(),
+        sendDangerousTelemetryErrorEvent: jest.fn(),
+        onDidChangeTelemetryLevel: jest.fn(),
+        telemetryLevel: "all"
     };
 }
 

diff --git a/test/launchDebugProvider.test.ts b/test/launchDebugProvider.test.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import TelemetryReporter from "vscode-extension-telemetry";
+import TelemetryReporter from "@vscode/extension-telemetry";
 import { LaunchDebugProvider } from "../src/launchDebugProvider";
 import {
     createFakeExtensionContext,

diff --git a/test/utils.test.ts b/test/utils.test.ts
@@ -429,7 +429,7 @@ describe("utils", () => {
 
         it("returns a retail version when valid package in retail env", async () => {
             const retailReporter = {};
-            jest.doMock("vscode-extension-telemetry", () => function retail() { return retailReporter; });
+            jest.doMock("@vscode/extension-telemetry", () => function retail() { return retailReporter; });
             jest.resetModules();
             jest.requireMock("vscode").env.machineId = "12345";