fix: hardcoded class and function names logging to avoid uglified naming when bundled (#909)

francescoopiccoli · Francesco Piccoli · nborges-aws · commit 2aed4db01eea · 2025-04-17T10:48:26.000-04:00
* fix: prevent uglifying class and function names when bundling codewhisperer

* chore: fix format

* fix: add missing import

* feat: log class name from language servers (not from runtimes)

* fix: log directly hardcoded class name, undo keep class and file names

* fix: merge conflicts + updated logging after merge

* feat: add hardcoded logging for new iam streaming client

---------

Co-authored-by: Francesco Piccoli &lt;frapicc@amazon.com&gt;
diff --git a/app/aws-lsp-codewhisperer-runtimes/webpack.config.js b/app/aws-lsp-codewhisperer-runtimes/webpack.config.js
@@ -1,7 +1,6 @@
 const path = require('path')
 const webpack = require('webpack')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
-
 const baseConfig = {
     mode: 'development',
     output: {
diff --git a/server/aws-lsp-codewhisperer/src/client/sigv4/codewhisperer.ts b/server/aws-lsp-codewhisperer/src/client/sigv4/codewhisperer.ts
@@ -2,18 +2,24 @@ import { Service } from 'aws-sdk'
 import { ServiceConfigurationOptions } from 'aws-sdk/lib/service'
 const apiConfig = require('./service.json')
 import CodeWhispererClient = require('./codewhisperersigv4client')
-import { SDKInitializator } from '@aws/language-server-runtimes/server-interface'
+import { SDKInitializator, Logging } from '@aws/language-server-runtimes/server-interface'
 
 export type CodeWhispererSigv4ClientConfigurationOptions = ServiceConfigurationOptions
 
 export function createCodeWhispererSigv4Client(
     options: ServiceConfigurationOptions,
-    sdkInitializator: SDKInitializator
+    sdkInitializator: SDKInitializator,
+    logging: Logging
 ): CodeWhispererClient {
-    return createService(options, sdkInitializator) as CodeWhispererClient
+    return createService(options, sdkInitializator, logging) as CodeWhispererClient
 }
 
-function createService(options: ServiceConfigurationOptions, sdkInitializator: SDKInitializator): Service {
+function createService(
+    options: ServiceConfigurationOptions,
+    sdkInitializator: SDKInitializator,
+    logging: Logging
+): Service {
+    logging.log(`Passing client for class Service to sdkInitializator (v2) for additional setup (e.g. proxy)`)
     const client = sdkInitializator.v2(Service, { apiConfig, ...options } as any)
     return client
 }
diff --git a/server/aws-lsp-codewhisperer/src/client/streamingClient/codewhispererStreamingClient.ts b/server/aws-lsp-codewhisperer/src/client/streamingClient/codewhispererStreamingClient.ts
@@ -1,6 +1,6 @@
 import { CodeWhispererStreaming, CodeWhispererStreamingClientConfig } from '@amzn/codewhisperer-streaming'
 import { ConfiguredRetryStrategy } from '@aws-sdk/util-retry'
-import { SDKInitializator } from '@aws/language-server-runtimes/server-interface'
+import { SDKInitializator, Logging } from '@aws/language-server-runtimes/server-interface'
 
 // TODO: refactor and combine with language-server/streamingClientService.ts when no longer in use
 export class StreamingClient {
@@ -9,13 +9,15 @@ export class StreamingClient {
         codeWhispererRegion: string,
         codeWhispererEndpoint: string,
         sdkInitializator: SDKInitializator,
+        logging: Logging,
         config?: CodeWhispererStreamingClientConfig
     ) {
         return await createStreamingClient(
             credentialsProvider,
             codeWhispererRegion,
             codeWhispererEndpoint,
             sdkInitializator,
+            logging,
             config
         )
     }
@@ -25,10 +27,14 @@ export async function createStreamingClient(
     codeWhispererRegion: string,
     codeWhispererEndpoint: string,
     sdkInitializator: SDKInitializator,
+    logging: Logging,
     config?: CodeWhispererStreamingClientConfig
 ): Promise<CodeWhispererStreaming> {
     const creds = credentialsProvider.getCredentials('bearer')
 
+    logging.log(
+        `Passing client for class CodeWhispererStreaming to sdkInitializator (v3) for additional setup (e.g. proxy)`
+    )
     const streamingClient = sdkInitializator(CodeWhispererStreaming, {
         region: codeWhispererRegion,
         endpoint: codeWhispererEndpoint,
diff --git a/server/aws-lsp-codewhisperer/src/client/token/codewhisperer.ts b/server/aws-lsp-codewhisperer/src/client/token/codewhisperer.ts
@@ -2,8 +2,7 @@ import { AWSError, Request, Service } from 'aws-sdk'
 import { ServiceConfigurationOptions } from 'aws-sdk/lib/service'
 const apiConfig = require('./bearer-token-service.json')
 import CodeWhispererClient = require('./codewhispererbearertokenclient')
-import { SDKInitializator } from '@aws/language-server-runtimes/server-interface'
-
+import { SDKInitializator, Logging } from '@aws/language-server-runtimes/server-interface'
 // PROOF OF CONCEPT
 // This client fiddling was copied from the AWS Toolkit for VS Code
 // https://github.com/aws/aws-toolkit-vscode/blob/5d621c8405a8b20ffe571ad0ba10ae700178e051/src/shared/awsClientBuilder.ts#L68
@@ -22,19 +21,22 @@ export interface CodeWhispererTokenClientConfigurationOptions extends ServiceCon
 
 export function createCodeWhispererTokenClient(
     options: CodeWhispererTokenClientConfigurationOptions,
-    sdkInitializator: SDKInitializator
+    sdkInitializator: SDKInitializator,
+    logging: Logging
 ): CodeWhispererClient {
-    return createService(options, sdkInitializator) as CodeWhispererClient
+    return createService(options, sdkInitializator, logging) as CodeWhispererClient
 }
 
 function createService(
     options: CodeWhispererTokenClientConfigurationOptions,
-    sdkInitializator: SDKInitializator
+    sdkInitializator: SDKInitializator,
+    logging: Logging
 ): Service {
     const onRequest = options?.onRequestSetup ?? []
     const listeners = Array.isArray(onRequest) ? onRequest : [onRequest]
     const opt = { ...options }
     delete opt.onRequestSetup
+    logging.log(`Passing client for class Service to sdkInitializator (v2) for additional setup (e.g. proxy)`)
     const client = sdkInitializator.v2(Service, { apiConfig, ...options } as any)
     const originalClient = client.setupRequestListeners.bind(client)
 
diff --git a/server/aws-lsp-codewhisperer/src/language-server/netTransform/netTransformServer.ts b/server/aws-lsp-codewhisperer/src/language-server/netTransform/netTransformServer.ts
@@ -5,6 +5,7 @@ import {
     InitializeParams,
     Server,
     Workspace,
+    Logging,
 } from '@aws/language-server-runtimes/server-interface'
 import { CodeWhispererServiceToken } from '../../shared/codeWhispererService'
 import {
@@ -55,6 +56,7 @@ export const QNetTransformServerToken =
         service: (
             credentialsProvider: CredentialsProvider,
             workspace: Workspace,
+            logging: Logging,
             awsQRegion: string,
             awsQEndpointUrl: string,
             sdkInitializator: SDKInitializator
@@ -192,10 +194,10 @@ export const QNetTransformServerToken =
             transformHandler = new TransformHandler(amazonQServiceManager, workspace, logging, runtime)
 
             /* 
-                Calling handleDidChangeConfiguration once to ensure we get configuration atleast once at start up
-                
-                TODO: TODO: consider refactoring such responsibilities to common service manager config/initialisation server
-            */
+                    Calling handleDidChangeConfiguration once to ensure we get configuration atleast once at start up
+                    
+                    TODO: TODO: consider refactoring such responsibilities to common service manager config/initialisation server
+                */
             await amazonQServiceManager.handleDidChangeConfiguration()
 
             return {
diff --git a/server/aws-lsp-codewhisperer/src/language-server/netTransform/tests/transformHandler.test.ts b/server/aws-lsp-codewhisperer/src/language-server/netTransform/tests/transformHandler.test.ts
@@ -233,7 +233,7 @@ describe('Test Transform handler ', () => {
         getCredentials: sinon.stub().returns({ token: 'mockedToken' }),
     }
 
-    const mockSdkRuntimeConfigurator: SDKInitializator = Object.assign(
+    const mockSdkInitializator: SDKInitializator = Object.assign(
         // Default callable function for v3 clients
         <T, P>(Ctor: SDKClientConstructorV3<T, P>, current_config: P): T => new Ctor({ ...current_config }),
         // Property for v2 clients
@@ -252,7 +252,8 @@ describe('Test Transform handler ', () => {
                 mockedCredentialsProvider,
                 awsQRegion,
                 awsQEndpointUrl,
-                mockSdkRuntimeConfigurator
+                mockSdkInitializator,
+                mockedLogging
             )
             expect(client).to.be.instanceOf(CodeWhispererStreaming)
         })
@@ -264,7 +265,8 @@ describe('Test Transform handler ', () => {
                 mockedCredentialsProvider,
                 awsQRegion,
                 awsQEndpointUrl,
-                mockSdkRuntimeConfigurator
+                mockSdkInitializator,
+                mockedLogging
             )
             expect(client).to.be.instanceOf(CodeWhispererStreaming)
         })
diff --git a/server/aws-lsp-codewhisperer/src/shared/amazonQServiceManager/AmazonQIAMServiceManager.ts b/server/aws-lsp-codewhisperer/src/shared/amazonQServiceManager/AmazonQIAMServiceManager.ts
@@ -35,6 +35,7 @@ export class AmazonQIAMServiceManager extends BaseAmazonQServiceManager<
             this.cachedCodewhispererService = new CodeWhispererServiceIAM(
                 this.features.credentialsProvider,
                 this.features.workspace,
+                this.features.logging,
                 this.region,
                 this.endpoint,
                 this.features.sdkInitializator
@@ -51,6 +52,7 @@ export class AmazonQIAMServiceManager extends BaseAmazonQServiceManager<
             this.cachedStreamingClient = new StreamingClientServiceIAM(
                 this.features.credentialsProvider,
                 this.features.sdkInitializator,
+                this.features.logging,
                 this.region,
                 this.endpoint
             )
diff --git a/server/aws-lsp-codewhisperer/src/shared/amazonQServiceManager/AmazonQTokenServiceManager.ts b/server/aws-lsp-codewhisperer/src/shared/amazonQServiceManager/AmazonQTokenServiceManager.ts
@@ -481,6 +481,7 @@ export class AmazonQTokenServiceManager extends BaseAmazonQServiceManager<
         const service = new CodeWhispererServiceToken(
             this.features.credentialsProvider,
             this.features.workspace,
+            this.features.logging,
             region,
             endpoint,
             this.features.sdkInitializator
@@ -508,6 +509,7 @@ export class AmazonQTokenServiceManager extends BaseAmazonQServiceManager<
         const streamingClient = new StreamingClientServiceToken(
             this.features.credentialsProvider,
             this.features.sdkInitializator,
+            this.features.logging,
             region,
             endpoint,
             this.getCustomUserAgent()
diff --git a/server/aws-lsp-codewhisperer/src/shared/codeWhispererService.ts b/server/aws-lsp-codewhisperer/src/shared/codeWhispererService.ts
@@ -3,6 +3,7 @@ import {
     CredentialsProvider,
     CredentialsType,
     Workspace,
+    Logging,
     SDKInitializator,
 } from '@aws/language-server-runtimes/server-interface'
 import { AWSError, ConfigurationOptions, CredentialProviderChain, Credentials } from 'aws-sdk'
@@ -97,6 +98,7 @@ export class CodeWhispererServiceIAM extends CodeWhispererServiceBase {
     constructor(
         credentialsProvider: CredentialsProvider,
         workspace: Workspace,
+        logging: Logging,
         codeWhispererRegion: string,
         codeWhispererEndpoint: string,
         sdkInitializator: SDKInitializator
@@ -109,7 +111,7 @@ export class CodeWhispererServiceIAM extends CodeWhispererServiceBase {
                 () => credentialsProvider.getCredentials('iam') as Credentials,
             ]),
         }
-        this.client = createCodeWhispererSigv4Client(options, sdkInitializator)
+        this.client = createCodeWhispererSigv4Client(options, sdkInitializator, logging)
         // Avoid overwriting any existing client listeners
         const clientRequestListeners = this.client.setupRequestListeners
         this.client.setupRequestListeners = (request: Request<unknown, AWSError>) => {
@@ -153,6 +155,7 @@ export class CodeWhispererServiceToken extends CodeWhispererServiceBase {
     constructor(
         credentialsProvider: CredentialsProvider,
         workspace: Workspace,
+        logging: Logging,
         codeWhispererRegion: string,
         codeWhispererEndpoint: string,
         sdkInitializator: SDKInitializator
@@ -178,7 +181,7 @@ export class CodeWhispererServiceToken extends CodeWhispererServiceBase {
                 },
             ],
         }
-        this.client = createCodeWhispererTokenClient(options, sdkInitializator)
+        this.client = createCodeWhispererTokenClient(options, sdkInitializator, logging)
     }
 
     getCredentialsType(): CredentialsType {
diff --git a/server/aws-lsp-codewhisperer/src/shared/proxy-server.ts b/server/aws-lsp-codewhisperer/src/shared/proxy-server.ts
@@ -16,10 +16,11 @@ export const CodeWhispererServerIAMProxy = CodewhispererServerFactory(initBaseIA
 export const CodeWhispererSecurityScanServerTokenProxy = SecurityScanServerToken()
 
 export const QNetTransformServerTokenProxy = QNetTransformServerToken(
-    (credentialsProvider, workspace, awsQRegion, awsQEndpointUrl, sdkInitializator) => {
+    (credentialsProvider, workspace, logging, awsQRegion, awsQEndpointUrl, sdkInitializator) => {
         return new CodeWhispererServiceToken(
             credentialsProvider,
             workspace,
+            logging,
             awsQRegion,
             awsQEndpointUrl,
             sdkInitializator
diff --git a/server/aws-lsp-codewhisperer/src/shared/streamingClientService.test.ts b/server/aws-lsp-codewhisperer/src/shared/streamingClientService.test.ts
@@ -52,6 +52,7 @@ describe('StreamingClientService', () => {
         streamingClientService = new StreamingClientServiceToken(
             features.credentialsProvider,
             features.sdkInitializator,
+            features.logging,
             DEFAULT_AWS_Q_REGION,
             DEFAULT_AWS_Q_ENDPOINT_URL,
             'some-user-agent'
diff --git a/server/aws-lsp-codewhisperer/src/shared/streamingClientService.ts b/server/aws-lsp-codewhisperer/src/shared/streamingClientService.ts
@@ -10,7 +10,7 @@ import {
     SendMessageCommandInput as SendMessageCommandInputQDeveloperStreaming,
     SendMessageCommandOutput as SendMessageCommandOutputQDeveloperStreaming,
 } from '@amzn/amazon-q-developer-streaming-client'
-import { CredentialsProvider, SDKInitializator } from '@aws/language-server-runtimes/server-interface'
+import { CredentialsProvider, SDKInitializator, Logging } from '@aws/language-server-runtimes/server-interface'
 import { getBearerTokenFromProvider } from './utils'
 import { ConfiguredRetryStrategy } from '@aws-sdk/util-retry'
 import { CredentialProviderChain, Credentials } from 'aws-sdk'
@@ -54,6 +54,7 @@ export class StreamingClientServiceToken extends StreamingClientServiceBase {
     constructor(
         credentialsProvider: CredentialsProvider,
         sdkInitializator: SDKInitializator,
+        logging: Logging,
         region: string,
         endpoint: string,
         customUserAgent: string
@@ -65,6 +66,9 @@ export class StreamingClientServiceToken extends StreamingClientServiceBase {
             return { token, expiration: new Date() }
         }
 
+        logging.log(
+            `Passing client for class CodeWhispererStreaming to sdkInitializator (v3) for additional setup (e.g. proxy)`
+        )
         this.client = sdkInitializator(CodeWhispererStreaming, {
             region,
             endpoint,
@@ -120,10 +124,16 @@ export class StreamingClientServiceIAM extends StreamingClientServiceBase {
     constructor(
         credentialsProvider: CredentialsProvider,
         sdkInitializator: SDKInitializator,
+        logging: Logging,
         region: string,
         endpoint: string
     ) {
         super(region, endpoint)
+
+        logging.log(
+            `Passing client for class QDeveloperStreaming to sdkInitializator (v3) for additional setup (e.g. proxy)`
+        )
+
         this.client = sdkInitializator(QDeveloperStreaming, {
             region: region,
             endpoint: endpoint,
