Skip to content

Commit 9d5589d

Browse files
committed
update GDPR todos
1 parent 7dc7165 commit 9d5589d

9 files changed

Lines changed: 15 additions & 12 deletions

File tree

extensions/typescript/src/typescriptServiceClient.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
858858
"typingsInstallerVersion": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
859859
}
860860
*/
861-
// GDPR__COMMENT: Other events are defined by TypeScript.
861+
// __GDPR__COMMENT__: Other events are defined by TypeScript.
862862
this.logTelemetry(telemetryData.telemetryEventName, properties);
863863
}
864864
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1572,7 +1572,7 @@ class FileDialog {
15721572

15731573
// Telemetry
15741574
if (options.telemetryEventName) {
1575-
// __GDPR__TODO
1575+
// __GDPR__TODO__ Dynamic event names and dynamic properties. Can not be registered statically.
15761576
this.telemetryService.publicLog(options.telemetryEventName, {
15771577
...options.telemetryExtraData,
15781578
outcome: numberOfPaths ? 'success' : 'canceled',

src/vs/editor/contrib/suggest/browser/completionModel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export interface ICompletionItem extends ISuggestionItem {
2424
"textCount": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
2525
}
2626
*/
27-
// __GDPR__TODO: This is an extensible structure which can not be statically declared.
27+
// __GDPR__TODO__: This is a dynamically extensible structure which can not be declared statically.
2828
export interface ICompletionStats {
2929
suggestionCount: number;
3030
snippetCount: number;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export default class ErrorTelemetry {
153153
"column": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
154154
}
155155
*/
156-
// __GDPR__TODO what's the complete set of properties?
156+
// __GDPR__TODO__ what's the complete set of properties?
157157
this._telemetryService.publicLog('UnhandledError', error);
158158
}
159159
this._buffer.length = 0;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
880880
const handle = this._nextHandle();
881881
this._adapter.set(handle, new HoverAdapter(this._documents, provider, once((name: string, data: any) => {
882882
data['extension'] = extensionId;
883-
// __GDPR__TODO Dynamic event names and dynamic properties. Can not be registered statically.
883+
// __GDPR__TODO__ Dynamic event names and dynamic properties. Can not be registered statically.
884884
this._telemetry.$publicLog(name, data);
885885
})));
886886
this._proxy.$registerHoverProvider(handle, selector);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ export class DebugService implements debug.IDebugService {
341341
// only log telemetry events from debug adapter if the adapter provided the telemetry key
342342
// and the user opted in telemetry
343343
if (session.customTelemetryService && this.telemetryService.isOptedIn) {
344-
// __GDPR__TODO Need to move off dynamic event names or properties. They cannot be registered upfront.
344+
// __GDPR__TODO__ We're sending events in the name of the debug adapter and we can not ensure that those are declared correctly.
345345
session.customTelemetryService.publicLog(event.body.output, event.body.data);
346346
}
347347

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,10 @@ export class RawDebugSession extends V8Protocol implements debug.ISession {
171171
*/
172172
this.telemetryService.publicLog('debugProtocolErrorResponse', { error: telemetryMessage });
173173
if (this.customTelemetryService) {
174-
// __GDPR__TODO the message is sent in the name of the adapter but since the adapters are an open set, this can not be statically declared
174+
/* __GDPR__TODO__
175+
* The message is sent in the name of the adapter but the adapter doesn't know about it. However, since adapters are an open-ended set,
176+
* we can not declared the events statically either.
177+
*/
175178
this.customTelemetryService.publicLog('debugProtocolErrorResponse', { error: telemetryMessage });
176179
}
177180
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
541541
}
542542

543543
private reportKeybindingAction(action: string, command: string, keybinding: ResolvedKeybinding | string): void {
544-
// __GDPR__TODO need to move off dynamic event names and properties as they cannot be registered statically
544+
// __GDPR__TODO__ Need to move off dynamic event names and properties as they cannot be registered statically
545545
this.telemetryService.publicLog(action, { command, keybinding: keybinding ? (typeof keybinding === 'string' ? keybinding : keybinding.getUserSettingsLabel()) : '' });
546546
}
547547

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class LanguageSurvey {
8888
const message = nls.localize('helpUs', "Help us improve our support for {0}", data.languageId);
8989

9090
const takeSurveyAction = new Action('takeSurvey', nls.localize('takeShortSurvey', "Take Short Survey"), '', true, () => {
91-
// __GDPR__TODO need to move away from dynamic event names as those cannot be registered statically
91+
// __GDPR__TODO__ Need to move away from dynamic event names as those cannot be registered statically
9292
telemetryService.publicLog(`${data.surveyId}.survey/takeShortSurvey`);
9393
return telemetryService.getTelemetryInfo().then(info => {
9494
window.open(`${data.surveyUrl}?o=${encodeURIComponent(process.platform)}&v=${encodeURIComponent(pkg.version)}&m=${encodeURIComponent(info.machineId)}`);
@@ -98,22 +98,22 @@ class LanguageSurvey {
9898
});
9999

100100
const remindMeLaterAction = new Action('later', nls.localize('remindLater', "Remind Me later"), '', true, () => {
101-
// __GDPR__TODO need to move away from dynamic event names as those cannot be registered statically
101+
// __GDPR__TODO__ Need to move away from dynamic event names as those cannot be registered statically
102102
telemetryService.publicLog(`${data.surveyId}.survey/remindMeLater`);
103103
storageService.store(SESSION_COUNT_KEY, sessionCount - 3, StorageScope.GLOBAL);
104104
return TPromise.as(null);
105105
});
106106

107107
const neverAgainAction = new Action('never', nls.localize('neverAgain', "Don't Show Again"), '', true, () => {
108-
// __GDPR__TODO need to move away from dynamic event names as those cannot be registered statically
108+
// __GDPR__TODO__ Need to move away from dynamic event names as those cannot be registered statically
109109
telemetryService.publicLog(`${data.surveyId}.survey/dontShowAgain`);
110110
storageService.store(IS_CANDIDATE_KEY, false, StorageScope.GLOBAL);
111111
storageService.store(SKIP_VERSION_KEY, pkg.version, StorageScope.GLOBAL);
112112
return TPromise.as(null);
113113
});
114114

115115
const actions = [neverAgainAction, remindMeLaterAction, takeSurveyAction];
116-
// __GDPR__TODO need to move away from dynamic event names as those cannot be registered statically
116+
// __GDPR__TODO__ Need to move away from dynamic event names as those cannot be registered statically
117117
telemetryService.publicLog(`${data.surveyId}.survey/userAsked`);
118118
messageService.show(Severity.Info, { message, actions });
119119
}

0 commit comments

Comments
 (0)