Merge master into feature/logs

Author: aws-toolkit-automation

packages/amazonq/src/lsp/client.ts

@@ -39,6 +39,7 @@ import { processUtils } from 'aws-core-vscode/shared'
 import { activate } from './chat/activation'
 import { AmazonQResourcePaths } from './lspInstaller'
 import { ConfigSection, isValidConfigSection, toAmazonQLSPLogLevel } from './config'
+import { telemetry } from 'aws-core-vscode/telemetry'
 
 const localize = nls.loadMessageBundle()
 const logger = getLogger('amazonqLsp.lspClient')
@@ -293,6 +294,12 @@ function onServerRestartHandler(client: LanguageClient, auth: AmazonQLspAuth) {
             return
         }
 
+        // Emit telemetry that a crash was detected.
+        // It is not guaranteed to 100% be a crash since somehow the server may have been intentionally restarted,
+        // but most of the time it probably will have been due to a crash.
+        // TODO: Port this metric override to common definitions
+        telemetry.languageServer_crash.emit({ id: 'AmazonQ' })
+
         // Need to set the auth token in the again
         await auth.refreshConnection(true)
     })

packages/core/src/shared/telemetry/vscodeTelemetry.json

@@ -1019,6 +1019,15 @@
                 }
             ]
         },
+        {
+            "name": "languageServer_crash",
+            "description": "Called when a language server crash is detected. TODO: Port this to common",
+            "metadata": [
+                {
+                    "type": "id"
+                }
+            ]
+        },
         {
             "name": "ide_heartbeat",
             "description": "A heartbeat sent by the extension",