feat: add setting to configure lsp log level

Author: Hweinstock

packages/amazonq/src/lsp/client.ts

@@ -22,7 +22,6 @@ import {
 } from '@aws/language-server-runtimes/protocol'
 import { AuthUtil, CodeWhispererSettings, getSelectedCustomization } from 'aws-core-vscode/codewhisperer'
 import {
-    Settings,
     oidcClientName,
     createServerOptions,
     globals,
@@ -36,6 +35,7 @@ import {
 } from 'aws-core-vscode/shared'
 import { activate } from './chat/activation'
 import { AmazonQResourcePaths } from './lspInstaller'
+import { getLspLogLevel } from './config'
 
 const localize = nls.loadMessageBundle()
 const logger = getLogger('amazonqLsp.lspClient')
@@ -61,11 +61,11 @@ export async function startLanguageServer(
         serverModule,
         execArgv: argv,
     })
-
+    const clientId = `amazonq`
     const documentSelector = [{ scheme: 'file', language: '*' }]
+    const lspLogSettings = getLspLogLevel(clientId)
 
-    const clientId = 'amazonq'
-    const traceServerEnabled = Settings.instance.isSet(`${clientId}.trace.server`)
+    getLogger('amazonqLsp').info(`Sending log settings to lsp: %O`, lspLogSettings)
 
     await validateNodeExe(resourcePaths.node, resourcePaths.lsp, argv, logger)
 
@@ -139,6 +139,7 @@ export async function startLanguageServer(
                     },
                 },
             },
+            logLevel: lspLogSettings.lspLogLevel,
             credentials: {
                 providesBearerToken: true,
             },
@@ -148,7 +149,7 @@ export async function startLanguageServer(
          *   When trace server is enabled, logs go to a seperate "Amazon Q Language Server" output.
          *   Otherwise, logs go to the regular "Amazon Q Logs" channel.
          */
-        ...(traceServerEnabled
+        ...(lspLogSettings.seperateTraceChannel
             ? {}
             : {
                   outputChannel: globals.logOutputChannel,

packages/amazonq/src/lsp/config.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { DevSettings, getServiceEnvVarConfig } from 'aws-core-vscode/shared'
+import { DevSettings, getServiceEnvVarConfig, Settings } from 'aws-core-vscode/shared'
 import { LspConfig } from 'aws-core-vscode/amazonq'
 
 export interface ExtendedAmazonQLSPConfig extends LspConfig {
@@ -26,3 +26,16 @@ export function getAmazonQLspConfig(): ExtendedAmazonQLSPConfig {
         ...getServiceEnvVarConfig('amazonqLsp', Object.keys(defaultAmazonQLspConfig)),
     }
 }
+
+// TODO: expose lsp logging settings to users
+// trace.server -> pipe LSP logs to seperate output channel.
+// lsp.logLevel -> log level to pass to the lsp.
+export function getLspLogLevel(clientId: string) {
+    const traceServerSetting = `${clientId}.trace.server`
+    const lspLogLevelSetting = `${clientId}.lsp.logLevel`
+
+    return {
+        seperateTraceChannel: Settings.instance.get(traceServerSetting),
+        lspLogLevel: Settings.instance.get(lspLogLevelSetting, String, 'info'),
+    }
+}