more GDPR classification

microsoft · kieferrm · Sep 26, 2017 · Sep 4, 2017 · Sep 4, 2017 · Sep 4, 2017
commit cc1255cf12c9051004422f91cf3cbe9dd5b0d35f
diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
@@ -140,6 +140,11 @@ export class MainThreadEditors implements MainThreadEditorsShape {
 
 	$tryShowEditor(id: string, position: EditorPosition): TPromise<void> {
 		// check how often this is used
+		/* __GDPR__
+		   "api.deprecated" : {
+			  "function" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		   }
+		 */
 		this._telemetryService.publicLog('api.deprecated', { function: 'TextEditor.show' });
 
 		let mainThreadEditor = this._documentsAndEditors.getEditor(id);
@@ -155,6 +160,11 @@ export class MainThreadEditors implements MainThreadEditorsShape {
 
 	$tryHideEditor(id: string): TPromise<void> {
 		// check how often this is used
+		/* __GDPR__
+		   "api.deprecated" : {
+			  "function" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		   }
+		 */
 		this._telemetryService.publicLog('api.deprecated', { function: 'TextEditor.hide' });
 
 		let mainThreadEditor = this._documentsAndEditors.getEditor(id);

diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -266,6 +266,11 @@ export class SaveParticipant implements ISaveParticipant {
 		});
 
 		return sequence(promiseFactory).then(() => {
+			/* __GDPR__
+			   "saveParticipantStats" : {
+			   }
+			 */
+			// TODO: We need to move off dynamic property names as we can't declare them statically in the registry.
 			this._telemetryService.publicLog('saveParticipantStats', stats);
 		});
 	}

diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts
@@ -108,6 +108,11 @@ export abstract class Composite extends Component implements IComposite {
 			// Only submit telemetry data when not running from an integration test
 			if (this._telemetryService && this._telemetryService.publicLog) {
 				const eventName: string = 'compositeOpen';
+				/* __GDPR__
+				   "compositeOpen" : {
+					  "composite" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				   }
+				 */
 				this._telemetryService.publicLog(eventName, { composite: this.getId() });
 			}
 		}
@@ -121,6 +126,12 @@ export abstract class Composite extends Component implements IComposite {
 			if (this._telemetryService && this._telemetryService.publicLog) {
 				const eventName: string = 'compositeShown';
 				this._telemetryData.composite = this.getId();
+				/* __GDPR__
+				   "compositeShown" : {
+					  "timeSpent" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					  "composite": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				   }
+				 */
 				this._telemetryService.publicLog(eventName, this._telemetryData);
 			}
 		}

diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts
@@ -309,6 +309,12 @@ export abstract class CompositePart<T extends Composite> extends Part {
 
 				// Log in telemetry
 				if (this.telemetryService) {
+					/* __GDPR__
+					   "workbenchActionExecuted" : {
+						  "id" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						  "from": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					   }
+					 */
 					this.telemetryService.publicLog('workbenchActionExecuted', { id: e.action.id, from: this.nameForTelemetry });
 				}
 			});

diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
@@ -443,6 +443,9 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 
 				// Log this fact in telemetry
 				if (this.telemetryService) {
+					/* __GDPR__
+					   "workbenchEditorMaximized" : {}
+					 */
 					this.telemetryService.publicLog('workbenchEditorMaximized');
 				}
 

diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -166,6 +166,13 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 
 			this.revealIfOpen = editorConfig.revealIfOpen;
 
+			/* __GDPR__
+			   "workbenchEditorConfiguration" : {
+					"${include}": [
+					   "${IWorkbenchEditorConfiguration}"
+					]
+			   }
+			 */
 			this.telemetryService.publicLog('workbenchEditorConfiguration', editorConfig);
 		} else {
 			this.tabOptions = {
@@ -248,10 +255,24 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 	}
 
 	private onEditorOpened(identifier: EditorIdentifier): void {
+		/* __GDPR__
+		   "editorOpened" : {
+			   "${include}": [
+				  "${EditorTelemetryDescriptor}"
+			   ]
+		   }
+		 */
 		this.telemetryService.publicLog('editorOpened', identifier.editor.getTelemetryDescriptor());
 	}
 
 	private onEditorClosed(event: EditorCloseEvent): void {
+		/* __GDPR__
+		   "editorClosed" : {
+			   "${include}": [
+				  "${EditorTelemetryDescriptor}"
+			   ]
+		   }
+		 */
 		this.telemetryService.publicLog('editorClosed', event.editor.getTelemetryDescriptor());
 	}
 

diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -259,6 +259,12 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl
 
 			// Log in telemetry
 			if (this.telemetryService) {
+				/* __GDPR__
+				   "workbenchActionExecuted" : {
+					  "id" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					  "from": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				   }
+				 */
 				this.telemetryService.publicLog('workbenchActionExecuted', { id: e.action.id, from: 'editorPart' });
 			}
 		}));

diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -552,6 +552,12 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		const registry = Registry.as<IQuickOpenRegistry>(Extensions.Quickopen);
 		const handlerDescriptor = registry.getQuickOpenHandler(prefix) || registry.getDefaultQuickOpenHandler();
 
+		/* __GDPR__
+		   "quickOpenWidgetShown" : {
+			  "mode" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "quickNavigate": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		   }
+		 */
 		this.telemetryService.publicLog('quickOpenWidgetShown', { mode: handlerDescriptor.getId(), quickNavigate: quickNavigateConfiguration });
 
 		// Trigger onOpen

diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -293,6 +293,12 @@ class StatusBarEntryItem implements IStatusbarItem {
 			const action = this.instantiationService.createInstance(builtInActionDescriptor.syncDescriptor);
 
 			if (action.enabled) {
+				/* __GDPR__
+				   "workbenchActionExecuted" : {
+					  "id" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					  "from": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				   }
+				 */
 				this.telemetryService.publicLog('workbenchActionExecuted', { id: action.id, from: 'status bar' });
 				(action.run() || TPromise.as(null)).done(() => {
 					action.dispose();

diff --git a/src/vs/workbench/common/actions.ts b/src/vs/workbench/common/actions.ts
@@ -170,6 +170,12 @@ function triggerAndDisposeAction(instantitationService: IInstantiationService, t
 
 	const from = args && args.from || 'keybinding';
 	if (telemetryService) {
+		/* __GDPR__
+		   "workbenchActionExecuted" : {
+			  "id" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "from": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		   }
+		 */
 		telemetryService.publicLog('workbenchActionExecuted', { id: actionInstance.id, from });
 	}
 

diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
@@ -203,6 +203,11 @@ export abstract class EditorInput implements IEditorInput {
 	 * Subclasses should extend if they can contribute.
 	 */
 	public getTelemetryDescriptor(): object {
+		/* __GDPR__FRAGMENT__
+		   "EditorTelemetryDescriptor" : {
+			  "typeId" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		   }
+		 */
 		return { typeId: this.getTypeId() };
 	}
 
@@ -792,6 +797,19 @@ export const EditorOpenPositioning = {
 };
 
 export interface IWorkbenchEditorConfiguration {
+	/* __GDPR__FRAGMENT__
+	   "IWorkbenchEditorConfiguration" : {
+		  "showTabs" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "tabCloseButton": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "showIcons": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "enablePreview": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "enablePreviewFromQuickOpen": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "closeOnFileDelete": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "openPositioning": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "revealIfOpen": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		  "swipeToNavigate": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	   }
+	 */
 	workbench: {
 		editor: {
 			showTabs: boolean;

diff --git a/src/vs/workbench/common/editor/resourceEditorInput.ts b/src/vs/workbench/common/editor/resourceEditorInput.ts
@@ -72,6 +72,11 @@ export class ResourceEditorInput extends EditorInput {
 		const descriptor = super.getTelemetryDescriptor();
 		descriptor['resource'] = telemetryURIDescriptor(this.resource);
 
+		/* __GDPR__FRAGMENT__
+		   "EditorTelemetryDescriptor" : {
+			  "resource": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		   }
+		 */
 		return descriptor;
 	}
 

diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts
@@ -254,6 +254,11 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
 		const descriptor = super.getTelemetryDescriptor();
 		descriptor['resource'] = telemetryURIDescriptor(this.getResource());
 
+		/* __GDPR__FRAGMENT__
+		   "EditorTelemetryDescriptor" : {
+			  "resource": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		   }
+		 */
 		return descriptor;
 	}
 

diff --git a/src/vs/workbench/electron-browser/nodeCachedDataManager.ts b/src/vs/workbench/electron-browser/nodeCachedDataManager.ts
@@ -32,6 +32,12 @@ export class NodeCachedDataManager {
 
 			// log each failure separately
 			if (err) {
+				/* __GDPR__
+				   "cachedDataError" : {
+					  "errorCode" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+					  "path": { "endPoint": "none", "classification": "CustomerContent", "purpose": "PerformanceAndHealth" }
+				   }
+				 */
 				this._telemetryService.publicLog('cachedDataError', {
 					errorCode: err.errorCode,
 					path: basename(err.path)
@@ -40,6 +46,13 @@ export class NodeCachedDataManager {
 		}
 
 		// log summary
+		/* __GDPR__
+		   "cachedDataInfo" : {
+			  "didRequestCachedData" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+			  "didRejectCachedData": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
+			  "didProduceCachedData": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
+		   }
+		 */
 		this._telemetryService.publicLog('cachedDataInfo', {
 			didRequestCachedData: Boolean(global.require.getConfig().nodeCachedDataDir),
 			didRejectCachedData,

diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
@@ -199,6 +199,25 @@ export class WorkbenchShell {
 
 		// Telemetry: workspace info
 		const { filesToOpen, filesToCreate, filesToDiff } = this.configuration;
+		/* __GDPR__
+		   "workspaceLoad" : {
+			  "userAgent" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "windowSize": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "emptyWorkbench": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "workbench.filesToOpen": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "workbench.filesToCreate": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "workbench.filesToDiff": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "customKeybindingsCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "theme": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "language": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "BusinessInsight" },
+			  "experiments": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "BusinessInsight" },
+			  "pinnedViewlets": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "restoredViewlet": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "restoredEditors": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "pinnedViewlets": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "startupKind": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+		   }
+		 */
 		this.telemetryService.publicLog('workspaceLoad', {
 			userAgent: navigator.userAgent,
 			windowSize: { innerHeight: window.innerHeight, innerWidth: window.innerWidth, outerHeight: window.outerHeight, outerWidth: window.outerWidth },
@@ -221,6 +240,13 @@ export class WorkbenchShell {
 		this.timerService.restoreEditorsDuration = info.restoreEditorsDuration;
 		this.timerService.restoreViewletDuration = info.restoreViewletDuration;
 		this.extensionService.onReady().done(() => {
+			/* __GDPR__
+			   "startupTime" : {
+				   "${include}": [
+					  "${IStartupMetrics}"
+				   ]
+			   }
+			 */
 			this.telemetryService.publicLog('startupTime', this.timerService.startupMetrics);
 		});
 
@@ -288,6 +314,12 @@ export class WorkbenchShell {
 			const idleMonitor = new IdleMonitor(2 * 60 * 1000); // 2 minutes
 
 			const listener = idleMonitor.onStatusChange(status =>
+				/* __GDPR__
+				   "UserIdleStart" : {}
+				 */
+				/* __GDPR__
+				   "UserIdleStop" : {}
+				 */
 				this.telemetryService.publicLog(status === UserStatus.Active
 					? TelemetryService.IDLE_STOP_EVENT_NAME
 					: TelemetryService.IDLE_START_EVENT_NAME

diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
@@ -145,6 +145,12 @@ export class ElectronWindow extends Themable {
 			}
 
 			this.commandService.executeCommand(request.id, ...args).done(_ => {
+				/* __GDPR__
+				   "commandExecuted" : {
+					  "id" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					  "from": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				   }
+				 */
 				this.telemetryService.publicLog('commandExecuted', { id: request.id, from: request.from });
 			}, err => {
 				this.messageService.show(Severity.Error, err);

diff --git a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
@@ -102,6 +102,12 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 
 			// log in telemetry
 			if (this.telemetryService) {
+				/* __GDPR__
+				   "workbenchActionExecuted" : {
+					  "id" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					  "from": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				   }
+				 */
 				this.telemetryService.publicLog('workbenchActionExecuted', { id: e.action.id, from: 'debugActionsWidget' });
 			}
 		}));
@@ -141,6 +147,11 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 	private storePosition(): void {
 		const position = parseFloat(this.$el.getComputedStyle().left) / window.innerWidth;
 		this.storageService.store(DEBUG_ACTIONS_WIDGET_POSITION_KEY, position, StorageScope.WORKSPACE);
+		/* __GDPR__
+		   "debug.actionswidgetposition" : {
+			  "position" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		   }
+		 */
 		this.telemetryService.publicLog(DEBUG_ACTIONS_WIDGET_POSITION_KEY, { position });
 	}
 

diff --git a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
@@ -411,6 +411,9 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 	}
 
 	public addLaunchConfiguration(): TPromise<any> {
+		/* __GDPR__
+		   "debug/addLaunchConfiguration" : {}
+		 */
 		this.telemetryService.publicLog('debug/addLaunchConfiguration');
 		let configurationsArrayPosition: Position;
 		const model = this.editor.getModel();