Skip to content

Commit

Permalink
inline values
Browse files Browse the repository at this point in the history
  • Loading branch information
@kieferrm
kieferrm committed Sep 9, 2017
1 parent 74ea248 commit 53d0460
Show file tree
Hide file tree
Showing 19 changed files with 145 additions and 16 deletions.
22 changes: 22 additions & 0 deletions src/typings/native-keymap.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,28 @@ declare module 'native-keymap' {

export function getKeyMap(): IKeyboardMapping;

/* __GDPR__FRAGMENT__
"IKeyboardLayoutInfo" : {
"name" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"id": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"text": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
export interface IWindowsKeyboardLayoutInfo {
name: string;
id: string;
text: string;
}

/* __GDPR__FRAGMENT__
"IKeyboardLayoutInfo" : {
"model" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"layout": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"variant": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"options": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"rules": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
export interface ILinuxKeyboardLayoutInfo {
model: string;
layout: string;
Expand All @@ -56,6 +72,12 @@ declare module 'native-keymap' {
rules: string;
}

/* __GDPR__FRAGMENT__
"IKeyboardLayoutInfo" : {
"id" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"lang": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
export interface IMacKeyboardLayoutInfo {
id: string;
lang: string;
Expand Down
5 changes: 5 additions & 0 deletions src/vs/base/parts/quickopen/common/quickOpen.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@

import { ResolvedKeybinding } from 'vs/base/common/keyCodes';

/* __GDPR__FRAGMENT__
"IQuickNavigateConfiguration" : {
"keybindings" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
export interface IQuickNavigateConfiguration {
keybindings: ResolvedKeybinding[];
}
Expand Down
3 changes: 3 additions & 0 deletions src/vs/editor/common/commonCodeEditor.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -993,6 +993,9 @@ export abstract class CommonCodeEditor extends Disposable implements editorCommo
protected abstract _removeDecorationType(key: string): void;
protected abstract _resolveDecorationOptions(typeKey: string, writable: boolean): editorCommon.IModelDecorationOptions;

/* __GDPR__FRAGMENT__
"EditorTelemetryData" : {}
*/
public getTelemetryData(): { [key: string]: any; } {
return null;
}
Expand Down
11 changes: 10 additions & 1 deletion src/vs/platform/search/common/search.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,16 @@ export enum QueryType {
File = 1,
Text = 2
}

/* __GDPR__FRAGMENT__
"IPatternInfo" : {
"pattern" : { "endPoint": "none", "classification": "CustomerContent", "purpose": "FeatureInsight" },
"isRegExp": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"isWordMatch": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"wordSeparators": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"isMultiline": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"isCaseSensitive": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
export interface IPatternInfo {
pattern: string;
isRegExp?: boolean;
Expand Down
5 changes: 5 additions & 0 deletions src/vs/platform/telemetry/common/experiments.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import { IStorageService } from 'vs/platform/storage/common/storage';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';

/* __GDPR__FRAGMENT__
"IExperiments" : {
"deployToAzureQuickLink" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
export interface IExperiments {
deployToAzureQuickLink: boolean;
}
Expand Down
7 changes: 7 additions & 0 deletions src/vs/platform/telemetry/common/telemetryUtils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ export function anonymize(input: string): string {
return r;
}

/* __GDPR__FRAGMENT__
"URIDescriptor" : {
"mimeType" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"ext": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"path": { "endPoint": "none", "classification": "CustomerContent", "purpose": "FeatureInsight" }
}
*/
export interface URIDescriptor {
mimeType?: string;
ext?: string;
Expand Down
15 changes: 15 additions & 0 deletions src/vs/workbench/api/node/extHostExtensionService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,21 @@ function loadCommonJSModule<T>(modulePath: string, activationTimesBuilder: Exten
}

function getTelemetryActivationEvent(extensionDescription: IExtensionDescription): any {
/* __GDPR__FRAGMENT__
"TelemetryActivationEvent" : {
"id": { "endPoint": "none", "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
"name": { "endPoint": "none", "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
"publisherDisplayName": { "endPoint": "none", "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" },
"activationEvents": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"isBuiltin": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"${wildcard}": [
{
"${prefix}": "contribution.",
"${property}": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
]
}
*/
let event = {
id: extensionDescription.id,
name: extensionDescription.name,
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
/* __GDPR__
"quickOpenWidgetShown" : {
"mode" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"quickNavigate": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
"quickNavigate": { "${inline}": [ "${IQuickNavigateConfiguration}" ] }
}
*/
this.telemetryService.publicLog('quickOpenWidgetShown', { mode: handlerDescriptor.getId(), quickNavigate: quickNavigateConfiguration });
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/common/editor/resourceEditorInput.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export class ResourceEditorInput extends EditorInput {

/* __GDPR__FRAGMENT__
"EditorTelemetryDescriptor" : {
"resource": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
"resource": { "${inline}": [ "${URIDescriptor}" ] }
}
*/
return descriptor;
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/common/editor/untitledEditorInput.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport

/* __GDPR__FRAGMENT__
"EditorTelemetryDescriptor" : {
"resource": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
"resource": { "${inline}": [ "${URIDescriptor}" ] }
}
*/
return descriptor;
Expand Down
7 changes: 5 additions & 2 deletions src/vs/workbench/electron-browser/shell.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,18 @@ export class WorkbenchShell {
/* __GDPR__
"workspaceLoad" : {
"userAgent" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"windowSize": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"windowSize.innerHeight": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"windowSize.innerWidth": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"windowSize.outerHeight": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"windowSize.outerWidth": { "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" },
"experiments": { "${inline}": [ "${IExperiments}" ] },
"pinnedViewlets": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"restoredViewlet": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"restoredEditors": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {

/* __GDPR__FRAGMENT__
"EditorTelemetryDescriptor" : {
"resource": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
"resource": { "${inline}": [ "${URIDescriptor}" ] }
}
*/
return descriptor;
Expand Down
38 changes: 36 additions & 2 deletions src/vs/workbench/parts/search/browser/openAnythingHandler.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,44 @@ interface ISearchWithRange {
"unsortedResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"sortedResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"resultCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"symbols": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
"symbols.fromCache": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.fromCache": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.unsortedResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.sortedResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.resultCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.traversal": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.errors": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.fileWalkStartDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.fileWalkResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.directoriesWalked": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.filesWalked": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.cmdForkStartTime": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.cmdForkResultTime": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.cmdResultCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.cacheLookupStartDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.cacheFilterStartDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.cacheLookupResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.cacheEntryCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.fromCache": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.unsortedResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.sortedResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.resultCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.traversal": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.errors": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.fileWalkStartDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.fileWalkResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.directoriesWalked": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.filesWalked": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.cmdForkStartTime": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.cmdForkResultTime": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.cmdResultCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.cacheLookupStartDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.cacheFilterStartDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.cacheLookupResultDuration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"files.joined.cacheEntryCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
}
*/
// GDPR__TODO joined seems to be recursive
interface ITimerEventData {
searchLength: number;
unsortedResultDuration: number;
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/parts/search/common/searchModel.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ export class SearchModel extends Disposable {
"searchresultsShown" : {
"count" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"fileCount": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"options": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"options": { "${inline}": [ "${IPatternInfo}" ] },
"duration": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" },
"useRipgrep": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ class WelcomePage {
/* __GDPR__FRAGMENT__
"WelcomePageInstall-1" : {
"from" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"extensionsId": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
"extensionId": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
this.telemetryService.publicLog(strings.installEvent, {
Expand Down
6 changes: 6 additions & 0 deletions src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,12 @@ export class WalkThroughPart extends BaseEditor {
const div = innerContent.querySelector(`#${id.replace(/\./g, '\\.')}`) as HTMLElement;

const options = this.getEditorOptions(snippet.textEditorModel.getModeId());
/* __GDPR__FRAGMENT__
"EditorTelemetryData" : {
"target" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"snippet": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}
*/
const telemetryData = {
target: this.input instanceof WalkThroughInput ? this.input.getTelemetryFrom() : undefined,
snippet: i
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export class WalkThroughInput extends EditorInput {
/* __GDPR__FRAGMENT__
"EditorTelemetryDescriptor" : {
"target" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"resource": { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
"resource": { "${inline}": [ "${URIDescriptor}" ] }
}
*/
return descriptor;
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
let data = KeyboardMapperFactory.INSTANCE.getCurrentKeyboardLayout();
/* __GDPR__
"keyboardLayout" : {
"currentKeyboardLayout" : { "endPoint": "none", "classification": "SystemMetaData", "purpose": "FeatureInsight" }
"currentKeyboardLayout": { "${inline}": [ "${IKeyboardLayoutInfo}" ] }
}
*/
telemetryService.publicLog('keyboardLayout', {
Expand Down
Loading

0 comments on commit 53d0460

Please sign in to comment.