@aws/lsp-codewhisperer 0.0.73 → 0.0.75

package/out/shared/telemetryUtils.js

@@ -74,13 +74,17 @@ const getOperatingSystem = (platform) => {
 // Compute UserContext object for sendTelemetryEvent API call.
 // Do not return context when unknown IDE or Operating system is found.
 // This behaviour may change in the future, when API will accept not enumerated values in API definition.
-const makeUserContextObject = (initializeParams, platform, product) => {
+const makeUserContextObject = (initializeParams, platform, product, serverInfo) => {
+    const ide = (0, exports.getIdeCategory)(initializeParams);
+    const ideVersion = initializeParams.initializationOptions?.aws?.clientInfo?.version || initializeParams.clientInfo?.version;
+    const pluginVersion = initializeParams.initializationOptions?.aws?.clientInfo?.extension?.version || '';
+    const lspVersion = serverInfo.version ?? '';
     const userContext = {
-        ideCategory: (0, exports.getIdeCategory)(initializeParams),
+        ideCategory: ide,
         operatingSystem: getOperatingSystem(platform),
         product: product,
         clientId: initializeParams.initializationOptions?.aws?.clientInfo?.clientId,
-        ideVersion: initializeParams.initializationOptions?.aws?.clientInfo?.version || initializeParams.clientInfo?.version,
+        ideVersion: `ide=${ideVersion};plugin=${pluginVersion};lsp=${lspVersion}`,
     };
     if (userContext.ideCategory === 'UNKNOWN' || userContext.operatingSystem === 'UNKNOWN') {
         return;

package/out/shared/telemetryUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"telemetryUtils.js","sourceRoot":"","sources":["../../src/shared/telemetryUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"telemetryUtils.js","sourceRoot":"","sources":["../../src/shared/telemetryUtils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@aws/lsp-codewhisperer",
-    "version": "0.0.73",
+    "version": "0.0.75",
     "description": "CodeWhisperer Language Server",
     "main": "out/index.js",
     "repository": {
@@ -36,8 +36,8 @@
         "@aws-sdk/util-arn-parser": "^3.723.0",
         "@aws-sdk/util-retry": "^3.374.0",
         "@aws/chat-client-ui-types": "^0.1.56",
-        "@aws/language-server-runtimes": "^0.2.123",
-        "@aws/lsp-core": "^0.0.13",
+        "@aws/language-server-runtimes": "^0.2.126",
+        "@aws/lsp-core": "^0.0.14",
         "@modelcontextprotocol/sdk": "^1.15.0",
         "@smithy/node-http-handler": "^2.5.0",
         "adm-zip": "^0.5.10",