rename metrics and types

Author: Hweinstock

packages/core/src/amazonq/lsp/lspController.ts

@@ -160,9 +160,9 @@ export class LspController {
         }
         setImmediate(async () => {
             try {
-                await telemetry.lsp_setup.run(async (span) => {
+                await telemetry.languageServer_setup.run(async (span) => {
                     const startTime = performance.now()
-                    span.record({ lspSetupStage: 'final' })
+                    span.record({ languageServerSetupStage: 'final' })
                     const installResult = await new WorkspaceLSPResolver().resolve()
                     await activateLsp(context, installResult.resourcePaths)
                     getLogger().info('LspController: LSP activated')

packages/core/src/amazonq/lsp/workspaceInstaller.ts

@@ -19,27 +19,31 @@ const supportedLspServerVersions = '0.1.32'
 export class WorkspaceLSPResolver implements LspResolver {
     async resolve(): Promise<LspResolution> {
         const name = 'AmazonQ-Workspace'
-        const manifest = await telemetry.lsp_setup.run(async (span) => {
+        const manifest = await telemetry.languageServer_setup.run(async (span) => {
             const startTime = performance.now()
-            span.record({ lspSetupStage: 'fetchManifest' })
+            span.record({ languageServerSetupStage: 'getManifest' })
             const result = await new ManifestResolver(manifestUrl, name).resolve()
             span.record({
-                lspSetupLocation: result.location ?? 'unknown',
+                languageServerResourceLocation: result.location ?? 'unknown',
+                manifestVersion: result.manifestSchemaVersion,
                 duration: performance.now() - startTime,
             })
             return result
         })
+        telemetry.record({
+            manifestVersion: manifest.manifestSchemaVersion,
+        })
 
-        const installationResult = await telemetry.lsp_setup.run(async (span) => {
+        const installationResult = await telemetry.languageServer_setup.run(async (span) => {
             const startTime = performance.now()
-            span.record({ lspSetupStage: 'serverCall' })
+            span.record({ languageServerSetupStage: 'getServer' })
             const result = await new LanguageServerResolver(
                 manifest,
                 name,
                 new Range(supportedLspServerVersions)
             ).resolve()
             span.record({
-                lspSetupLocation: result.location ?? 'unknown',
+                languageServerResourceLocation: result.location ?? 'unknown',
                 duration: performance.now() - startTime,
             })
             return result

packages/core/src/shared/lsp/lspResolver.ts

@@ -187,8 +187,8 @@ export class LanguageServerResolver {
             }
             return []
         })
-        const filesToDownload = await telemetry.lsp_setup.run(async (span) => {
-            span.record({ lspSetupStage: 'validate' })
+        const filesToDownload = await telemetry.languageServer_setup.run(async (span) => {
+            span.record({ languageServerSetupStage: 'validate' })
             const startTime = performance.now()
             const result = (await Promise.all(verifyTasks)).flat()
             span.record({ duration: performance.now() - startTime })

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

@@ -1,16 +1,21 @@
 {
     "types": [
         {
-            "name": "lspSetupStage",
+            "name": "languageServerSetupStage",
             "type": "string",
-            "allowedValues": ["fetchManifest", "serverCall", "validate", "activate", "final"],
+            "allowedValues": ["getManifest", "getServer", "validate", "launch", "final"],
             "description": "The stage of the LSP setup process"
         },
         {
-            "name": "lspSetupLocation",
+            "name": "languageServerResourceLocation",
             "type": "string",
             "allowedValues": ["cache", "remote", "fallback", "override", "unknown"],
-            "description": "The location of the LSP server"
+            "description": "The location of the LSP resource"
+        },
+        {
+            "name": "manifestVersion",
+            "type": "string",
+            "description": "The version of the manifest file"
         },
         {
             "name": "amazonGenerateApproachLatency",
@@ -371,24 +376,20 @@
     ],
     "metrics": [
         {
-            "name": "lsp_setup",
+            "name": "languageServer_setup",
             "description": "LSP setup event",
             "metadata": [
                 {
-                    "type": "lspSetupStage",
+                    "type": "languageServerSetupStage",
                     "required": true
                 },
                 {
-                    "type": "lspSetupLocation",
+                    "type": "languageServerResourceLocation",
                     "required": false
                 },
                 {
-                    "type": "duration",
-                    "required": true
-                },
-                {
-                    "type": "result",
-                    "required": true
+                    "type": "manifestVersion",
+                    "required": false
                 }
             ]
         },