Ensure that everything is instrumented where we can.

Author: fearthecowboy

Extension/src/Debugger/extension.ts

@@ -15,6 +15,7 @@ import { TargetLeafNode, setActiveSshTarget } from '../SSH/TargetsView/targetNod
 import { sshCommandToConfig } from '../SSH/sshCommandToConfig';
 import { getSshConfiguration, getSshConfigurationFiles, parseFailures, writeSshConfiguration } from '../SSH/sshHosts';
 import { pathAccessible } from '../common';
+import { instrument } from '../instrumentation';
 import { getSshChannel } from '../logger';
 import { AttachItemsProvider, AttachPicker, RemoteAttachPicker } from './attachToProcess';
 import { ConfigurationAssetProviderFactory, ConfigurationSnippetProvider, DebugConfigurationProvider, IConfigurationAssetProvider } from './configurationProvider';
@@ -46,10 +47,10 @@ export async function initialize(context: vscode.ExtensionContext): Promise<void
     let cppVsDebugProvider: DebugConfigurationProvider | null = null;
     if (os.platform() === 'win32') {
         cppVsDebugProvider = new DebugConfigurationProvider(assetProvider, DebuggerType.cppvsdbg);
-        disposables.push(vscode.debug.registerDebugConfigurationProvider(DebuggerType.cppvsdbg, cppVsDebugProvider, vscode.DebugConfigurationProviderTriggerKind.Dynamic));
+        disposables.push(vscode.debug.registerDebugConfigurationProvider(DebuggerType.cppvsdbg, instrument(cppVsDebugProvider), vscode.DebugConfigurationProviderTriggerKind.Dynamic));
     }
     const cppDebugProvider: DebugConfigurationProvider = new DebugConfigurationProvider(assetProvider, DebuggerType.cppdbg);
-    disposables.push(vscode.debug.registerDebugConfigurationProvider(DebuggerType.cppdbg, cppDebugProvider, vscode.DebugConfigurationProviderTriggerKind.Dynamic));
+    disposables.push(vscode.debug.registerDebugConfigurationProvider(DebuggerType.cppdbg, instrument(cppDebugProvider), vscode.DebugConfigurationProviderTriggerKind.Dynamic));
 
     // Register DebugConfigurationProviders for "Run and Debug" play button.
     const debugProvider: DebugConfigurationProvider = new DebugConfigurationProvider(assetProvider, DebuggerType.all);
@@ -75,7 +76,7 @@ export async function initialize(context: vscode.ExtensionContext): Promise<void
     }];
 
     // ConfigurationSnippetProvider needs to be initiallized after configurationProvider calls getConfigurationSnippets.
-    disposables.push(vscode.languages.registerCompletionItemProvider(launchJsonDocumentSelector, new ConfigurationSnippetProvider(assetProvider)));
+    disposables.push(vscode.languages.registerCompletionItemProvider(launchJsonDocumentSelector, instrument(new ConfigurationSnippetProvider(assetProvider))));
 
     // Register Debug Adapters
     disposables.push(vscode.debug.registerDebugAdapterDescriptorFactory(DebuggerType.cppvsdbg, new CppvsdbgDebugAdapterDescriptorFactory(context)));
@@ -84,7 +85,7 @@ export async function initialize(context: vscode.ExtensionContext): Promise<void
     // SSH Targets View
     await initializeSshTargets();
     const sshTargetsProvider: SshTargetsProvider = new SshTargetsProvider();
-    disposables.push(vscode.window.registerTreeDataProvider('CppSshTargetsView', sshTargetsProvider));
+    disposables.push(vscode.window.registerTreeDataProvider('CppSshTargetsView', instrument(sshTargetsProvider)));
     disposables.push(vscode.commands.registerCommand(addSshTargetCmd, () => enableSshTargetsViewAndRun(addSshTargetImpl)));
     disposables.push(vscode.commands.registerCommand('C_Cpp.removeSshTarget', (node?: BaseNode) => enableSshTargetsViewAndRun(removeSshTargetImpl, node)));
     disposables.push(vscode.commands.registerCommand(refreshCppSshTargetsViewCmd, (node?: BaseNode) => enableSshTargetsViewAndRun((node?: BaseNode) => sshTargetsProvider.refresh(node), node)));

Extension/src/LanguageServer/client.ts

@@ -841,7 +841,7 @@ export interface Client {
 }
 
 export function createClient(workspaceFolder?: vscode.WorkspaceFolder): Client {
-    if (isInstrumentationEnabled()) {
+    if (isInstrumentationEnabled) {
         instrument(vscode.languages, { name: "languages" });
         instrument(vscode.window, { name: "window" });
         instrument(vscode.workspace, { name: "workspace" });

Extension/src/LanguageServer/extension.ts

@@ -18,6 +18,7 @@ import * as which from 'which';
 import { logAndReturn } from '../Utility/Async/returns';
 import * as util from '../common';
 import { modelSelector } from '../constants';
+import { instrument } from '../instrumentation';
 import { getCrashCallStacksChannel } from '../logger';
 import { PlatformInformation } from '../platform';
 import * as telemetry from '../telemetry';
@@ -222,7 +223,7 @@ export async function activate(): Promise<void> {
         { scheme: 'file', language: 'cpp' },
         { scheme: 'file', language: 'cuda-cpp' }
     ];
-    codeActionProvider = vscode.languages.registerCodeActionsProvider(selector, {
+    codeActionProvider = vscode.languages.registerCodeActionsProvider(selector, instrument({
         provideCodeActions: async (document: vscode.TextDocument, range: vscode.Range, context: vscode.CodeActionContext): Promise<vscode.CodeAction[]> => {
 
             if (!await clients.ActiveClient.getVcpkgEnabled()) {
@@ -248,7 +249,7 @@ export async function activate(): Promise<void> {
             const actions: vscode.CodeAction[] = ports.map<vscode.CodeAction>(getVcpkgClipboardInstallAction);
             return actions;
         }
-    });
+    }));
 
     await vscode.commands.executeCommand('setContext', 'cpptools.msvcEnvironmentFound', util.hasMsvcEnvironment());
 

Extension/src/instrumentation.ts

@@ -27,7 +27,6 @@ const services = {
     instrument: <T extends Record<string, any>>(instance: T, _options?: { ignore?: string[]; name?: string }): T => instance,
     message: (_message: PerfMessage) => { },
     init: (_vscode: any) => { },
-    launchSettings: undefined as Record<string, any> | undefined
 };
 
 /** Adds instrumentation to all the members of an object when instrumentation is enabled  */
@@ -41,21 +40,15 @@ export function sendInstrumentation(message: PerfMessage): void {
 }
 
 /** verifies that the instrumentation is loaded into the global namespace */
-export function isInstrumentationEnabled(): boolean {
-    return !!(global as any).instrumentation;
-}
+export const isInstrumentationEnabled = !!(global as any).instrumentation;
 
-// If the instrumentation object was *actually* loaded then we can set the services from the global object.
-// Having this separate ensures that this module is wired up to the global object.
-// It's not included in the previous block because if something else loads the instrumentation code first
-// this is still needed so that *this* module is properly connected to the global object.
-if (isInstrumentationEnabled()) {
-    // instrumentation services provided by the tool
+// If the instrumentation is enabled, then ensure the functions are wired up.
+if (isInstrumentationEnabled) {
+    // Instrumentation services provided by the tool.
     services.instrument = (global as any).instrumentation.instrument;
     services.message = (global as any).instrumentation.message;
     services.init = (global as any).instrumentation.init;
 
+    // Passes the specific vscode object for this extension to the init routine.
     services.init(require('vscode'));
 }
-
-(globalThis as any)["_vscode_"] = require('vscode');

Extension/src/main.ts

@@ -23,7 +23,7 @@ import { CppSettings } from './LanguageServer/settings';
 import { logAndReturn, returns } from './Utility/Async/returns';
 import { CppTools1 } from './cppTools1';
 import { logMachineIdMappings } from './id';
-import { sendInstrumentation } from './instrumentation';
+import { instrument, sendInstrumentation } from './instrumentation';
 import { disposeOutputChannels, log } from './logger';
 import { PlatformInformation } from './platform';
 
@@ -60,7 +60,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<CppToo
         }
     }
 
-    vscode.workspace.registerTextDocumentContentProvider('cpptools-schema', new SchemaProvider());
+    vscode.workspace.registerTextDocumentContentProvider('cpptools-schema', instrument(new SchemaProvider()));
 
     // Initialize the DebuggerExtension and register the related commands and providers.
     await DebuggerExtension.initialize(context);
@@ -133,7 +133,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<CppToo
         }
     }
 
-    disposables.push(vscode.tasks.registerTaskProvider(CppBuildTaskProvider.CppBuildScriptType, cppBuildTaskProvider));
+    disposables.push(vscode.tasks.registerTaskProvider(CppBuildTaskProvider.CppBuildScriptType, instrument(cppBuildTaskProvider)));
 
     vscode.tasks.onDidStartTask(event => {
         if (event.execution.task.definition.type === CppBuildTaskProvider.CppBuildScriptType