From a9a57f4ba90728fdc4388c96d0551769d311190c Mon Sep 17 00:00:00 2001 From: Srinath Narayanan Date: Mon, 12 Oct 2020 09:01:00 -0700 Subject: [PATCH] Added telelmetry for settings v2 and v1 (#269) * Added telelmetry for settings v2 and v1 * format errors fixed * renamed actions --- .../Controls/Settings/SettingsComponent.tsx | 18 +++++++++++------- src/Explorer/Tabs/SettingsTab.ts | 5 ++++- src/Explorer/Tabs/SettingsTabV2.tsx | 1 + src/Explorer/Tabs/TabsBase.ts | 6 ++++-- src/Shared/Telemetry/TelemetryConstants.ts | 5 ++++- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/Explorer/Controls/Settings/SettingsComponent.tsx b/src/Explorer/Controls/Settings/SettingsComponent.tsx index 7d2e4a336..05b65c645 100644 --- a/src/Explorer/Controls/Settings/SettingsComponent.tsx +++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx @@ -6,8 +6,8 @@ import * as SharedConstants from "../../../Shared/Constants"; import * as ViewModels from "../../../Contracts/ViewModels"; import DiscardIcon from "../../../../images/discard.svg"; import SaveIcon from "../../../../images/save-cosmos.svg"; -import { traceStart, traceFailure, traceSuccess } from "../../../Shared/Telemetry/TelemetryProcessor"; -import { Action } from "../../../Shared/Telemetry/TelemetryConstants"; +import { traceStart, traceFailure, traceSuccess, trace } from "../../../Shared/Telemetry/TelemetryProcessor"; +import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants"; import { RequestOptions } from "@azure/cosmos/dist-esm"; import Explorer from "../../Explorer"; import { updateOffer } from "../../../Common/dataAccess/updateOffer"; @@ -122,8 +122,8 @@ export class SettingsComponent extends React.Component { + trace(Action.SettingsV2Discarded, ActionModifiers.Mark, { + message: "Settings Discarded" + }); + this.setState({ throughput: this.state.throughputBaseline, timeToLive: this.state.timeToLiveBaseline, diff --git a/src/Explorer/Tabs/SettingsTab.ts b/src/Explorer/Tabs/SettingsTab.ts index c9da9420d..77354ea36 100644 --- a/src/Explorer/Tabs/SettingsTab.ts +++ b/src/Explorer/Tabs/SettingsTab.ts @@ -13,7 +13,7 @@ import Q from "q"; import SaveIcon from "../../../images/save-cosmos.svg"; import TabsBase from "./TabsBase"; import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; -import { Action } from "../../Shared/Telemetry/TelemetryConstants"; +import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants"; import { PlatformType } from "../../PlatformType"; import { RequestOptions } from "@azure/cosmos/dist-esm"; import Explorer from "../Explorer"; @@ -1233,6 +1233,9 @@ export default class SettingsTab extends TabsBase implements ViewModels.WaitsFor }; public onRevertClick = (): Q.Promise => { + TelemetryProcessor.trace(Action.DiscardSettings, ActionModifiers.Mark, { + message: "Settings Discarded" + }); this.throughput.setBaseline(this.throughput.getEditableOriginalValue()); this.timeToLive.setBaseline(this.timeToLive.getEditableOriginalValue()); this.timeToLiveSeconds.setBaseline(this.timeToLiveSeconds.getEditableOriginalValue()); diff --git a/src/Explorer/Tabs/SettingsTabV2.tsx b/src/Explorer/Tabs/SettingsTabV2.tsx index 2abb98b50..594365e6e 100644 --- a/src/Explorer/Tabs/SettingsTabV2.tsx +++ b/src/Explorer/Tabs/SettingsTabV2.tsx @@ -9,6 +9,7 @@ export default class SettingsTabV2 extends TabsBase { constructor(options: ViewModels.TabOptions) { super(options); + this.tabId = "SettingsV2-" + this.tabId; const props: SettingsComponentProps = { settingsTab: this }; diff --git a/src/Explorer/Tabs/TabsBase.ts b/src/Explorer/Tabs/TabsBase.ts index 82dbe340c..b22b52339 100644 --- a/src/Explorer/Tabs/TabsBase.ts +++ b/src/Explorer/Tabs/TabsBase.ts @@ -88,7 +88,8 @@ export default class TabsBase extends WaitsForTemplateViewModel { databaseAccountName: this.getContainer().databaseAccount().name, defaultExperience: this.getContainer().defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + tabId: this.tabId }); } @@ -145,7 +146,8 @@ export default class TabsBase extends WaitsForTemplateViewModel { databaseAccountName: this.getContainer().databaseAccount().name, defaultExperience: this.getContainer().defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + tabId: this.tabId }); return Q(); } diff --git a/src/Shared/Telemetry/TelemetryConstants.ts b/src/Shared/Telemetry/TelemetryConstants.ts index 8b3f5db4e..de2c20766 100644 --- a/src/Shared/Telemetry/TelemetryConstants.ts +++ b/src/Shared/Telemetry/TelemetryConstants.ts @@ -86,7 +86,10 @@ export enum Action { CreateMongoCollectionWithWildcardIndex, ClickCommandBarButton, RefreshResourceTreeMyNotebooks, - ClickResourceTreeNodeContextMenuItem + ClickResourceTreeNodeContextMenuItem, + DiscardSettings, + SettingsV2Updated, + SettingsV2Discarded } export const ActionModifiers = {