feat(telemetry): add dynamic product names for multiple extensions (aws#4742)

Author: hayemaxi

packages/amazonq/src/extensionShared.ts

@@ -89,7 +89,7 @@ export async function activateShared(context: vscode.ExtensionContext) {
     globals.logOutputChannel = qLogChannel
     globals.loginManager = new LoginManager(globals.awsContext, new CredentialsStore())
 
-    await activateTelemetry(context, globals.awsContext, Settings.instance)
+    await activateTelemetry(context, globals.awsContext, Settings.instance, 'Amazon Q For VS Code')
 
     await initializeAuth(context, globals.loginManager, contextPrefix, undefined)
 

packages/core/src/extensionShared.ts

@@ -110,7 +110,7 @@ export async function activateShared(context: vscode.ExtensionContext, contextPr
     globals.regionProvider = RegionProvider.fromEndpointsProvider(makeEndpointsProvider())
 
     // telemetry
-    await activateTelemetry(context, globals.awsContext, Settings.instance)
+    await activateTelemetry(context, globals.awsContext, Settings.instance, 'AWS Toolkit For VS Code')
 
     // Create this now, but don't call vscode.window.registerUriHandler() until after all
     // Toolkit services have a chance to register their path handlers. #4105

packages/core/src/shared/telemetry/activation.ts

@@ -16,6 +16,8 @@ import { getComputeRegion, getIdeProperties, isCloud9 } from '../extensionUtilit
 import { openSettings, Settings } from '../settings'
 import { TelemetryConfig, setupTelemetryId } from './util'
 import { isAutomation, isReleaseVersion } from '../vscode/env'
+import { AWSProduct } from './clienttelemetry'
+import { DefaultTelemetryClient } from './telemetryClient'
 
 export const noticeResponseViewSettings = localize('AWS.telemetry.notificationViewSettings', 'Settings')
 export const noticeResponseOk = localize('AWS.telemetry.notificationOk', 'OK')
@@ -33,8 +35,14 @@ const CURRENT_TELEMETRY_NOTICE_VERSION = 2 // eslint-disable-line @typescript-es
 /**
  * Sets up the Metrics system and initializes globals.telemetry
  */
-export async function activate(extensionContext: vscode.ExtensionContext, awsContext: AwsContext, settings: Settings) {
+export async function activate(
+    extensionContext: vscode.ExtensionContext,
+    awsContext: AwsContext,
+    settings: Settings,
+    productName: AWSProduct
+) {
     const config = new TelemetryConfig(settings)
+    DefaultTelemetryClient.productName = productName
     globals.telemetry = await DefaultTelemetryService.create(extensionContext, awsContext, getComputeRegion())
 
     try {

packages/core/src/shared/telemetry/service-2.json

@@ -45,7 +45,9 @@
         "AWS Toolkit For JetBrains",
         "AWS Toolkit For Eclipse",
         "AWS Toolkit For VisualStudio",
-        "AWS Toolkit For VS Code"
+        "AWS Toolkit For VS Code",
+        "Amazon Q For JetBrains",
+        "Amazon Q For VS Code"
       ]
     },
     "AWSProductVersion":{

packages/core/src/shared/telemetry/telemetryClient.ts

@@ -11,7 +11,7 @@ import * as vscode from 'vscode'
 import { extensionVersion, isAutomation } from '../vscode/env'
 import { getLogger } from '../logger'
 import * as ClientTelemetry from './clienttelemetry'
-import { MetricDatum } from './clienttelemetry'
+import { AWSProduct, MetricDatum } from './clienttelemetry'
 import apiConfig = require('./service-2.json')
 import { ServiceConfigurationOptions } from 'aws-sdk/lib/service'
 import globals from '../extensionGlobals'
@@ -56,7 +56,20 @@ export type TelemetryClient = ClassToInterfaceType<DefaultTelemetryClient>
 export class DefaultTelemetryClient implements TelemetryClient {
     private static readonly defaultIdentityPool = 'us-east-1:820fd6d1-95c0-4ca4-bffb-3f01d32da842'
     private static readonly defaultTelemetryEndpoint = 'https://client-telemetry.us-east-1.amazonaws.com'
-    private static readonly productName = 'AWS Toolkit For VS Code'
+
+    static #productName: AWSProduct
+
+    public static set productName(val: AWSProduct) {
+        getLogger().info(`Telemetry product: ${val}`)
+        this.#productName = val
+    }
+
+    public static get productName() {
+        if (!this.#productName) {
+            throw new Error('DefaultTelemetryClient.productName is not initialized.')
+        }
+        return this.#productName
+    }
 
     private static initializeConfig(): TelemetryConfiguration {
         const settings = DevSettings.instance