未验证 提交 960f567d 编写于 作者: L Logan Ramos 提交者: GitHub

Removes abbreviations in strongly typed telemetry events (#76478)

* Remove abbreviations

* Fixed spelling mistake
上级 f7c692ab
...@@ -12,12 +12,12 @@ export interface ITelemetryData { ...@@ -12,12 +12,12 @@ export interface ITelemetryData {
[key: string]: any; [key: string]: any;
} }
export type WBActionExecutedClassification = { export type WorkbenchActionExecutedClassification = {
id: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; id: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
from: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; from: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
}; };
export type WBActionExecutedEvent = { export type WorkbenchActionExecutedEvent = {
id: string; id: string;
from: string; from: string;
}; };
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
import 'vs/css!./contextMenuHandler'; import 'vs/css!./contextMenuHandler';
import { ActionRunner, IRunEvent, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
import { combinedDisposable, DisposableStore } from 'vs/base/common/lifecycle'; import { combinedDisposable, DisposableStore } from 'vs/base/common/lifecycle';
import { ActionRunner, IRunEvent, WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions';
import { Menu } from 'vs/base/browser/ui/menu/menu'; import { Menu } from 'vs/base/browser/ui/menu/menu';
import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
...@@ -132,7 +132,7 @@ export class ContextMenuHandler { ...@@ -132,7 +132,7 @@ export class ContextMenuHandler {
private onActionRun(e: IRunEvent): void { private onActionRun(e: IRunEvent): void {
if (this.telemetryService) { if (this.telemetryService) {
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id: e.action.id, from: 'contextMenu' }); this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: e.action.id, from: 'contextMenu' });
} }
this.contextViewService.hideContextView(false); this.contextViewService.hideContextView(false);
......
...@@ -647,26 +647,26 @@ export class ExtensionGalleryService implements IExtensionGalleryService { ...@@ -647,26 +647,26 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
} }
const message = getErrorMessage(err); const message = getErrorMessage(err);
type GalleryServiceREClassification = { type GalleryServiceRequestErrorClassification = {
url: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; url: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
cdn: { classification: 'SystemMetaData', purpose: 'FeatureInsight', isMeasurement: true }; cdn: { classification: 'SystemMetaData', purpose: 'FeatureInsight', isMeasurement: true };
message: { classification: 'CallstackOrException', purpose: 'FeatureInsight' }; message: { classification: 'CallstackOrException', purpose: 'FeatureInsight' };
}; };
type GalleryServiceREServiceEvent = { type GalleryServiceRequestErrorEvent = {
url: string; url: string;
cdn: boolean; cdn: boolean;
message: string; message: string;
}; };
this.telemetryService.publicLog2<GalleryServiceREServiceEvent, GalleryServiceREClassification>('galleryService:requestError', { url, cdn: true, message }); this.telemetryService.publicLog2<GalleryServiceRequestErrorEvent, GalleryServiceRequestErrorClassification>('galleryService:requestError', { url, cdn: true, message });
type GalleryServiceCDNFBClassification = { type GalleryServiceCDNFallbackClassification = {
url: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; url: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
message: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; message: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
}; };
type GalleryServiceCDNFBEvent = { type GalleryServiceCDNFallbackEvent = {
url: string; url: string;
message: string; message: string;
}; };
this.telemetryService.publicLog2<GalleryServiceCDNFBEvent, GalleryServiceCDNFBClassification>('galleryService:cdnFallback', { url, message }); this.telemetryService.publicLog2<GalleryServiceCDNFallbackEvent, GalleryServiceCDNFallbackClassification>('galleryService:cdnFallback', { url, message });
const fallbackOptions = assign({}, options, { url: fallbackUrl }); const fallbackOptions = assign({}, options, { url: fallbackUrl });
return this.requestService.request(fallbackOptions, token).then(undefined, err => { return this.requestService.request(fallbackOptions, token).then(undefined, err => {
...@@ -675,7 +675,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService { ...@@ -675,7 +675,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
} }
const message = getErrorMessage(err); const message = getErrorMessage(err);
this.telemetryService.publicLog2<GalleryServiceREServiceEvent, GalleryServiceREClassification>('galleryService:requestError', { url: fallbackUrl, cdn: false, message }); this.telemetryService.publicLog2<GalleryServiceRequestErrorEvent, GalleryServiceRequestErrorClassification>('galleryService:requestError', { url: fallbackUrl, cdn: false, message });
return Promise.reject(err); return Promise.reject(err);
}); });
}); });
......
...@@ -16,7 +16,7 @@ import { IResolveResult, KeybindingResolver } from 'vs/platform/keybinding/commo ...@@ -16,7 +16,7 @@ import { IResolveResult, KeybindingResolver } from 'vs/platform/keybinding/commo
import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem'; import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
import { INotificationService } from 'vs/platform/notification/common/notification'; import { INotificationService } from 'vs/platform/notification/common/notification';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
interface CurrentChord { interface CurrentChord {
keypress: string; keypress: string;
...@@ -196,7 +196,7 @@ export abstract class AbstractKeybindingService extends Disposable implements IK ...@@ -196,7 +196,7 @@ export abstract class AbstractKeybindingService extends Disposable implements IK
} else { } else {
this._commandService.executeCommand(resolveResult.commandId, resolveResult.commandArgs).then(undefined, err => this._notificationService.warn(err)); this._commandService.executeCommand(resolveResult.commandId, resolveResult.commandArgs).then(undefined, err => this._notificationService.warn(err));
} }
this._telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id: resolveResult.commandId, from: 'keybinding' }); this._telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: resolveResult.commandId, from: 'keybinding' });
} }
return shouldPreventDefault; return shouldPreventDefault;
......
...@@ -21,7 +21,7 @@ import { IMenubarData, IMenubarKeybinding, MenubarMenuItem, isMenubarMenuItemSep ...@@ -21,7 +21,7 @@ import { IMenubarData, IMenubarKeybinding, MenubarMenuItem, isMenubarMenuItemSep
import { URI } from 'vs/base/common/uri'; import { URI } from 'vs/base/common/uri';
import { IStateService } from 'vs/platform/state/common/state'; import { IStateService } from 'vs/platform/state/common/state';
import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain'; import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
import { WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
const telemetryFrom = 'menu'; const telemetryFrom = 'menu';
...@@ -784,7 +784,7 @@ export class Menubar { ...@@ -784,7 +784,7 @@ export class Menubar {
} }
private reportMenuActionTelemetry(id: string): void { private reportMenuActionTelemetry(id: string): void {
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id, from: telemetryFrom }); this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id, from: telemetryFrom });
} }
private mnemonicLabel(label: string): string { private mnemonicLabel(label: string): string {
......
...@@ -57,13 +57,13 @@ export class TelemetryService implements ITelemetryService { ...@@ -57,13 +57,13 @@ export class TelemetryService implements ITelemetryService {
if (this._configurationService) { if (this._configurationService) {
this._updateUserOptIn(); this._updateUserOptIn();
this._configurationService.onDidChangeConfiguration(this._updateUserOptIn, this, this._disposables); this._configurationService.onDidChangeConfiguration(this._updateUserOptIn, this, this._disposables);
type OptInClass = { type OptInClassification = {
optIn: { classification: 'SystemMetaData', purpose: 'BusinessInsight', isMeasurement: true }; optIn: { classification: 'SystemMetaData', purpose: 'BusinessInsight', isMeasurement: true };
}; };
type OptInEvent = { type OptInEvent = {
optIn: boolean; optIn: boolean;
}; };
this.publicLog2<OptInEvent, OptInClass>('optInStatus', { optIn: this._userOptIn }); this.publicLog2<OptInEvent, OptInClassification>('optInStatus', { optIn: this._userOptIn });
this._commonProperties.then(values => { this._commonProperties.then(values => {
const isHashedId = /^[a-f0-9]+$/i.test(values['common.machineId']); const isHashedId = /^[a-f0-9]+$/i.test(values['common.machineId']);
......
...@@ -195,27 +195,27 @@ const configurationValueWhitelist = [ ...@@ -195,27 +195,27 @@ const configurationValueWhitelist = [
export function configurationTelemetry(telemetryService: ITelemetryService, configurationService: IConfigurationService): IDisposable { export function configurationTelemetry(telemetryService: ITelemetryService, configurationService: IConfigurationService): IDisposable {
return configurationService.onDidChangeConfiguration(event => { return configurationService.onDidChangeConfiguration(event => {
if (event.source !== ConfigurationTarget.DEFAULT) { if (event.source !== ConfigurationTarget.DEFAULT) {
type UpdateConfigClassification = { type UpdateConfigurationClassification = {
configurationSource: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; configurationSource: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
configurationKeys: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; configurationKeys: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
}; };
type UpdateConfigEvent = { type UpdateConfigurationEvent = {
configurationSource: string; configurationSource: string;
configurationKeys: string[]; configurationKeys: string[];
}; };
telemetryService.publicLog2<UpdateConfigEvent, UpdateConfigClassification>('updateConfiguration', { telemetryService.publicLog2<UpdateConfigurationEvent, UpdateConfigurationClassification>('updateConfiguration', {
configurationSource: ConfigurationTargetToString(event.source), configurationSource: ConfigurationTargetToString(event.source),
configurationKeys: flattenKeys(event.sourceConfig) configurationKeys: flattenKeys(event.sourceConfig)
}); });
type UpdateConfigValClassification = { type UpdateConfigurationValuesClassification = {
configurationSource: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; configurationSource: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
configurationValues: { classification: 'CustomerContent', purpose: 'FeatureInsight' }; configurationValues: { classification: 'CustomerContent', purpose: 'FeatureInsight' };
}; };
type UpdateConfigValEvent = { type UpdateConfigurationValuesEvent = {
configurationSource: string; configurationSource: string;
configurationValues: { [key: string]: any }[]; configurationValues: { [key: string]: any }[];
}; };
telemetryService.publicLog2<UpdateConfigValEvent, UpdateConfigValClassification>('updateConfigurationValues', { telemetryService.publicLog2<UpdateConfigurationValuesEvent, UpdateConfigurationValuesClassification>('updateConfigurationValues', {
configurationSource: ConfigurationTargetToString(event.source), configurationSource: ConfigurationTargetToString(event.source),
configurationValues: flattenValues(event.sourceConfig, configurationValueWhitelist) configurationValues: flattenValues(event.sourceConfig, configurationValueWhitelist)
}); });
...@@ -226,13 +226,13 @@ export function configurationTelemetry(telemetryService: ITelemetryService, conf ...@@ -226,13 +226,13 @@ export function configurationTelemetry(telemetryService: ITelemetryService, conf
export function keybindingsTelemetry(telemetryService: ITelemetryService, keybindingService: IKeybindingService): IDisposable { export function keybindingsTelemetry(telemetryService: ITelemetryService, keybindingService: IKeybindingService): IDisposable {
return keybindingService.onDidUpdateKeybindings(event => { return keybindingService.onDidUpdateKeybindings(event => {
if (event.source === KeybindingSource.User && event.keybindings) { if (event.source === KeybindingSource.User && event.keybindings) {
type UpdateKBClassification = { type UpdateKeybindingsClassification = {
bindings: { classification: 'CustomerContent', purpose: 'FeatureInsight' }; bindings: { classification: 'CustomerContent', purpose: 'FeatureInsight' };
}; };
type UpdateKBEvents = { type UpdateKeybindingsEvents = {
bindings: { key: string, command: string, when: string | undefined, args: boolean | undefined }[]; bindings: { key: string, command: string, when: string | undefined, args: boolean | undefined }[];
}; };
telemetryService.publicLog2<UpdateKBEvents, UpdateKBClassification>('updateKeybindings', { telemetryService.publicLog2<UpdateKeybindingsEvents, UpdateKeybindingsClassification>('updateKeybindings', {
bindings: event.keybindings.map(binding => ({ bindings: event.keybindings.map(binding => ({
key: binding.key, key: binding.key,
command: binding.command, command: binding.command,
......
...@@ -14,7 +14,7 @@ import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar'; ...@@ -14,7 +14,7 @@ import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
import { IActionViewItem, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar'; import { IActionViewItem, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar'; import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
import { prepareActions } from 'vs/workbench/browser/actions'; import { prepareActions } from 'vs/workbench/browser/actions';
import { IAction, WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { IAction, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
import { Part, IPartOptions } from 'vs/workbench/browser/part'; import { Part, IPartOptions } from 'vs/workbench/browser/part';
import { Composite, CompositeRegistry } from 'vs/workbench/browser/composite'; import { Composite, CompositeRegistry } from 'vs/workbench/browser/composite';
import { IComposite } from 'vs/workbench/common/composite'; import { IComposite } from 'vs/workbench/common/composite';
...@@ -261,7 +261,7 @@ export abstract class CompositePart<T extends Composite> extends Part { ...@@ -261,7 +261,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
// Log in telemetry // Log in telemetry
if (this.telemetryService) { if (this.telemetryService) {
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id: e.action.id, from: this.nameForTelemetry }); this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: e.action.id, from: this.nameForTelemetry });
} }
}); });
......
...@@ -8,7 +8,7 @@ import { addDisposableListener, Dimension, EventType } from 'vs/base/browser/dom ...@@ -8,7 +8,7 @@ import { addDisposableListener, Dimension, EventType } from 'vs/base/browser/dom
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
import { ActionsOrientation, IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { ActionsOrientation, IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar'; import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
import { IAction, IRunEvent, WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { IAction, IRunEvent, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
import * as arrays from 'vs/base/common/arrays'; import * as arrays from 'vs/base/common/arrays';
import { ResolvedKeybinding } from 'vs/base/common/keyCodes'; import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
import { dispose, DisposableStore } from 'vs/base/common/lifecycle'; import { dispose, DisposableStore } from 'vs/base/common/lifecycle';
...@@ -152,7 +152,7 @@ export abstract class TitleControl extends Themable { ...@@ -152,7 +152,7 @@ export abstract class TitleControl extends Themable {
// Log in telemetry // Log in telemetry
if (this.telemetryService) { if (this.telemetryService) {
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id: e.action.id, from: 'editorPart' }); this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: e.action.id, from: 'editorPart' });
} }
})); }));
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
import 'vs/css!./media/notificationsActions'; import 'vs/css!./media/notificationsActions';
import { INotificationViewItem } from 'vs/workbench/common/notifications'; import { INotificationViewItem } from 'vs/workbench/common/notifications';
import { localize } from 'vs/nls'; import { localize } from 'vs/nls';
import { Action, IAction, ActionRunner, WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { Action, IAction, ActionRunner, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { INotificationService } from 'vs/platform/notification/common/notification'; import { INotificationService } from 'vs/platform/notification/common/notification';
import { CLEAR_NOTIFICATION, EXPAND_NOTIFICATION, COLLAPSE_NOTIFICATION, CLEAR_ALL_NOTIFICATIONS, HIDE_NOTIFICATIONS_CENTER } from 'vs/workbench/browser/parts/notifications/notificationsCommands'; import { CLEAR_NOTIFICATION, EXPAND_NOTIFICATION, COLLAPSE_NOTIFICATION, CLEAR_ALL_NOTIFICATIONS, HIDE_NOTIFICATIONS_CENTER } from 'vs/workbench/browser/parts/notifications/notificationsCommands';
...@@ -161,7 +161,7 @@ export class NotificationActionRunner extends ActionRunner { ...@@ -161,7 +161,7 @@ export class NotificationActionRunner extends ActionRunner {
} }
protected async runAction(action: IAction, context: INotificationViewItem): Promise<any> { protected async runAction(action: IAction, context: INotificationViewItem): Promise<any> {
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id: action.id, from: 'message' }); this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: action.id, from: 'message' });
// Run and make sure to notify on any error again // Run and make sure to notify on any error again
try { try {
......
...@@ -15,7 +15,7 @@ import { IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiat ...@@ -15,7 +15,7 @@ import { IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiat
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { StatusbarAlignment, IStatusbarService, IStatusbarEntry, IStatusbarEntryAccessor } from 'vs/platform/statusbar/common/statusbar'; import { StatusbarAlignment, IStatusbarService, IStatusbarEntry, IStatusbarEntryAccessor } from 'vs/platform/statusbar/common/statusbar';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { Action, IAction, WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { Action, IAction, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector, ThemeColor } from 'vs/platform/theme/common/themeService'; import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector, ThemeColor } from 'vs/platform/theme/common/themeService';
import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_ITEM_ACTIVE_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_FOREGROUND, STATUS_BAR_PROMINENT_ITEM_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_NO_FOLDER_BORDER } from 'vs/workbench/common/theme'; import { STATUS_BAR_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_ITEM_ACTIVE_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_FOREGROUND, STATUS_BAR_PROMINENT_ITEM_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_NO_FOLDER_BORDER } from 'vs/workbench/common/theme';
import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
...@@ -725,7 +725,7 @@ class StatusbarEntryItem extends Disposable { ...@@ -725,7 +725,7 @@ class StatusbarEntryItem extends Disposable {
activeTextEditorWidget.focus(); activeTextEditorWidget.focus();
} }
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id, from: 'status bar' }); this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id, from: 'status bar' });
try { try {
await this.commandService.executeCommand(id, ...args); await this.commandService.executeCommand(id, ...args);
} catch (error) { } catch (error) {
......
...@@ -9,7 +9,7 @@ import * as browser from 'vs/base/browser/browser'; ...@@ -9,7 +9,7 @@ import * as browser from 'vs/base/browser/browser';
import * as dom from 'vs/base/browser/dom'; import * as dom from 'vs/base/browser/dom';
import * as arrays from 'vs/base/common/arrays'; import * as arrays from 'vs/base/common/arrays';
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
import { IAction, IRunEvent, WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { IAction, IRunEvent, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
import { ActionBar, ActionsOrientation, Separator } from 'vs/base/browser/ui/actionbar/actionbar'; import { ActionBar, ActionsOrientation, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
...@@ -141,7 +141,7 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution { ...@@ -141,7 +141,7 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution {
// log in telemetry // log in telemetry
if (this.telemetryService) { if (this.telemetryService) {
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id: e.action.id, from: 'debugActionsWidget' }); this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: e.action.id, from: 'debugActionsWidget' });
} }
})); }));
this._register(dom.addDisposableListener(window, dom.EventType.RESIZE, () => this.setCoordinates())); this._register(dom.addDisposableListener(window, dom.EventType.RESIZE, () => this.setCoordinates()));
......
...@@ -17,7 +17,7 @@ import { editorWidgetBackground, editorWidgetForeground, widgetShadow, inputBord ...@@ -17,7 +17,7 @@ import { editorWidgetBackground, editorWidgetForeground, widgetShadow, inputBord
import { IAnchor } from 'vs/base/browser/ui/contextview/contextview'; import { IAnchor } from 'vs/base/browser/ui/contextview/contextview';
import { Button } from 'vs/base/browser/ui/button/button'; import { Button } from 'vs/base/browser/ui/button/button';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar'; import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
import { IProductService } from 'vs/platform/product/common/product'; import { IProductService } from 'vs/platform/product/common/product';
...@@ -213,7 +213,7 @@ export class FeedbackDropdown extends Dropdown { ...@@ -213,7 +213,7 @@ export class FeedbackDropdown extends Dropdown {
const actionId = 'workbench.action.openIssueReporter'; const actionId = 'workbench.action.openIssueReporter';
this.commandService.executeCommand(actionId); this.commandService.executeCommand(actionId);
this.hide(); this.hide();
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id: actionId, from: 'feedback' }); this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: actionId, from: 'feedback' });
})); }));
// Contact: Request a Feature // Contact: Request a Feature
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
import * as nls from 'vs/nls'; import * as nls from 'vs/nls';
import { URI } from 'vs/base/common/uri'; import { URI } from 'vs/base/common/uri';
import * as perf from 'vs/base/common/performance'; import * as perf from 'vs/base/common/performance';
import { Action, IAction, WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { Action, IAction, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
import { memoize } from 'vs/base/common/decorators'; import { memoize } from 'vs/base/common/decorators';
import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, ExplorerRootContext, ExplorerResourceReadonlyContext, IExplorerService, ExplorerResourceCut, ExplorerResourceMoveableToTrash } from 'vs/workbench/contrib/files/common/files'; import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, ExplorerRootContext, ExplorerResourceReadonlyContext, IExplorerService, ExplorerResourceCut, ExplorerResourceMoveableToTrash } from 'vs/workbench/contrib/files/common/files';
import { NewFolderAction, NewFileAction, FileCopiedContext, RefreshExplorerView, CollapseExplorerView } from 'vs/workbench/contrib/files/browser/fileActions'; import { NewFolderAction, NewFileAction, FileCopiedContext, RefreshExplorerView, CollapseExplorerView } from 'vs/workbench/contrib/files/browser/fileActions';
...@@ -326,7 +326,7 @@ export class ExplorerView extends ViewletPanel { ...@@ -326,7 +326,7 @@ export class ExplorerView extends ViewletPanel {
// Do not react if clicking on directories // Do not react if clicking on directories
return; return;
} }
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id: 'workbench.files.openFile', from: 'explorer' }); this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: 'workbench.files.openFile', from: 'explorer' });
this.editorService.openEditor({ resource: selection[0].resource, options: { preserveFocus: e.editorOptions.preserveFocus, pinned: e.editorOptions.pinned } }, e.sideBySide ? SIDE_GROUP : ACTIVE_GROUP) this.editorService.openEditor({ resource: selection[0].resource, options: { preserveFocus: e.editorOptions.preserveFocus, pinned: e.editorOptions.pinned } }, e.sideBySide ? SIDE_GROUP : ACTIVE_GROUP)
.then(undefined, onUnexpectedError); .then(undefined, onUnexpectedError);
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import * as nls from 'vs/nls'; import * as nls from 'vs/nls';
import { RunOnceScheduler } from 'vs/base/common/async'; import { RunOnceScheduler } from 'vs/base/common/async';
import { IAction, ActionRunner, WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { IAction, ActionRunner, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
import * as dom from 'vs/base/browser/dom'; import * as dom from 'vs/base/browser/dom';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
...@@ -345,7 +345,7 @@ export class OpenEditorsView extends ViewletPanel { ...@@ -345,7 +345,7 @@ export class OpenEditorsView extends ViewletPanel {
private openEditor(element: OpenEditor, options: { preserveFocus: boolean; pinned: boolean; sideBySide: boolean; }): void { private openEditor(element: OpenEditor, options: { preserveFocus: boolean; pinned: boolean; sideBySide: boolean; }): void {
if (element) { if (element) {
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id: 'workbench.files.openFile', from: 'openEditors' }); this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: 'workbench.files.openFile', from: 'openEditors' });
const preserveActivateGroup = options.sideBySide && options.preserveFocus; // needed for https://github.com/Microsoft/vscode/issues/42399 const preserveActivateGroup = options.sideBySide && options.preserveFocus; // needed for https://github.com/Microsoft/vscode/issues/42399
if (!preserveActivateGroup) { if (!preserveActivateGroup) {
......
...@@ -7,7 +7,7 @@ import * as nls from 'vs/nls'; ...@@ -7,7 +7,7 @@ import * as nls from 'vs/nls';
import * as arrays from 'vs/base/common/arrays'; import * as arrays from 'vs/base/common/arrays';
import * as types from 'vs/base/common/types'; import * as types from 'vs/base/common/types';
import { Language } from 'vs/base/common/platform'; import { Language } from 'vs/base/common/platform';
import { Action, WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { Action, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
import { Mode, IEntryRunContext, IAutoFocus, IModel, IQuickNavigateConfiguration } from 'vs/base/parts/quickopen/common/quickOpen'; import { Mode, IEntryRunContext, IAutoFocus, IModel, IQuickNavigateConfiguration } from 'vs/base/parts/quickopen/common/quickOpen';
import { QuickOpenEntryGroup, IHighlight, QuickOpenModel, QuickOpenEntry } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { QuickOpenEntryGroup, IHighlight, QuickOpenModel, QuickOpenEntry } from 'vs/base/parts/quickopen/browser/quickOpenModel';
import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions'; import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
...@@ -297,7 +297,7 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup { ...@@ -297,7 +297,7 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
setTimeout(async () => { setTimeout(async () => {
if (action && (!(action instanceof Action) || action.enabled)) { if (action && (!(action instanceof Action) || action.enabled)) {
try { try {
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id: action.id, from: 'quick open' }); this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: action.id, from: 'quick open' });
const promise = action.run(); const promise = action.run();
if (promise) { if (promise) {
......
...@@ -17,7 +17,7 @@ import { IWindowService, IURIToOpen } from 'vs/platform/windows/common/windows'; ...@@ -17,7 +17,7 @@ import { IWindowService, IURIToOpen } from 'vs/platform/windows/common/windows';
import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
import { localize } from 'vs/nls'; import { localize } from 'vs/nls';
import { Action, WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { Action, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { Schemas } from 'vs/base/common/network'; import { Schemas } from 'vs/base/common/network';
import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
...@@ -360,7 +360,7 @@ class WelcomePage extends Disposable { ...@@ -360,7 +360,7 @@ class WelcomePage extends Disposable {
a.setAttribute('aria-label', localize('welcomePage.openFolderWithPath', "Open folder {0} with path {1}", name, parentPath)); a.setAttribute('aria-label', localize('welcomePage.openFolderWithPath', "Open folder {0} with path {1}", name, parentPath));
a.href = 'javascript:void(0)'; a.href = 'javascript:void(0)';
a.addEventListener('click', e => { a.addEventListener('click', e => {
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', {
id: 'openRecentFolder', id: 'openRecentFolder',
from: telemetryFrom from: telemetryFrom
}); });
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information. * Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import { IAction, IActionRunner, ActionRunner, WBActionExecutedEvent, WBActionExecutedClassification } from 'vs/base/common/actions'; import { IAction, IActionRunner, ActionRunner, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions';
import { Separator } from 'vs/base/browser/ui/actionbar/actionbar'; import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
import * as dom from 'vs/base/browser/dom'; import * as dom from 'vs/base/browser/dom';
import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
...@@ -173,7 +173,7 @@ class NativeContextMenuService extends Disposable implements IContextMenuService ...@@ -173,7 +173,7 @@ class NativeContextMenuService extends Disposable implements IContextMenuService
} }
private async runAction(actionRunner: IActionRunner, actionToRun: IAction, delegate: IContextMenuDelegate, event: IContextMenuEvent): Promise<void> { private async runAction(actionRunner: IActionRunner, actionToRun: IAction, delegate: IContextMenuDelegate, event: IContextMenuEvent): Promise<void> {
this.telemetryService.publicLog2<WBActionExecutedEvent, WBActionExecutedClassification>('workbenchActionExecuted', { id: actionToRun.id, from: 'contextMenu' }); this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: actionToRun.id, from: 'contextMenu' });
const context = delegate.getActionsContext ? delegate.getActionsContext(event) : event; const context = delegate.getActionsContext ? delegate.getActionsContext(event) : event;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册