feat: Crash Monitoring

Signed-off-by: nkomonen-amazon <[email protected]>

redid the constructors + extracted state

Signed-off-by: nkomonen-amazon <[email protected]>

Author: nkomonen-amazon

packages/amazonq/src/extensionNode.ts

@@ -7,7 +7,7 @@ import * as vscode from 'vscode'
 import { activateAmazonQCommon, amazonQContextPrefix, deactivateCommon } from './extension'
 import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
 import { activate as activateQGumby } from 'aws-core-vscode/amazonqGumby'
-import { ExtContext, globals } from 'aws-core-vscode/shared'
+import { ExtContext, globals, env, CrashMonitoring } from 'aws-core-vscode/shared'
 import { filetypes, SchemaService } from 'aws-core-vscode/sharedNode'
 import { updateDevMode } from 'aws-core-vscode/dev'
 import { CommonAuthViewProvider } from 'aws-core-vscode/login'
@@ -32,6 +32,11 @@ export async function activate(context: vscode.ExtensionContext) {
  * the code compatible with web and move it to {@link activateAmazonQCommon}.
  */
 async function activateAmazonQNode(context: vscode.ExtensionContext) {
+    // Do not run in tests since this corrupts the telemetry we try and assert
+    if (!env.isAutomation()) {
+        await (await CrashMonitoring.instance()).start()
+    }
+
     const extContext = {
         extensionContext: context,
     }
@@ -93,5 +98,6 @@ async function setupDevMode(context: vscode.ExtensionContext) {
 }
 
 export async function deactivate() {
-    await deactivateCommon()
+    // Run concurrently to speed up execution. stop() does not throw so it is safe
+    await Promise.all([(await CrashMonitoring.instance()).stop(), deactivateCommon()])
 }

packages/core/src/dev/activation.ts

@@ -24,6 +24,7 @@ import { entries } from '../shared/utilities/tsUtils'
 import { getEnvironmentSpecificMemento } from '../shared/utilities/mementos'
 import { setContext } from '../shared'
 import { telemetry } from '../shared/telemetry'
+import { getSessionId } from '../shared/telemetry/util'
 
 interface MenuOption {
     readonly label: string
@@ -108,7 +109,7 @@ const menuOptions: Record<DevFunction, MenuOption> = {
     },
     forceIdeCrash: {
         label: 'Crash: Force IDE ExtHost Crash',
-        detail: `Will SIGKILL ExtHost with pid, ${process.pid}, but IDE will not crash itself.`,
+        detail: `Will SIGKILL ExtHost, { pid: ${process.pid}, sessionId: '${getSessionId().slice(0, 8)}-...' }, but the IDE itself will not crash.`,
         executor: forceQuitIde,
     },
 }
@@ -222,6 +223,7 @@ function isSecrets(obj: vscode.Memento | vscode.SecretStorage): obj is vscode.Se
 
 class VirtualObjectFile implements FileProvider {
     private mTime = 0
+    private size = 0
     private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
     public readonly onDidChange = this.onDidChangeEmitter.event
 
@@ -233,22 +235,24 @@ class VirtualObjectFile implements FileProvider {
     /** Emits an event indicating this file's content has changed */
     public refresh() {
         /**
-         * Per {@link vscode.FileSystemProvider.onDidChangeFile}, if the mTime does not change, new file content may
-         * not be retrieved. Without this, when we emit a change the text editor did not update.
+         * Per {@link vscode.FileSystemProvider.onDidChangeFile}, if the mTime and/or size does not change, new file content may
+         * not be retrieved due to optimizations. Without this, when we emit a change the text editor did not update.
          */
         this.mTime++
         this.onDidChangeEmitter.fire()
     }
 
     public stat(): { ctime: number; mtime: number; size: number } {
         // This would need to be filled out to track conflicts
-        return { ctime: 0, mtime: this.mTime, size: 0 }
+        return { ctime: 0, mtime: this.mTime, size: this.size }
     }
 
     public async read(): Promise<Uint8Array> {
         const encoder = new TextEncoder()
 
-        return encoder.encode(await this.readStore(this.key))
+        const data = encoder.encode(await this.readStore(this.key))
+        this.size = data.length
+        return data
     }
 
     public async write(content: Uint8Array): Promise<void> {

packages/core/src/extensionNode.ts

@@ -46,7 +46,7 @@ import { SchemaService } from './shared/schemas'
 import { AwsResourceManager } from './dynamicResources/awsResourceManager'
 import globals from './shared/extensionGlobals'
 import { Experiments, Settings, showSettingsFailedMsg } from './shared/settings'
-import { isReleaseVersion } from './shared/vscode/env'
+import { isAutomation, isReleaseVersion } from './shared/vscode/env'
 import { telemetry } from './shared/telemetry/telemetry'
 import { Auth, SessionSeparationPrompt } from './auth/auth'
 import { registerSubmitFeedback } from './feedback/vue/submitFeedback'
@@ -59,7 +59,7 @@ import { ExtensionUse } from './auth/utils'
 import { ExtStartUpSources } from './shared/telemetry'
 import { activate as activateThreatComposerEditor } from './threatComposer/activation'
 import { isSsoConnection, hasScopes } from './auth/connection'
-import { setContext } from './shared'
+import { CrashMonitoring, setContext } from './shared'
 
 let localize: nls.LocalizeFunc
 
@@ -78,6 +78,11 @@ export async function activate(context: vscode.ExtensionContext) {
         // IMPORTANT: If you are doing setup that should also work in web mode (browser), it should be done in the function below
         const extContext = await activateCommon(context, contextPrefix, false)
 
+        // Do not run in tests since this corrupts the telemetry we try and assert
+        if (!isAutomation()) {
+            await (await CrashMonitoring.instance()).start()
+        }
+
         initializeCredentialsProviderManager()
 
         const toolkitEnvDetails = getExtEnvironmentDetails()
@@ -251,7 +256,8 @@ export async function activate(context: vscode.ExtensionContext) {
 }
 
 export async function deactivate() {
-    await deactivateCommon()
+    // Run concurrently to speed up execution. stop() does not throw so it is safe
+    await Promise.all([await (await CrashMonitoring.instance()).stop(), deactivateCommon()])
     await globals.resourceManager.dispose()
 }