lift telemetry logic to top level

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

@@ -10,6 +10,7 @@ import { LanguageServerResolver } from '../../shared/lsp/lspResolver'
 import { Range } from 'semver'
 import { getNodeExecutableName } from '../../shared/lsp/utils/platform'
 import { fs } from '../../shared/fs/fs'
+import { telemetry } from '../../shared/telemetry'
 
 const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json'
 // this LSP client in Q extension is only going to work with these LSP server versions
@@ -18,12 +19,31 @@ const supportedLspServerVersions = '0.1.32'
 export class WorkspaceLSPResolver implements LspResolver {
     async resolve(): Promise<LspResolution> {
         const name = 'AmazonQ-Workspace'
-        const manifest = await new ManifestResolver(manifestUrl, name).resolve()
-        const installationResult = await new LanguageServerResolver(
-            manifest,
-            name,
-            new Range(supportedLspServerVersions)
-        ).resolve()
+        const manifest = await telemetry.lsp_setup.run(async (span) => {
+            const startTime = performance.now()
+            span.record({ lspSetupStage: 'fetchManifest' })
+            const result = await new ManifestResolver(manifestUrl, name).resolve()
+            span.record({
+                lspSetupLocation: result.location ?? 'unknown',
+                duration: performance.now() - startTime,
+            })
+            return result
+        })
+
+        const installationResult = await telemetry.lsp_setup.run(async (span) => {
+            const startTime = performance.now()
+            span.record({ lspSetupStage: 'serverCall' })
+            const result = await new LanguageServerResolver(
+                manifest,
+                name,
+                new Range(supportedLspServerVersions)
+            ).resolve()
+            span.record({
+                lspSetupLocation: result.location ?? 'unknown',
+                duration: performance.now() - startTime,
+            })
+            return result
+        })
 
         const nodeName =
             process.platform === 'win32' ? getNodeExecutableName() : `node-${process.platform}-${process.arch}`

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

@@ -9,7 +9,6 @@ import { RetryableResourceFetcher } from '../resourcefetcher/httpResourceFetcher
 import { Timeout } from '../utilities/timeoutUtils'
 import globals from '../extensionGlobals'
 import { Manifest } from './types'
-import { telemetry } from '../telemetry'
 
 const logger = getLogger('lsp')
 
@@ -33,22 +32,11 @@ export class ManifestResolver {
      * Fetches the latest manifest, falling back to local cache on failure
      */
     async resolve(): Promise<Manifest> {
-        return await telemetry.lsp_setup.run(async (span) => {
-            span.record({ lspSetupStage: 'fetchManifest' })
-            const startTime = performance.now()
-
-            try {
-                const result = await this.fetchRemoteManifest()
-                span.record({ lspSetupLocation: 'remote' })
-                return result
-            } catch (error) {
-                span.record({ lspSetupLocation: 'cache' })
-                const result = await this.getLocalManifest()
-                return result
-            } finally {
-                span.record({ duration: performance.now() - startTime })
-            }
-        })
+        try {
+            return await this.fetchRemoteManifest()
+        } catch (error) {
+            return await this.getLocalManifest()
+        }
     }
 
     private async fetchRemoteManifest(): Promise<Manifest> {
@@ -67,6 +55,7 @@ export class ManifestResolver {
         const manifest = this.parseManifest(resp.content)
         await this.saveManifest(resp.eTag, resp.content)
         this.checkDeprecation(manifest)
+        manifest.location = 'remote'
         return manifest
     }
 
@@ -81,6 +70,7 @@ export class ManifestResolver {
 
         const manifest = this.parseManifest(manifestData.content)
         this.checkDeprecation(manifest)
+        manifest.location = 'cache'
         return manifest
     }
 

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

@@ -53,6 +53,7 @@ export interface Manifest {
     artifactDescription: string
     isManifestDeprecated: boolean
     versions: LspVersion[]
+    location?: Location
 }
 
 export interface VersionRange {

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

@@ -9,7 +9,7 @@
         {
             "name": "lspSetupLocation",
             "type": "string",
-            "allowedValues": ["cache", "remote", "fallback", "override"],
+            "allowedValues": ["cache", "remote", "fallback", "override", "unknown"],
             "description": "The location of the LSP server"
         },
         {