From 305196109385654b4b8efb6b628841f3641c1cd9 Mon Sep 17 00:00:00 2001 From: Steve Faulkner Date: Mon, 10 Aug 2020 18:43:45 -0500 Subject: [PATCH] Add subscriptionId and authType to telemetry (#140) --- src/Shared/Telemetry/TelemetryProcessor.ts | 4 + tsconfig.strict.json | 156 ++++++++++----------- 2 files changed, 82 insertions(+), 78 deletions(-) diff --git a/src/Shared/Telemetry/TelemetryProcessor.ts b/src/Shared/Telemetry/TelemetryProcessor.ts index d8a6f7f18..8d8d16d95 100644 --- a/src/Shared/Telemetry/TelemetryProcessor.ts +++ b/src/Shared/Telemetry/TelemetryProcessor.ts @@ -3,6 +3,7 @@ import { sendMessage } from "../../Common/MessageHandler"; import { MessageTypes } from "../../Contracts/ExplorerContracts"; import { appInsights } from "../appInsights"; import { configContext } from "../../ConfigContext"; +import { userContext } from "../../UserContext"; /** * Class that persists telemetry data to the portal tables. @@ -115,6 +116,9 @@ export default class TelemetryProcessor { private static getData(data?: any): any { return { + // TODO: Need to `any` here since the window imports Explorer which can't be in strict mode yet + authType: (window as any).authType, + subscriptionId: userContext.subscriptionId, platform: configContext.platform, ...(data ? data : []) }; diff --git a/tsconfig.strict.json b/tsconfig.strict.json index e5edef88f..055d811a2 100644 --- a/tsconfig.strict.json +++ b/tsconfig.strict.json @@ -1,79 +1,79 @@ { - "extends": "./tsconfig.json", - "compilerOptions": { - "noEmit": true, - "strictNullChecks": true, - "strict": true, - "noUnusedLocals": true - }, - "files": [ - "./src/AuthType.ts", - "./src/Bindings/BindingHandlersRegisterer.ts", - "./src/Bindings/ReactBindingHandler.ts", - "./src/Common/ArrayHashMap.ts", - "./src/Common/Constants.ts", - "./src/Common/DeleteFeedback.ts", - "./src/Common/HashMap.ts", - "./src/Common/HeadersUtility.ts", - "./src/Common/Logger.ts", - "./src/Common/MessageHandler.ts", - "./src/Common/MongoUtility.ts", - "./src/Common/ObjectCache.ts", - "./src/Common/ThemeUtility.ts", - "./src/Common/UrlUtility.ts", - "./src/Common/dataAccess/sendNotificationForError.ts", - "./src/ConfigContext.ts", - "./src/Contracts/ActionContracts.ts", - "./src/Contracts/DataModels.ts", - "./src/Contracts/Diagnostics.ts", - "./src/Contracts/ExplorerContracts.ts", - "./src/Contracts/Versions.ts", - "./src/Controls/Heatmap/Heatmap.ts", - "./src/Controls/Heatmap/HeatmapDatatypes.ts", - "./src/Definitions/globals.d.ts", - "./src/Definitions/html.d.ts", - "./src/Definitions/jquery-ui.d.ts", - "./src/Definitions/jquery.d.ts", - "./src/Definitions/plotly.js-cartesian-dist.d-min.ts", - "./src/Definitions/svg.d.ts", - "./src/Explorer/Controls/ErrorDisplayComponent/ErrorDisplayComponent.ts", - "./src/Explorer/Controls/GitHub/GitHubStyleConstants.ts", - "./src/Explorer/Controls/SmartUi/InputUtils.ts", - "./src/Explorer/Notebook/FileSystemUtil.ts", - "./src/Explorer/Notebook/NTeractUtil.ts", - "./src/Explorer/Notebook/NotebookComponent/actions.ts", - "./src/Explorer/Notebook/NotebookComponent/loadTransform.ts", - "./src/Explorer/Notebook/NotebookComponent/reducers.ts", - "./src/Explorer/Notebook/NotebookComponent/types.ts", - "./src/Explorer/Notebook/NotebookContentItem.ts", - "./src/Explorer/Notebook/NotebookUtil.ts", - "./src/Explorer/Panes/PaneComponents.ts", - "./src/Explorer/Panes/Tables/Validators/EntityPropertyNameValidator.ts", - "./src/Explorer/Panes/Tables/Validators/EntityPropertyValidationCommon.ts", - "./src/Explorer/Tables/Constants.ts", - "./src/Explorer/Tables/QueryBuilder/DateTimeUtilities.ts", - "./src/Explorer/Tabs/TabComponents.ts", - "./src/GitHub/GitHubConnector.ts", - "./src/Index.ts", - "./src/NotebookWorkspaceManager/NotebookWorkspaceResourceProviderMockClients.ts", - "./src/PlatformType.ts", - "./src/ReactDevTools.ts", - "./src/ResourceProvider/IResourceProviderClient.ts", - "./src/Shared/ExplorerSettings.ts", - "./src/Shared/StorageUtility.ts", - "./src/Shared/StringUtility.ts", - "./src/Shared/Telemetry/TelemetryConstants.ts", - "./src/Shared/Telemetry/TelemetryProcessor.ts", - "./src/Shared/appInsights.ts", - "./src/UserContext.ts", - "./src/Utils/GitHubUtils.ts", - "./src/Utils/MessageValidation.ts", - "./src/Utils/OfferUtils.ts", - "./src/Utils/StringUtils.ts", - "./src/Utils/arm/generatedClients/2020-04-01/types.ts", - "./src/quickstart.ts", - "./src/setupTests.ts", - "./src/workers/upload/definitions.ts" - ], - "include": [] -} \ No newline at end of file + "extends": "./tsconfig.json", + "compilerOptions": { + "noEmit": true, + "strictNullChecks": true, + "strict": true, + "noUnusedLocals": true + }, + "files": [ + "./src/AuthType.ts", + "./src/Bindings/BindingHandlersRegisterer.ts", + "./src/Bindings/ReactBindingHandler.ts", + "./src/Common/ArrayHashMap.ts", + "./src/Common/Constants.ts", + "./src/Common/DeleteFeedback.ts", + "./src/Common/HashMap.ts", + "./src/Common/HeadersUtility.ts", + "./src/Common/Logger.ts", + "./src/Common/MessageHandler.ts", + "./src/Common/MongoUtility.ts", + "./src/Common/ObjectCache.ts", + "./src/Common/ThemeUtility.ts", + "./src/Common/UrlUtility.ts", + "./src/Common/dataAccess/sendNotificationForError.ts", + "./src/ConfigContext.ts", + "./src/Contracts/ActionContracts.ts", + "./src/Contracts/DataModels.ts", + "./src/Contracts/Diagnostics.ts", + "./src/Contracts/ExplorerContracts.ts", + "./src/Contracts/Versions.ts", + "./src/Controls/Heatmap/Heatmap.ts", + "./src/Controls/Heatmap/HeatmapDatatypes.ts", + "./src/Definitions/globals.d.ts", + "./src/Definitions/html.d.ts", + "./src/Definitions/jquery-ui.d.ts", + "./src/Definitions/jquery.d.ts", + "./src/Definitions/plotly.js-cartesian-dist.d-min.ts", + "./src/Definitions/svg.d.ts", + "./src/Explorer/Controls/ErrorDisplayComponent/ErrorDisplayComponent.ts", + "./src/Explorer/Controls/GitHub/GitHubStyleConstants.ts", + "./src/Explorer/Controls/SmartUi/InputUtils.ts", + "./src/Explorer/Notebook/FileSystemUtil.ts", + "./src/Explorer/Notebook/NTeractUtil.ts", + "./src/Explorer/Notebook/NotebookComponent/actions.ts", + "./src/Explorer/Notebook/NotebookComponent/loadTransform.ts", + "./src/Explorer/Notebook/NotebookComponent/reducers.ts", + "./src/Explorer/Notebook/NotebookComponent/types.ts", + "./src/Explorer/Notebook/NotebookContentItem.ts", + "./src/Explorer/Notebook/NotebookUtil.ts", + "./src/Explorer/Panes/PaneComponents.ts", + "./src/Explorer/Panes/Tables/Validators/EntityPropertyNameValidator.ts", + "./src/Explorer/Panes/Tables/Validators/EntityPropertyValidationCommon.ts", + "./src/Explorer/Tables/Constants.ts", + "./src/Explorer/Tables/QueryBuilder/DateTimeUtilities.ts", + "./src/Explorer/Tabs/TabComponents.ts", + "./src/GitHub/GitHubConnector.ts", + "./src/Index.ts", + "./src/NotebookWorkspaceManager/NotebookWorkspaceResourceProviderMockClients.ts", + "./src/PlatformType.ts", + "./src/ReactDevTools.ts", + "./src/ResourceProvider/IResourceProviderClient.ts", + "./src/Shared/ExplorerSettings.ts", + "./src/Shared/StorageUtility.ts", + "./src/Shared/StringUtility.ts", + "./src/Shared/Telemetry/TelemetryConstants.ts", + "./src/Shared/Telemetry/TelemetryProcessor.ts", + "./src/Shared/appInsights.ts", + "./src/UserContext.ts", + "./src/Utils/GitHubUtils.ts", + "./src/Utils/MessageValidation.ts", + "./src/Utils/OfferUtils.ts", + "./src/Utils/StringUtils.ts", + "./src/Utils/arm/generatedClients/2020-04-01/types.ts", + "./src/quickstart.ts", + "./src/setupTests.ts", + "./src/workers/upload/definitions.ts" + ], + "include": [] +}