more GDPR classification

microsoft · kieferrm · Sep 26, 2017 · Sep 4, 2017 · Sep 4, 2017 · Sep 4, 2017
commit ca8b4121837dd8e747f56329d2ee94fd66ba84e0
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -300,6 +300,12 @@ export class ExtensionService implements IExtensionService {
 				...this._extensionEnablementService.getWorkspaceDisabledExtensions()
 			];
 
+			/* __GDPR__
+			   "extensionsScanned" : {
+				  "totalCount" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				  "disabledCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+			   }
+			 */
 			this._telemetryService.publicLog('extensionsScanned', {
 				totalCount: installedExtensions.length,
 				disabledCount: disabledExtensions.length
@@ -347,6 +353,14 @@ export class ExtensionService implements IExtensionService {
 
 		if (!this._isDev && msg.extensionId) {
 			const { type, extensionId, extensionPointId, message } = msg;
+			/* __GDPR__
+			   "extensionsMessage" : {
+				  "type" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				  "extensionId": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				  "extensionPointId": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+				  "message": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+			   }
+			 */
 			this._telemetryService.publicLog('extensionsMessage', {
 				type, extensionId, extensionPointId, message
 			});

diff --git a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
@@ -318,6 +318,11 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 
 		keybindingsTelemetry(telemetryService, this);
 		let data = KeyboardMapperFactory.INSTANCE.getCurrentKeyboardLayout();
+		/* __GDPR__
+		   "keyboardLayout" : {
+			  "currentKeyboardLayout" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		   }
+		 */
 		telemetryService.publicLog('keyboardLayout', {
 			currentKeyboardLayout: data
 		});
@@ -405,6 +410,11 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 		if (!isFirstTime) {
 			let cnt = extraUserKeybindings.length;
 
+			/* __GDPR__
+			   "customKeybindingsChanged" : {
+				  "keyCount" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			   }
+			 */
 			this.telemetryService.publicLog('customKeybindingsChanged', {
 				keyCount: cnt
 			});

diff --git a/src/vs/workbench/services/message/browser/messageList.ts b/src/vs/workbench/services/message/browser/messageList.ts
@@ -304,6 +304,12 @@ export class MessageList {
 
 								DOM.EventHelper.stop(e, true);
 
+								/* __GDPR__
+								   "workbenchActionExecuted" : {
+									  "id" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+									  "from": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+								   }
+								 */
 								this.telemetryService.publicLog('workbenchActionExecuted', { id: action.id, from: 'message' });
 
 								(action.run() || TPromise.as(null))

diff --git a/src/vs/workbench/services/telemetry/common/workspaceStats.ts b/src/vs/workbench/services/telemetry/common/workspaceStats.ts
@@ -144,6 +144,34 @@ export class WorkspaceStats {
 		return arr.some(v => v.search(regEx) > -1) || undefined;
 	}
 
+	/* __GDPR__FRAGMENT__
+	   "WorkspaceTags" : {
+		  "workbench.filesToOpen" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "workbench.filesToCreate" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "workbench.filesToDiff" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "workbench.roots" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.empty" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.grunt" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.gulp" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.jake" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.tsconfig" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.jsconfig" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.config.xml" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.vsc.extension" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.ASP5" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.sln" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.unity" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.npm" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.bower" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.yeoman.code.ext" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.cordova.high" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.cordova.low" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.xamarin.android" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.xamarin.ios" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.android.cpp" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" },
+		  "workbench.reactNative" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" }
+	   }
+	 */
 	private getWorkspaceTags(configuration: IWindowConfiguration): TPromise<Tags> {
 		const tags: Tags = Object.create(null);
 
@@ -245,6 +273,13 @@ export class WorkspaceStats {
 
 	public reportWorkspaceTags(configuration: IWindowConfiguration): void {
 		this.getWorkspaceTags(configuration).then((tags) => {
+			/* __GDPR__
+			   "workspace.tags" : {
+				   "${include}": [
+					  "${WorkspaceTags}"
+				   ]
+			   }
+			 */
 			this.telemetryService.publicLog('workspce.tags', tags);
 		}, error => onUnexpectedError(error));
 	}
@@ -261,6 +296,11 @@ export class WorkspaceStats {
 			const set = domains.reduce((set, list) => list.reduce((set, item) => set.add(item), set), new Set<string>());
 			const list: string[] = [];
 			set.forEach(item => list.push(item));
+			/* __GDPR__
+			   "workspace.remotes" : {
+				  "domains" : { "endPoint": "none", "classification": "CustomerContent", "purpose": "FeatureInsight" }
+			   }
+			 */
 			this.telemetryService.publicLog('workspace.remotes', { domains: list.sort() });
 		}, onUnexpectedError);
 	}
@@ -273,9 +313,21 @@ export class WorkspaceStats {
 				content => getHashedRemotes(content.value),
 				err => [] // ignore missing or binary file
 			);
-		})).then(hashedRemotes => this.telemetryService.publicLog('workspace.hashedRemotes', { remotes: hashedRemotes }), onUnexpectedError);
+		})).then(hashedRemotes => {
+			/* __GDPR__
+			   "workspace.hashedRemotes" : {
+				  "remotes" : { "endPoint": "none", "classification": "CustomerData", "purpose": "FeatureInsight" }
+			   }
+			 */
+			this.telemetryService.publicLog('workspace.hashedRemotes', { remotes: hashedRemotes });
+		}, onUnexpectedError);
 	}
 
+	/* __GDPR__FRAGMENT__
+	   "AzureTags" : {
+		  "node" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	   }
+	 */
 	private reportAzureNode(workspaceUris: URI[], tags: Tags): TPromise<Tags> {
 		// TODO: should also work for `node_modules` folders several levels down
 		const uris = workspaceUris.map(workspaceUri => {
@@ -296,6 +348,12 @@ export class WorkspaceStats {
 			});
 	}
 
+
+	/* __GDPR__FRAGMENT__
+	   "AzureTags" : {
+		  "java" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	   }
+	 */
 	private reportAzureJava(workspaceUris: URI[], tags: Tags): TPromise<Tags> {
 		return TPromise.join(workspaceUris.map(workspaceUri => {
 			const path = workspaceUri.path;
@@ -318,6 +376,13 @@ export class WorkspaceStats {
 			return this.reportAzureJava(uris, tags);
 		}).then((tags) => {
 			if (Object.keys(tags).length) {
+				/* __GDPR__
+				   "workspace.azure" : {
+					   "${include}": [
+						  "${AzureTags}"
+					   ]
+				   }
+				 */
 				this.telemetryService.publicLog('workspace.azure', tags);
 			}
 		}).then(null, onUnexpectedError);

diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -367,6 +367,13 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		diag('load() - resolved content', this.resource, new Date());
 
 		// Telemetry
+		/* __GDPR__
+		   "fileGet" : {
+			  "mimeType" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "ext": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "path": { "endPoint": "none", "classification": "CustomerContent", "purpose": "FeatureInsight" }
+		   }
+		 */
 		this.telemetryService.publicLog('fileGet', { mimeType: guessMimeTypes(this.resource.fsPath).join(', '), ext: paths.extname(this.resource.fsPath), path: anonymize(this.resource.fsPath) });
 
 		// Update our resolved disk stat model
@@ -698,8 +705,17 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 
 				// Telemetry
 				if (this.isSettingsFile()) {
+					/* __GDPR__
+					   "settingsWritten" : {}
+					 */
 					this.telemetryService.publicLog('settingsWritten'); // Do not log write to user settings.json and .vscode folder as a filePUT event as it ruins our JSON usage data
 				} else {
+					/* __GDPR__
+					   "filePUT" : {
+						  "mimeType" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						  "ext": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					   }
+					 */
 					this.telemetryService.publicLog('filePUT', { mimeType: guessMimeTypes(this.resource.fsPath).join(', '), ext: paths.extname(this.lastResolvedDiskStat.resource.fsPath) });
 				}
 

diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts
@@ -87,6 +87,13 @@ export abstract class TextFileService implements ITextFileService {
 
 		this.onConfigurationChange(configuration);
 
+		/* __GDPR__
+		   "autoSave" : {
+			   "${include}": [
+				  "${IAutoSaveConfiguration}"
+			   ]
+		   }
+		 */
 		this.telemetryService.publicLog('autoSave', this.getAutoSaveConfiguration());
 
 		this.registerListeners();
@@ -211,6 +218,13 @@ export abstract class TextFileService implements ITextFileService {
 			}
 
 			// Telemetry
+			/* __GDPR__
+			   "hotExit:triggered" : {
+				  "reason" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				  "windowCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				  "fileCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			   }
+			 */
 			this.telemetryService.publicLog('hotExit:triggered', { reason, windowCount, fileCount: dirtyToBackup.length });
 
 			// Backup

diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -100,6 +100,14 @@ export interface IResult {
 	success?: boolean;
 }
 
+/* __GDPR__FRAGMENT__
+   "IAutoSaveConfiguration" : {
+	  "autoSaveDelay" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+	  "autoSaveFocusChange": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+	  "autoSaveApplicationChange": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+   }
+ */
+
 export interface IAutoSaveConfiguration {
 	autoSaveDelay: number;
 	autoSaveFocusChange: boolean;

diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
@@ -642,6 +642,15 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		if (themeData) {
 			let key = themeType + themeData.extensionId;
 			if (!this.themeExtensionsActivated.get(key)) {
+				/* __GDPR__
+				   "activatePlugin" : {
+					  "id" : { "endPoint": "none", "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+					  "name": { "endPoint": "none", "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+					  "isBuiltin": { "endPoint": ",none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					  "publisherDisplayName": { "endPoint": "none", "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+					  "themeId": { "endPoint": "none", "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+				   }
+				 */
 				this.telemetryService.publicLog('activatePlugin', {
 					id: themeData.extensionId,
 					name: themeData.extensionName,