Include server id in telemetry and in user issue reports

mjbvz · mjbvz · commit 44304010284f · 2020-08-03T16:03:34.000-07:00
From microsoft/TypeScript#39795 (comment)
diff --git a/extensions/typescript-language-features/src/tsServer/serverError.ts b/extensions/typescript-language-features/src/tsServer/serverError.ts
@@ -18,7 +18,7 @@ export class TypeScriptServerError extends Error {
 	}
 
 	private constructor(
-		serverId: string,
+		public readonly serverId: string,
 		public readonly version: TypeScriptVersion,
 		private readonly response: Proto.Response,
 		public readonly serverMessage: string | undefined,
@@ -38,11 +38,13 @@ export class TypeScriptServerError extends Error {
 		/* __GDPR__FRAGMENT__
 			"TypeScriptRequestErrorProperties" : {
 				"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				"sanitizedstack" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+				"serverid" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				"sanitizedstack" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
 			}
 		*/
 		return {
 			command: this.serverCommand,
+			serverid: this.serverId,
 			sanitizedstack: this.sanitizedStack || '',
 		} as const;
 	}
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -963,6 +963,8 @@ After enabling this setting, future crash reports will include the server log.`)
 
 	sections.push(`**TS Server Error Stack**
 
+Server: \`${error.serverId}\`
+
 \`\`\`
 ${error.serverStack}
 \`\`\``);
