Merge master into feature/serverlessland

packages/core/src/codewhisperer/activation.ts

@@ -83,7 +83,6 @@ import { CodeWhispererCommandBackend, CodeWhispererCommandDeclarations } from '.
 import { SecurityIssueHoverProvider } from './service/securityIssueHoverProvider'
 import { SecurityIssueCodeActionProvider } from './service/securityIssueCodeActionProvider'
 import { listCodeWhispererCommands } from './ui/statusBarMenu'
-import { updateUserProxyUrl } from './client/agent'
 import { Container } from './service/serviceContainer'
 import { debounceStartSecurityScan } from './commands/startSecurityScan'
 import { securityScanLanguageContext } from './util/securityScanLanguageContext'
@@ -201,10 +200,6 @@ export async function activate(context: ExtContext): Promise<void> {
                     })
             }
 
-            if (configurationChangeEvent.affectsConfiguration('http.proxy')) {
-                updateUserProxyUrl()
-            }
-
             if (configurationChangeEvent.affectsConfiguration('amazonQ.ignoredSecurityIssues')) {
                 const ignoredIssues = CodeWhispererSettings.instance.getIgnoredSecurityIssues()
                 toggleIssuesVisibility((issue) => !ignoredIssues.includes(issue.title))

packages/core/src/codewhisperer/client/codewhisperer.ts

@@ -20,11 +20,11 @@ import userApiConfig = require('./user-service-2.json')
 import { session } from '../util/codeWhispererSession'
 import { getLogger } from '../../shared/logger/logger'
 import { indent } from '../../shared/utilities/textUtilities'
-import { keepAliveHeader } from './agent'
 import { getClientId, getOptOutPreference, getOperatingSystem } from '../../shared/telemetry/util'
 import { extensionVersion, getServiceEnvVarConfig } from '../../shared/vscode/env'
 import { DevSettings } from '../../shared/settings'
 
+const keepAliveHeader = 'keep-alive-codewhisperer'
 export interface CodeWhispererConfig {
     readonly region: string
     readonly endpoint: string