From 960f567da7ab501b9be41b3fc0d3e65c8ba539af Mon Sep 17 00:00:00 2001 From: Logan Ramos Date: Wed, 3 Jul 2019 10:15:28 -0700 Subject: [PATCH] Removes abbreviations in strongly typed telemetry events (#76478) * Remove abbreviations * Fixed spelling mistake --- src/vs/base/common/actions.ts | 4 ++-- .../contextview/browser/contextMenuHandler.ts | 4 ++-- .../node/extensionGalleryService.ts | 14 +++++++------- .../common/abstractKeybindingService.ts | 4 ++-- .../platform/menubar/electron-main/menubar.ts | 4 ++-- .../telemetry/common/telemetryService.ts | 4 ++-- .../telemetry/common/telemetryUtils.ts | 18 +++++++++--------- .../workbench/browser/parts/compositePart.ts | 4 ++-- .../browser/parts/editor/titleControl.ts | 4 ++-- .../notifications/notificationsActions.ts | 4 ++-- .../browser/parts/statusbar/statusbarPart.ts | 4 ++-- .../contrib/debug/browser/debugToolBar.ts | 4 ++-- .../contrib/feedback/browser/feedback.ts | 4 ++-- .../files/browser/views/explorerView.ts | 4 ++-- .../files/browser/views/openEditorsView.ts | 4 ++-- .../quickopen/browser/commandsHandler.ts | 4 ++-- .../welcome/page/browser/welcomePage.ts | 4 ++-- .../electron-browser/contextmenuService.ts | 4 ++-- 18 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/vs/base/common/actions.ts b/src/vs/base/common/actions.ts index 14925ea276a..b0e1b6f161e 100644 --- a/src/vs/base/common/actions.ts +++ b/src/vs/base/common/actions.ts @@ -12,12 +12,12 @@ export interface ITelemetryData { [key: string]: any; } -export type WBActionExecutedClassification = { +export type WorkbenchActionExecutedClassification = { id: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; from: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; }; -export type WBActionExecutedEvent = { +export type WorkbenchActionExecutedEvent = { id: string; from: string; }; diff --git a/src/vs/platform/contextview/browser/contextMenuHandler.ts b/src/vs/platform/contextview/browser/contextMenuHandler.ts index 8bcf74d2b6e..4d3479aae8b 100644 --- a/src/vs/platform/contextview/browser/contextMenuHandler.ts +++ b/src/vs/platform/contextview/browser/contextMenuHandler.ts @@ -5,8 +5,8 @@ import 'vs/css!./contextMenuHandler'; +import { ActionRunner, IRunEvent, WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification } from 'vs/base/common/actions'; 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 { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; @@ -132,7 +132,7 @@ export class ContextMenuHandler { private onActionRun(e: IRunEvent): void { if (this.telemetryService) { - this.telemetryService.publicLog2('workbenchActionExecuted', { id: e.action.id, from: 'contextMenu' }); + this.telemetryService.publicLog2('workbenchActionExecuted', { id: e.action.id, from: 'contextMenu' }); } this.contextViewService.hideContextView(false); diff --git a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts index ad13418d430..473b0af7e6b 100644 --- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts +++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts @@ -647,26 +647,26 @@ export class ExtensionGalleryService implements IExtensionGalleryService { } const message = getErrorMessage(err); - type GalleryServiceREClassification = { + type GalleryServiceRequestErrorClassification = { url: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; cdn: { classification: 'SystemMetaData', purpose: 'FeatureInsight', isMeasurement: true }; message: { classification: 'CallstackOrException', purpose: 'FeatureInsight' }; }; - type GalleryServiceREServiceEvent = { + type GalleryServiceRequestErrorEvent = { url: string; cdn: boolean; message: string; }; - this.telemetryService.publicLog2('galleryService:requestError', { url, cdn: true, message }); - type GalleryServiceCDNFBClassification = { + this.telemetryService.publicLog2('galleryService:requestError', { url, cdn: true, message }); + type GalleryServiceCDNFallbackClassification = { url: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; message: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; }; - type GalleryServiceCDNFBEvent = { + type GalleryServiceCDNFallbackEvent = { url: string; message: string; }; - this.telemetryService.publicLog2('galleryService:cdnFallback', { url, message }); + this.telemetryService.publicLog2('galleryService:cdnFallback', { url, message }); const fallbackOptions = assign({}, options, { url: fallbackUrl }); return this.requestService.request(fallbackOptions, token).then(undefined, err => { @@ -675,7 +675,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService { } const message = getErrorMessage(err); - this.telemetryService.publicLog2('galleryService:requestError', { url: fallbackUrl, cdn: false, message }); + this.telemetryService.publicLog2('galleryService:requestError', { url: fallbackUrl, cdn: false, message }); return Promise.reject(err); }); }); diff --git a/src/vs/platform/keybinding/common/abstractKeybindingService.ts b/src/vs/platform/keybinding/common/abstractKeybindingService.ts index ddbc309ec5a..0a138fd3639 100644 --- a/src/vs/platform/keybinding/common/abstractKeybindingService.ts +++ b/src/vs/platform/keybinding/common/abstractKeybindingService.ts @@ -16,7 +16,7 @@ import { IResolveResult, KeybindingResolver } from 'vs/platform/keybinding/commo import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem'; import { INotificationService } from 'vs/platform/notification/common/notification'; 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 { keypress: string; @@ -196,7 +196,7 @@ export abstract class AbstractKeybindingService extends Disposable implements IK } else { this._commandService.executeCommand(resolveResult.commandId, resolveResult.commandArgs).then(undefined, err => this._notificationService.warn(err)); } - this._telemetryService.publicLog2('workbenchActionExecuted', { id: resolveResult.commandId, from: 'keybinding' }); + this._telemetryService.publicLog2('workbenchActionExecuted', { id: resolveResult.commandId, from: 'keybinding' }); } return shouldPreventDefault; diff --git a/src/vs/platform/menubar/electron-main/menubar.ts b/src/vs/platform/menubar/electron-main/menubar.ts index db54a6e81de..c8091409e3f 100644 --- a/src/vs/platform/menubar/electron-main/menubar.ts +++ b/src/vs/platform/menubar/electron-main/menubar.ts @@ -21,7 +21,7 @@ import { IMenubarData, IMenubarKeybinding, MenubarMenuItem, isMenubarMenuItemSep import { URI } from 'vs/base/common/uri'; import { IStateService } from 'vs/platform/state/common/state'; 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'; @@ -784,7 +784,7 @@ export class Menubar { } private reportMenuActionTelemetry(id: string): void { - this.telemetryService.publicLog2('workbenchActionExecuted', { id, from: telemetryFrom }); + this.telemetryService.publicLog2('workbenchActionExecuted', { id, from: telemetryFrom }); } private mnemonicLabel(label: string): string { diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts index 8790401d7c7..30fb12f5f79 100644 --- a/src/vs/platform/telemetry/common/telemetryService.ts +++ b/src/vs/platform/telemetry/common/telemetryService.ts @@ -57,13 +57,13 @@ export class TelemetryService implements ITelemetryService { if (this._configurationService) { this._updateUserOptIn(); this._configurationService.onDidChangeConfiguration(this._updateUserOptIn, this, this._disposables); - type OptInClass = { + type OptInClassification = { optIn: { classification: 'SystemMetaData', purpose: 'BusinessInsight', isMeasurement: true }; }; type OptInEvent = { optIn: boolean; }; - this.publicLog2('optInStatus', { optIn: this._userOptIn }); + this.publicLog2('optInStatus', { optIn: this._userOptIn }); this._commonProperties.then(values => { const isHashedId = /^[a-f0-9]+$/i.test(values['common.machineId']); diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts index e05a710372b..dd9ef9aeea7 100644 --- a/src/vs/platform/telemetry/common/telemetryUtils.ts +++ b/src/vs/platform/telemetry/common/telemetryUtils.ts @@ -195,27 +195,27 @@ const configurationValueWhitelist = [ export function configurationTelemetry(telemetryService: ITelemetryService, configurationService: IConfigurationService): IDisposable { return configurationService.onDidChangeConfiguration(event => { if (event.source !== ConfigurationTarget.DEFAULT) { - type UpdateConfigClassification = { + type UpdateConfigurationClassification = { configurationSource: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; configurationKeys: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; }; - type UpdateConfigEvent = { + type UpdateConfigurationEvent = { configurationSource: string; configurationKeys: string[]; }; - telemetryService.publicLog2('updateConfiguration', { + telemetryService.publicLog2('updateConfiguration', { configurationSource: ConfigurationTargetToString(event.source), configurationKeys: flattenKeys(event.sourceConfig) }); - type UpdateConfigValClassification = { + type UpdateConfigurationValuesClassification = { configurationSource: { classification: 'SystemMetaData', purpose: 'FeatureInsight' }; configurationValues: { classification: 'CustomerContent', purpose: 'FeatureInsight' }; }; - type UpdateConfigValEvent = { + type UpdateConfigurationValuesEvent = { configurationSource: string; configurationValues: { [key: string]: any }[]; }; - telemetryService.publicLog2('updateConfigurationValues', { + telemetryService.publicLog2('updateConfigurationValues', { configurationSource: ConfigurationTargetToString(event.source), configurationValues: flattenValues(event.sourceConfig, configurationValueWhitelist) }); @@ -226,13 +226,13 @@ export function configurationTelemetry(telemetryService: ITelemetryService, conf export function keybindingsTelemetry(telemetryService: ITelemetryService, keybindingService: IKeybindingService): IDisposable { return keybindingService.onDidUpdateKeybindings(event => { if (event.source === KeybindingSource.User && event.keybindings) { - type UpdateKBClassification = { + type UpdateKeybindingsClassification = { bindings: { classification: 'CustomerContent', purpose: 'FeatureInsight' }; }; - type UpdateKBEvents = { + type UpdateKeybindingsEvents = { bindings: { key: string, command: string, when: string | undefined, args: boolean | undefined }[]; }; - telemetryService.publicLog2('updateKeybindings', { + telemetryService.publicLog2('updateKeybindings', { bindings: event.keybindings.map(binding => ({ key: binding.key, command: binding.command, diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts index 38b5da80ef5..d09cf93901b 100644 --- a/src/vs/workbench/browser/parts/compositePart.ts +++ b/src/vs/workbench/browser/parts/compositePart.ts @@ -14,7 +14,7 @@ import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar'; import { IActionViewItem, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar'; import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar'; 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 { Composite, CompositeRegistry } from 'vs/workbench/browser/composite'; import { IComposite } from 'vs/workbench/common/composite'; @@ -261,7 +261,7 @@ export abstract class CompositePart extends Part { // Log in telemetry if (this.telemetryService) { - this.telemetryService.publicLog2('workbenchActionExecuted', { id: e.action.id, from: this.nameForTelemetry }); + this.telemetryService.publicLog2('workbenchActionExecuted', { id: e.action.id, from: this.nameForTelemetry }); } }); diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts index 3ae79e95d7d..967a587184f 100644 --- a/src/vs/workbench/browser/parts/editor/titleControl.ts +++ b/src/vs/workbench/browser/parts/editor/titleControl.ts @@ -8,7 +8,7 @@ import { addDisposableListener, Dimension, EventType } from 'vs/base/browser/dom import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { ActionsOrientation, IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar'; 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 { ResolvedKeybinding } from 'vs/base/common/keyCodes'; import { dispose, DisposableStore } from 'vs/base/common/lifecycle'; @@ -152,7 +152,7 @@ export abstract class TitleControl extends Themable { // Log in telemetry if (this.telemetryService) { - this.telemetryService.publicLog2('workbenchActionExecuted', { id: e.action.id, from: 'editorPart' }); + this.telemetryService.publicLog2('workbenchActionExecuted', { id: e.action.id, from: 'editorPart' }); } })); } diff --git a/src/vs/workbench/browser/parts/notifications/notificationsActions.ts b/src/vs/workbench/browser/parts/notifications/notificationsActions.ts index eca2e75e76c..c4ef92629a4 100644 --- a/src/vs/workbench/browser/parts/notifications/notificationsActions.ts +++ b/src/vs/workbench/browser/parts/notifications/notificationsActions.ts @@ -6,7 +6,7 @@ import 'vs/css!./media/notificationsActions'; import { INotificationViewItem } from 'vs/workbench/common/notifications'; 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 { 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'; @@ -161,7 +161,7 @@ export class NotificationActionRunner extends ActionRunner { } protected async runAction(action: IAction, context: INotificationViewItem): Promise { - this.telemetryService.publicLog2('workbenchActionExecuted', { id: action.id, from: 'message' }); + this.telemetryService.publicLog2('workbenchActionExecuted', { id: action.id, from: 'message' }); // Run and make sure to notify on any error again try { diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts index 82caead6b6d..7ae3a2a1d76 100644 --- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts +++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts @@ -15,7 +15,7 @@ import { IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiat import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { StatusbarAlignment, IStatusbarService, IStatusbarEntry, IStatusbarEntryAccessor } from 'vs/platform/statusbar/common/statusbar'; 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 { 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'; @@ -725,7 +725,7 @@ class StatusbarEntryItem extends Disposable { activeTextEditorWidget.focus(); } - this.telemetryService.publicLog2('workbenchActionExecuted', { id, from: 'status bar' }); + this.telemetryService.publicLog2('workbenchActionExecuted', { id, from: 'status bar' }); try { await this.commandService.executeCommand(id, ...args); } catch (error) { diff --git a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts index 56fda384f0d..dc603f4eedb 100644 --- a/src/vs/workbench/contrib/debug/browser/debugToolBar.ts +++ b/src/vs/workbench/contrib/debug/browser/debugToolBar.ts @@ -9,7 +9,7 @@ import * as browser from 'vs/base/browser/browser'; import * as dom from 'vs/base/browser/dom'; import * as arrays from 'vs/base/common/arrays'; 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 { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; @@ -141,7 +141,7 @@ export class DebugToolBar extends Themable implements IWorkbenchContribution { // log in telemetry if (this.telemetryService) { - this.telemetryService.publicLog2('workbenchActionExecuted', { id: e.action.id, from: 'debugActionsWidget' }); + this.telemetryService.publicLog2('workbenchActionExecuted', { id: e.action.id, from: 'debugActionsWidget' }); } })); this._register(dom.addDisposableListener(window, dom.EventType.RESIZE, () => this.setCoordinates())); diff --git a/src/vs/workbench/contrib/feedback/browser/feedback.ts b/src/vs/workbench/contrib/feedback/browser/feedback.ts index 9655b55c958..9cebd7fe920 100644 --- a/src/vs/workbench/contrib/feedback/browser/feedback.ts +++ b/src/vs/workbench/contrib/feedback/browser/feedback.ts @@ -17,7 +17,7 @@ import { editorWidgetBackground, editorWidgetForeground, widgetShadow, inputBord import { IAnchor } from 'vs/base/browser/ui/contextview/contextview'; import { Button } from 'vs/base/browser/ui/button/button'; 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 { IProductService } from 'vs/platform/product/common/product'; @@ -213,7 +213,7 @@ export class FeedbackDropdown extends Dropdown { const actionId = 'workbench.action.openIssueReporter'; this.commandService.executeCommand(actionId); this.hide(); - this.telemetryService.publicLog2('workbenchActionExecuted', { id: actionId, from: 'feedback' }); + this.telemetryService.publicLog2('workbenchActionExecuted', { id: actionId, from: 'feedback' }); })); // Contact: Request a Feature diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts index fbc052ece11..c00e7867bbf 100644 --- a/src/vs/workbench/contrib/files/browser/views/explorerView.ts +++ b/src/vs/workbench/contrib/files/browser/views/explorerView.ts @@ -6,7 +6,7 @@ import * as nls from 'vs/nls'; import { URI } from 'vs/base/common/uri'; 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 { 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'; @@ -326,7 +326,7 @@ export class ExplorerView extends ViewletPanel { // Do not react if clicking on directories return; } - this.telemetryService.publicLog2('workbenchActionExecuted', { id: 'workbench.files.openFile', from: 'explorer' }); + this.telemetryService.publicLog2('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) .then(undefined, onUnexpectedError); } diff --git a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts index 30e2150437b..31a5963340f 100644 --- a/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts +++ b/src/vs/workbench/contrib/files/browser/views/openEditorsView.ts @@ -5,7 +5,7 @@ import * as nls from 'vs/nls'; 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 { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -345,7 +345,7 @@ export class OpenEditorsView extends ViewletPanel { private openEditor(element: OpenEditor, options: { preserveFocus: boolean; pinned: boolean; sideBySide: boolean; }): void { if (element) { - this.telemetryService.publicLog2('workbenchActionExecuted', { id: 'workbench.files.openFile', from: 'openEditors' }); + this.telemetryService.publicLog2('workbenchActionExecuted', { id: 'workbench.files.openFile', from: 'openEditors' }); const preserveActivateGroup = options.sideBySide && options.preserveFocus; // needed for https://github.com/Microsoft/vscode/issues/42399 if (!preserveActivateGroup) { diff --git a/src/vs/workbench/contrib/quickopen/browser/commandsHandler.ts b/src/vs/workbench/contrib/quickopen/browser/commandsHandler.ts index d1a3d725563..7728e87a884 100644 --- a/src/vs/workbench/contrib/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/contrib/quickopen/browser/commandsHandler.ts @@ -7,7 +7,7 @@ import * as nls from 'vs/nls'; import * as arrays from 'vs/base/common/arrays'; import * as types from 'vs/base/common/types'; 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 { QuickOpenEntryGroup, IHighlight, QuickOpenModel, QuickOpenEntry } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions'; @@ -297,7 +297,7 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup { setTimeout(async () => { if (action && (!(action instanceof Action) || action.enabled)) { try { - this.telemetryService.publicLog2('workbenchActionExecuted', { id: action.id, from: 'quick open' }); + this.telemetryService.publicLog2('workbenchActionExecuted', { id: action.id, from: 'quick open' }); const promise = action.run(); if (promise) { diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts index 37218b7f241..64a9afe8fe8 100644 --- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts +++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts @@ -17,7 +17,7 @@ import { IWindowService, IURIToOpen } from 'vs/platform/windows/common/windows'; import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; 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 { Schemas } from 'vs/base/common/network'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; @@ -360,7 +360,7 @@ class WelcomePage extends Disposable { a.setAttribute('aria-label', localize('welcomePage.openFolderWithPath', "Open folder {0} with path {1}", name, parentPath)); a.href = 'javascript:void(0)'; a.addEventListener('click', e => { - this.telemetryService.publicLog2('workbenchActionExecuted', { + this.telemetryService.publicLog2('workbenchActionExecuted', { id: 'openRecentFolder', from: telemetryFrom }); diff --git a/src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts b/src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts index d06480d2b43..f0a715d5868 100644 --- a/src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts +++ b/src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts @@ -3,7 +3,7 @@ * 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 * as dom from 'vs/base/browser/dom'; import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView'; @@ -173,7 +173,7 @@ class NativeContextMenuService extends Disposable implements IContextMenuService } private async runAction(actionRunner: IActionRunner, actionToRun: IAction, delegate: IContextMenuDelegate, event: IContextMenuEvent): Promise { - this.telemetryService.publicLog2('workbenchActionExecuted', { id: actionToRun.id, from: 'contextMenu' }); + this.telemetryService.publicLog2('workbenchActionExecuted', { id: actionToRun.id, from: 'contextMenu' }); const context = delegate.getActionsContext ? delegate.getActionsContext(event) : event; -- GitLab