more GDPR classification

src/vs/base/parts/quickopen/browser/quickOpenWidget.ts

@@ -532,6 +532,13 @@ export class QuickOpenWidget implements IModelProvider {
 		if (this.usageLogger) {
 			const indexOfAcceptedElement = this.model.entries.indexOf(value);
 			const entriesCount = this.model.entries.length;
+			/* __GDPR__
+			   "quickOpenWidgetItemAccepted" : {
+				  "index" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				  "count": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				  "isQuickNavigate": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			   }
+			 */
 			this.usageLogger.publicLog('quickOpenWidgetItemAccepted', { index: indexOfAcceptedElement, count: entriesCount, isQuickNavigate: this.quickNavigateConfiguration ? true : false });
 		}
 
@@ -773,6 +780,12 @@ export class QuickOpenWidget implements IModelProvider {
 			if (this.model) {
 				const entriesCount = this.model.entries.filter(e => this.isElementVisible(this.model, e)).length;
 				if (this.usageLogger) {
+					/* __GDPR__
+					   "quickOpenWidgetCancelled" : {
+						  "count" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						  "isQuickNavigate": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					   }
+					 */
 					this.usageLogger.publicLog('quickOpenWidgetCancelled', { count: entriesCount, isQuickNavigate: this.quickNavigateConfiguration ? true : false });
 				}
 			}

src/vs/code/electron-main/windows.ts

@@ -1572,6 +1572,7 @@ class FileDialog {
 
 			// Telemetry
 			if (options.telemetryEventName) {
+				// __GDPR__TODO
 				this.telemetryService.publicLog(options.telemetryEventName, {
 					...options.telemetryExtraData,
 					outcome: numberOfPaths ? 'success' : 'canceled',

src/vs/editor/common/editorCommonExtensions.ts

@@ -194,6 +194,15 @@ export abstract class EditorAction extends EditorCommand {
 	}
 
 	protected reportTelemetry(accessor: ServicesAccessor, editor: editorCommon.ICommonCodeEditor) {
+		/* __GDPR__
+		   "editorActionInvoked" : {
+			  "name" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "id": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+			  "${include}": [
+				 "${EditorTelemetryData}"
+			  ]
+		   }
+		 */
 		accessor.get(ITelemetryService).publicLog('editorActionInvoked', { name: this.label, id: this.id, ...editor.getTelemetryData() });
 	}
 

src/vs/platform/telemetry/browser/errorTelemetry.ts

@@ -153,6 +153,7 @@ export default class ErrorTelemetry {
 				  "column": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 			   }
 			 */
+			// GDPR__TODO more properties are missing
 			this._telemetryService.publicLog('UnhandledError', error);
 		}
 		this._buffer.length = 0;

src/vs/platform/telemetry/common/telemetryService.ts

@@ -65,6 +65,11 @@ export class TelemetryService implements ITelemetryService {
 		if (this._configurationService) {
 			this._updateUserOptIn();
 			this._configurationService.onDidUpdateConfiguration(this._updateUserOptIn, this, this._disposables);
+			/* __GDPR__
+			   "optInStatus" : {
+				  "optIn" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "BusinessInsight" }
+			   }
+			 */
 			this.publicLog('optInStatus', { optIn: this._userOptIn });
 		}
 	}

src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts

@@ -270,7 +270,7 @@ export class SaveParticipant implements ISaveParticipant {
 			   "saveParticipantStats" : {
 			   }
 			 */
-			// TODO: We need to move off dynamic property names as we can't declare them statically in the registry.
+			// GDPR__TODO: We need to move off dynamic property names as we can't declare them statically in the registry.
 			this._telemetryService.publicLog('saveParticipantStats', stats);
 		});
 	}

src/vs/workbench/api/electron-browser/mainThreadTelemetry.ts

@@ -25,6 +25,12 @@ export class MainThreadTelemetry implements MainThreadTelemetryShape {
 	}
 
 	$publicLog(eventName: string, data: any = Object.create(null)): void {
+		/* __GDPR__FRAGMENT__
+		   "MainThreadData" : {
+			  "pluginHostTelemetry" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+		   }
+		 */
+
 		data[MainThreadTelemetry._name] = true;
 		this._telemetryService.publicLog(eventName, data);
 	}

src/vs/workbench/api/node/extHost.api.impl.ts

@@ -145,6 +145,15 @@ export function createApiFactory(
 					return undefined;
 				}
 				this._seen.add(apiName);
+				/* __GDPR__
+				   "apiUsage" : {
+					  "name" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					  "extension": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					  "${include}": [
+						 "${MainThreadData}"
+					  ]
+				   }
+				 */
 				return mainThreadTelemetry.$publicLog('apiUsage', {
 					name: apiName,
 					extension: extension.id
@@ -494,6 +503,16 @@ export function createApiFactory(
 				return extHostSCM.getLastInputBox(extension);
 			},
 			createSourceControl(id: string, label: string, rootUri?: vscode.Uri) {
+				/* __GDPR__
+				   "registerSCMProvider" : {
+					  "extensionId" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					  "providerId": { "endPoint": "none", "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
+					  "providerLabel": { "endPoint": "none", "classification": "PublicPersonalData", "purpose": "FeatureInsight" },
+					  "${include}": [
+						 "${MainThreadData}"
+					  ]
+				   }
+				 */
 				mainThreadTelemetry.$publicLog('registerSCMProvider', {
 					extensionId: extension.id,
 					providerId: id,

src/vs/workbench/api/node/extHostExtensionService.ts

@@ -281,6 +281,13 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 
 	private _doActivateExtension(extensionDescription: IExtensionDescription, startup: boolean): TPromise<ActivatedExtension> {
 		let event = getTelemetryActivationEvent(extensionDescription);
+		/* __GDPR__
+		   "activatePlugin" : {
+			   "${include}": [
+				  "${TelemetryActivationEvent}"
+			   ]
+		   }
+		 */
 		this._mainThreadTelemetry.$publicLog('activatePlugin', event);
 		if (!extensionDescription.main) {
 			// Treat the extension as being empty => NOT AN ERROR CASE

src/vs/workbench/api/node/extHostLanguageFeatures.ts

@@ -880,6 +880,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		const handle = this._nextHandle();
 		this._adapter.set(handle, new HoverAdapter(this._documents, provider, once((name: string, data: any) => {
 			data['extension'] = extensionId;
+			// GDPR__TODO
 			this._telemetry.$publicLog(name, data);
 		})));
 		this._proxy.$registerHoverProvider(handle, selector);

src/vs/workbench/api/node/extHostTextEditor.ts

@@ -595,6 +595,15 @@ export class ExtHostTextEditor2 extends ExtHostTextEditor {
 					for (const call of stackTrace) {
 						const extension = index.findSubstr(call.getFileName());
 						if (extension) {
+							/* __GDPR__
+							   "usesCommandLink" : {
+								  "extension" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								  "from": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								  "${include}": [
+									 "${MainThreadData}"
+								  ]
+							   }
+							 */
 							this._mainThreadTelemetry.$publicLog('usesCommandLink', {
 								extension: extension.id,
 								from: 'decoration',

src/vs/workbench/browser/parts/editor/editorPart.ts

@@ -340,6 +340,11 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 
 		// Opened to the side
 		if (position !== Position.ONE) {
+			/* __GDPR__
+			   "workbenchSideEditorOpened" : {
+				  "position" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			   }
+			 */
 			this.telemetryService.publicLog('workbenchSideEditorOpened', { position: position });
 		}
 

src/vs/workbench/parts/debug/electron-browser/debugService.ts

@@ -341,7 +341,7 @@ export class DebugService implements debug.IDebugService {
 				// only log telemetry events from debug adapter if the adapter provided the telemetry key
 				// and the user opted in telemetry
 				if (session.customTelemetryService && this.telemetryService.isOptedIn) {
-					// TODO Need to move off dynamic event names or properties. They cannot be registered upfront.
+					// GDPR__TODO Need to move off dynamic event names or properties. They cannot be registered upfront.
 					session.customTelemetryService.publicLog(event.body.output, event.body.data);
 				}
 

src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts

@@ -68,16 +68,17 @@ export class KeymapExtensions implements IWorkbenchContribution {
 	}
 
 	private promptForDisablingOtherKeymaps(newKeymap: IExtensionStatus, oldKeymaps: IExtensionStatus[]): TPromise<void> {
-		const telemetryData: { [key: string]: any; } = {
-			newKeymap: newKeymap.identifier,
-			oldKeymaps: oldKeymaps.map(k => k.identifier)
-		};
 		/* __GDPR__FRAGMENT__
 		   "KeyMapsData" : {
 			  "newKeymap" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 			  "oldKeymaps": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 		   }
 		 */
+		const telemetryData: { [key: string]: any; } = {
+			newKeymap: newKeymap.identifier,
+			oldKeymaps: oldKeymaps.map(k => k.identifier)
+		};
+
 		/* __GDPR__
 		   "disableOtherKeymapsConfirmation" : {
 			   "${include}": [

src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts

@@ -521,9 +521,9 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 				emptyFilters: this.getLatestEmptyFiltersForTelemetry()
 			};
 			this.latestEmptyFilters = [];
-			// TODO need to move off dynamic properties as they cannot be statically registered
 			/* __GDPR__
 			   "keybindings.filter" : {
+				  "filter": { "endPoint": "none", "classification": "CustomerContent", "purpose": "FeatureInsight" }
 				  "emptyFilters" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 			   }
 			 */
@@ -541,7 +541,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 	}
 
 	private reportKeybindingAction(action: string, command: string, keybinding: ResolvedKeybinding | string): void {
-		// TODO need to move off dynamic event names and properties as they cannot be registered statically
+		// GDPR__TODO need to move off dynamic event names and properties as they cannot be registered statically
 		this.telemetryService.publicLog(action, { command, keybinding: keybinding ? (typeof keybinding === 'string' ? keybinding : keybinding.getUserSettingsLabel()) : '' });
 	}
 

src/vs/workbench/parts/preferences/browser/preferencesEditor.ts

@@ -323,9 +323,9 @@ export class PreferencesEditor extends BaseEditor {
 				emptyFilters: this.getLatestEmptyFiltersForTelemetry()
 			};
 			this.latestEmptyFilters = [];
-			// TODO need to move off dynamic properties as they cannot be statically be registered
 			/* __GDPR__
 			   "defaultSettings.filter" : {
+				   "filter": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 				  "emptyFilters" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 			   }
 			 */

src/vs/workbench/parts/surveys/electron-browser/languageSurveys.contribution.ts

@@ -88,7 +88,7 @@ class LanguageSurvey {
 		const message = nls.localize('helpUs', "Help us improve our support for {0}", data.languageId);
 
 		const takeSurveyAction = new Action('takeSurvey', nls.localize('takeShortSurvey', "Take Short Survey"), '', true, () => {
-			// GDPR_TODO need to move away from dynamic event names as those cannot be registered statically
+			// __GDPR__TODO need to move away from dynamic event names as those cannot be registered statically
 			telemetryService.publicLog(`${data.surveyId}.survey/takeShortSurvey`);
 			return telemetryService.getTelemetryInfo().then(info => {
 				window.open(`${data.surveyUrl}?o=${encodeURIComponent(process.platform)}&v=${encodeURIComponent(pkg.version)}&m=${encodeURIComponent(info.machineId)}`);
@@ -98,22 +98,22 @@ class LanguageSurvey {
 		});
 
 		const remindMeLaterAction = new Action('later', nls.localize('remindLater', "Remind Me later"), '', true, () => {
-			// GDPR_TODO need to move away from dynamic event names as those cannot be registered statically
+			// __GDPR__TODO need to move away from dynamic event names as those cannot be registered statically
 			telemetryService.publicLog(`${data.surveyId}.survey/remindMeLater`);
 			storageService.store(SESSION_COUNT_KEY, sessionCount - 3, StorageScope.GLOBAL);
 			return TPromise.as(null);
 		});
 
 		const neverAgainAction = new Action('never', nls.localize('neverAgain', "Don't Show Again"), '', true, () => {
-			// GDPR_TODO need to move away from dynamic event names as those cannot be registered statically
+			// __GDPR__TODO need to move away from dynamic event names as those cannot be registered statically
 			telemetryService.publicLog(`${data.surveyId}.survey/dontShowAgain`);
 			storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
 			storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
 			return TPromise.as(null);
 		});
 
 		const actions = [neverAgainAction, remindMeLaterAction, takeSurveyAction];
-		// GDPR_TODO need to move away from dynamic event names as those cannot be registered statically
+		// __GDPR__TODO need to move away from dynamic event names as those cannot be registered statically
 		telemetryService.publicLog(`${data.surveyId}.survey/userAsked`);
 		messageService.show(Severity.Info, { message, actions });
 	}