💄

Author: mustard-mh

src/vs/gitpod/browser/gitpodInsightsAppender.ts

@@ -109,16 +109,16 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 			instanceId: gitpodWsInfo.instanceId,
 			errorStack: error.callstack,
 			userId: '',
-			component: 'vscode-workbench',
-			version: this._baseProperties.appName + '-' + this._baseProperties.version,  // Align to https://github.com/gitpod-io/gitpod/blob/fe26d2613df2f85667829c9de86bbeb187dc81cf/components/ide/code/leeway.Dockerfile#L75
+			component: 'vscode-web',
+			version: this._baseProperties.version,
 			properties: {
 				error_name: error.uncaught_error_name,
 				error_message: error.msg,
 				...this._baseProperties,
 			}
 		};
 		if (this.devMode && this.productService.gitpodPreview?.log?.errorReports) {
-			console.log('Gitpod Metrics: ', JSON.stringify(params, undefined, 2));
+			console.log('Gitpod Error Reports: ', JSON.stringify(params, undefined, 2));
 		}
 		const doSend = await this.getSendErrorReports();
 		if (doSend) {
@@ -156,13 +156,6 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 		if (this._gitpodWsInfo) {
 			return this._gitpodWsInfo;
 		}
-		if (this.devMode) {
-			return this._gitpodWsInfo = (async () => ({
-				gitpodHost: this.productService.gitpodPreview?.host ?? 'gitpod-staging.com',
-				workspaceId: 'fake-workspace-id',
-				instanceId: 'fake-instance-id',
-			}))();
-		}
 		return this._gitpodWsInfo = (async () => {
 			const infoResponse = await fetch(window.location.protocol + '//' + window.location.host + '/_supervisor/v1/info/workspace', {
 				credentials: 'include'
@@ -172,7 +165,7 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 			}
 			const info: SupervisorWorkspaceInfo = await infoResponse.json();
 			return {
-				gitpodHost: new URL(info.gitpodHost).host,
+				gitpodHost: this.devMode ? this.productService.gitpodPreview?.host ?? 'gitpod-staging.com' : new URL(info.gitpodHost).host,
 				instanceId: info.instanceId,
 				workspaceId: info.workspaceId
 			};

src/vs/gitpod/node/gitpodInsightsAppender.ts

@@ -46,7 +46,7 @@ class SupervisorConnection {
 }
 
 type GitpodConnection = Omit<GitpodServiceImpl<GitpodClient, GitpodServer>, 'server'> & {
-	server: Pick<GitpodServer, 'trackEvent'>;
+	server: Pick<GitpodServer, 'trackEvent' | 'getLoggedInUser'>;
 };
 
 export class GitpodInsightsAppender implements ITelemetryAppender {
@@ -56,6 +56,7 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 	private _baseProperties: { appName: string; uiKind: 'web'; version: string };
 	private readonly supervisor = new SupervisorConnection();
 	private readonly devMode = this.productName.endsWith(' Dev');
+	private gitpodUserId: string | undefined;
 
 	constructor(private productName: string, private productVersion: string, private readonly gitpodPreview?: IGitpodPreviewConfiguration) {
 		this._asyncAIClient = null;
@@ -64,9 +65,12 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 			uiKind: 'web',
 			version: productVersion,
 		};
+		this._withAIClient(async (client) => {
+			this.gitpodUserId = (await client.getLoggedInUser()).id;
+		});
 	}
 
-	private _withAIClient(callback: (aiClient: Pick<GitpodServer, 'trackEvent'>) => void): void {
+	private _withAIClient(callback: (aiClient: Pick<GitpodServer, 'trackEvent' | 'getLoggedInUser'>) => void): void {
 		if (!this._asyncAIClient) {
 			this._asyncAIClient = this.getSupervisorData().then(
 				(supervisorData) => {
@@ -151,8 +155,11 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 		req.setWorkspaceId(this._defaultData['workspaceId']);
 		req.setInstanceId(this._defaultData['instanceId']);
 		req.setErrorStack(error.callstack);
-		req.setComponent('vscode-workbench');
-		req.setVersion(this.productName + '-' + this.productVersion); // Align to https://github.com/gitpod-io/gitpod/blob/fe26d2613df2f85667829c9de86bbeb187dc81cf/components/ide/code/leeway.Dockerfile#L75
+		if (this.gitpodUserId) {
+			req.setUserId(this.gitpodUserId);
+		}
+		req.setComponent('vscode-server');
+		req.setVersion(this.productVersion);
 		req.getPropertiesMap().set('error_name', error.uncaught_error_name || '');
 		req.getPropertiesMap().set('error_message', error.msg || '');
 		req.getPropertiesMap().set('appName', this._baseProperties.appName);
@@ -241,6 +248,7 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 		getTokenRequest.setKind('gitpod');
 		getTokenRequest.setHost(gitpodApiHost);
 		getTokenRequest.addScope('function:trackEvent');
+		getTokenRequest.addScope('function:getLoggedInUser');
 
 
 		const supervisor = this.supervisor;