Bump @opentelemetry/core and @vscode/extension-telemetry and fix TelemetryReporter import

gulpfile.js

@@ -165,9 +165,14 @@ async function buildWebPack(webpackConfigName, args, env) {
         ['run', 'webpack', '--', ...args, ...['--mode', 'production', '--devtool', 'source-map']],
         env,
     );
+    // Strip ANSI color/style escape codes before parsing webpack output lines.
+    // Webpack colorizes output (e.g. "\u001b[1m\u001b[31mERROR\u001b[39m\u001b[22m in ..."),
+    // which would prevent startsWith('ERROR in') / startsWith('WARNING in') from matching.
+    // eslint-disable-next-line no-control-regex
+    const stripAnsi = (str) => str.replace(/\u001b\[[0-9;]*m/g, '');
     const stdOutLines = stdOut
         .split(os.EOL)
-        .map((item) => item.trim())
+        .map((item) => stripAnsi(item).trim())
         .filter((item) => item.length > 0);
     // Remember to perform a case insensitive search.
     const warnings = stdOutLines

package.json

@@ -1706,7 +1706,7 @@
     },
     "dependencies": {
         "@iarna/toml": "^3.0.0",
-        "@vscode/extension-telemetry": "^0.8.4",
+        "@vscode/extension-telemetry": "^1.5.2",
         "arch": "^2.1.0",
         "fs-extra": "^11.2.0",
         "glob": "^7.2.0",

src/client/browser/extension.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 { LanguageClientOptions } from 'vscode-languageclient';
 import { LanguageClient } from 'vscode-languageclient/browser';
 import { LanguageClientMiddlewareBase } from '../activation/languageClientMiddlewareBase';
@@ -153,7 +153,7 @@ function getTelemetryReporter() {
     }
 
     // eslint-disable-next-line global-require
-    const Reporter = require('@vscode/extension-telemetry').default as typeof TelemetryReporter;
+    const Reporter = require('@vscode/extension-telemetry').TelemetryReporter as typeof TelemetryReporter;
     telemetryReporter = new Reporter(AppinsightsKey, [
         {
             lookup: /(errorName|errorMessage|errorStack)/g,

src/client/telemetry/index.ts

@@ -2,7 +2,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 type * as vscodeTypes from 'vscode';
 import { DiagnosticCodes } from '../application/diagnostics/constants';
 import { AppinsightsKey, isTestExecution, isUnitTestExecution, PVSC_EXTENSION_ID } from '../common/constants';
@@ -78,7 +78,7 @@ export function getTelemetryReporter(): TelemetryReporter {
         return telemetryReporter;
     }
 
-    const Reporter = require('@vscode/extension-telemetry').default as typeof TelemetryReporter;
+    const Reporter = require('@vscode/extension-telemetry').TelemetryReporter as typeof TelemetryReporter;
     telemetryReporter = new Reporter(AppinsightsKey, [
         {
             lookup: /(errorName|errorMessage|errorStack)/g,

src/test/debugger/extension/adapter/factory.unit.test.ts

@@ -73,7 +73,7 @@ suite('Debugging - Adapter Factory', () => {
         readJSONSyncStub = sinon.stub(fs, 'readJSONSync');
         readJSONSyncStub.returns({ enableTelemetry: true });
         rewiremock.enable();
-        rewiremock('@vscode/extension-telemetry').with({ default: Reporter });
+        rewiremock('@vscode/extension-telemetry').with({ TelemetryReporter: Reporter });
         stateFactory = mock(PersistentStateFactory);
         state = mock(PersistentState) as PersistentState<boolean | undefined>;
         commandManager = mock(CommandManager);

src/test/telemetry/index.unit.test.ts

@@ -61,7 +61,7 @@ suite('Telemetry', () => {
 
     test('Send Telemetry', () => {
         rewiremock.enable();
-        rewiremock('@vscode/extension-telemetry').with({ default: Reporter });
+        rewiremock('@vscode/extension-telemetry').with({ TelemetryReporter: Reporter });
 
         const eventName = 'Testing';
         const properties = { hello: 'world', foo: 'bar' };
@@ -75,7 +75,7 @@ suite('Telemetry', () => {
     });
     test('Send Telemetry with no properties', () => {
         rewiremock.enable();
-        rewiremock('@vscode/extension-telemetry').with({ default: Reporter });
+        rewiremock('@vscode/extension-telemetry').with({ TelemetryReporter: Reporter });
 
         const eventName = 'Testing';
 
@@ -87,7 +87,7 @@ suite('Telemetry', () => {
     });
     test('Send Telemetry with shared properties', () => {
         rewiremock.enable();
-        rewiremock('@vscode/extension-telemetry').with({ default: Reporter });
+        rewiremock('@vscode/extension-telemetry').with({ TelemetryReporter: Reporter });
 
         const eventName = 'Testing';
         const properties = { hello: 'world', foo: 'bar' };
@@ -104,7 +104,7 @@ suite('Telemetry', () => {
     });
     test('Shared properties will replace existing ones', () => {
         rewiremock.enable();
-        rewiremock('@vscode/extension-telemetry').with({ default: Reporter });
+        rewiremock('@vscode/extension-telemetry').with({ TelemetryReporter: Reporter });
 
         const eventName = 'Testing';
         const properties = { hello: 'world', foo: 'bar' };
@@ -122,7 +122,7 @@ suite('Telemetry', () => {
     test('Send Exception Telemetry', () => {
         rewiremock.enable();
         const error = new Error('Boo');
-        rewiremock('@vscode/extension-telemetry').with({ default: Reporter });
+        rewiremock('@vscode/extension-telemetry').with({ TelemetryReporter: Reporter });
 
         const eventName = 'Testing';
         const measures = { start: 123, end: 987 };