Replace machine ID from survey with session ID (#11844)

* Replace machin ID from survey with session ID

* Removing space from open brackets

* Fix tests

* Undo launch.json changes

Co-authored-by: Karthik Nadig <[email protected]>

Author: luabud

src/client/activation/extensionSurvey.ts

@@ -114,7 +114,7 @@ export class ExtensionSurveyPrompt implements IExtensionSingleActivationService
             o: encodeURIComponent(this.platformService.osType), // platform
             v: encodeURIComponent(this.appEnvironment.vscodeVersion),
             e: encodeURIComponent(this.appEnvironment.packageJson.version), // extension version
-            m: encodeURIComponent(this.appEnvironment.machineId)
+            m: encodeURIComponent(this.appEnvironment.sessionId)
         });
         const url = `https://aka.ms/AA5rjx5?${query}`;
         this.browserService.launch(url);

src/test/activation/extensionSurvey.unit.test.ts

@@ -227,7 +227,7 @@ suite('Extension survey prompt - showSurvey()', () => {
             version: 'extensionVersion'
         };
         const prompts = [LanguageService.bannerLabelYes(), ExtensionSurveyBanner.maybeLater(), Common.doNotShowAgain()];
-        const expectedUrl = `https://aka.ms/AA5rjx5?o=Windows&v=vscodeVersion&e=extensionVersion&m=machineId`;
+        const expectedUrl = `https://aka.ms/AA5rjx5?o=Windows&v=vscodeVersion&e=extensionVersion&m=sessionId`;
         appEnvironment
             .setup((a) => a.packageJson)
             .returns(() => packageJson)
@@ -237,8 +237,8 @@ suite('Extension survey prompt - showSurvey()', () => {
             .returns(() => 'vscodeVersion')
             .verifiable(TypeMoq.Times.once());
         appEnvironment
-            .setup((a) => a.machineId)
-            .returns(() => 'machineId')
+            .setup((a) => a.sessionId)
+            .returns(() => 'sessionId')
             .verifiable(TypeMoq.Times.once());
         platformService
             .setup((a) => a.osType)