Merge branch 'master' of github.com:microsoft/vscode

src/vs/platform/userDataSync/common/userDataSyncService.ts

@@ -22,8 +22,9 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { IHeaders } from 'vs/base/parts/request/common/request';
 import { generateUuid } from 'vs/base/common/uuid';
 
-type SyncClassification = {
+type SyncErrorClassification = {
 	resource?: { classification: 'SystemMetaData', purpose: 'FeatureInsight', isMeasurement: true };
+	executionId?: { classification: 'SystemMetaData', purpose: 'FeatureInsight', isMeasurement: true };
 };
 
 const LAST_SYNC_TIME_KEY = 'sync.lastSyncTime';
@@ -103,7 +104,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 			this.updateLastSyncTime();
 		} catch (error) {
 			if (error instanceof UserDataSyncError) {
-				this.telemetryService.publicLog2<{ resource?: string }, SyncClassification>(`sync/error/${error.code}`, { resource: error.resource });
+				this.telemetryService.publicLog2<{ resource?: string, executionId?: string }, SyncErrorClassification>(`sync/error/${error.code}`, { resource: error.resource });
 			}
 			throw error;
 		}
@@ -122,7 +123,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 			this.updateLastSyncTime();
 		} catch (error) {
 			if (error instanceof UserDataSyncError) {
-				this.telemetryService.publicLog2<{ resource?: string }, SyncClassification>(`sync/error/${error.code}`, { resource: error.resource });
+				this.telemetryService.publicLog2<{ resource?: string, executionId?: string }, SyncErrorClassification>(`sync/error/${error.code}`, { resource: error.resource });
 			}
 			throw error;
 		}
@@ -136,8 +137,16 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 
 	async createSyncTask(): Promise<ISyncTask> {
 		this.telemetryService.publicLog2('sync/getmanifest');
-		const syncHeaders: IHeaders = { 'X-Execution-Id': generateUuid() };
-		const manifest = await this.userDataSyncStoreService.manifest(syncHeaders);
+		const executionId = generateUuid();
+		let manifest: IUserDataManifest | null;
+		try {
+			manifest = await this.userDataSyncStoreService.manifest({ 'X-Execution-Id': executionId });
+		} catch (error) {
+			if (error instanceof UserDataSyncError) {
+				this.telemetryService.publicLog2<{ resource?: string, executionId?: string }, SyncErrorClassification>(`sync/error/${error.code}`, { resource: error.resource, executionId });
+			}
+			throw error;
+		}
 
 		let executed = false;
 		const that = this;
@@ -147,12 +156,12 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 				if (executed) {
 					throw new Error('Can run a task only once');
 				}
-				return that.doSync(manifest, syncHeaders, token);
+				return that.doSync(manifest, executionId, token);
 			}
 		};
 	}
 
-	private async doSync(manifest: IUserDataManifest | null, syncHeaders: IHeaders, token: CancellationToken): Promise<void> {
+	private async doSync(manifest: IUserDataManifest | null, executionId: string, token: CancellationToken): Promise<void> {
 		await this.checkEnablement();
 
 		if (!this.recoveredSettings) {
@@ -173,6 +182,8 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 				this.setStatus(SyncStatus.Syncing);
 			}
 
+			const syncHeaders: IHeaders = { 'X-Execution-Id': executionId };
+
 			for (const synchroniser of this.synchronisers) {
 				// Return if cancellation is requested
 				if (token.isCancellationRequested) {
@@ -191,7 +202,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 			this.updateLastSyncTime();
 		} catch (error) {
 			if (error instanceof UserDataSyncError) {
-				this.telemetryService.publicLog2<{ resource?: string }, SyncClassification>(`sync/error/${error.code}`, { resource: error.resource });
+				this.telemetryService.publicLog2<{ resource?: string, executionId?: string }, SyncErrorClassification>(`sync/error/${error.code}`, { resource: error.resource, executionId });
 			}
 			throw error;
 		} finally {