chore(telemetry): telemetry improvements VSCODE-673

package.json

@@ -1361,6 +1361,7 @@
     "@types/chai": "^4.3.20",
     "@types/debug": "^4.1.12",
     "@types/glob": "^7.2.0",
+    "@types/lodash": "^4.17.14",
     "@types/micromatch": "^4.0.9",
     "@types/mkdirp": "^2.0.0",
     "@types/mocha": "^8.2.3",

src/connectionController.ts

@@ -331,7 +331,7 @@ export default class ConnectionController {
     }
   }
 
-  public sendTelemetry(
+  private sendTelemetry(
     newDataService: DataService,
     connectionType: ConnectionTypes
   ): void {
@@ -436,7 +436,7 @@ export default class ConnectionController {
       });
       const browserAuthCommand = vscode.workspace
         .getConfiguration('mdb')
-        .get('browserCommandForOIDCAuth');
+        .get<string>('browserCommandForOIDCAuth');
       dataService = await connectionAttempt.connect({
         ...connectionOptions,
         oidc: {

src/explorer/explorerController.ts

@@ -1,38 +1,43 @@
-import * as vscode from 'vscode';
+import type * as vscode from 'vscode';
 
 import type ConnectionController from '../connectionController';
 import { DataServiceEventTypes } from '../connectionController';
 import ExplorerTreeController from './explorerTreeController';
+import { createTrackedTreeView } from '../utils/treeViewHelper';
+import type { TelemetryService } from '../telemetry';
 
 export default class ExplorerController {
-  private _connectionController: ConnectionController;
   private _treeController: ExplorerTreeController;
   private _treeView?: vscode.TreeView<vscode.TreeItem>;
 
-  constructor(connectionController: ConnectionController) {
-    this._connectionController = connectionController;
-    this._treeController = new ExplorerTreeController(connectionController);
+  constructor(
+    private _connectionController: ConnectionController,
+    private _telemetryService: TelemetryService
+  ) {
+    this._treeController = new ExplorerTreeController(
+      this._connectionController,
+      this._telemetryService
+    );
   }
 
-  createTreeView = (): void => {
+  private createTreeView = (): void => {
     // Remove the listener that called this function.
     this._connectionController.removeEventListener(
       DataServiceEventTypes.CONNECTIONS_DID_CHANGE,
       this.createTreeView
     );
 
     if (!this._treeView) {
-      this._treeView = vscode.window.createTreeView(
+      this._treeView = createTrackedTreeView(
         'mongoDBConnectionExplorer',
-        {
-          treeDataProvider: this._treeController,
-        }
+        this._treeController,
+        this._telemetryService
       );
       this._treeController.activateTreeViewEventHandlers(this._treeView);
     }
   };
 
-  activateConnectionsTreeView(): void {
+  public activateConnectionsTreeView(): void {
     // Listen for a change in connections to occur before we create the tree
     // so that we show the `viewsWelcome` before any connections are added.
     this._connectionController.addEventListener(
@@ -41,7 +46,7 @@ export default class ExplorerController {
     );
   }
 
-  deactivate(): void {
+  public deactivate(): void {
     if (this._treeController) {
       this._treeController.removeListeners();
     }
@@ -52,7 +57,7 @@ export default class ExplorerController {
     }
   }
 
-  refresh(): boolean {
+  public refresh(): boolean {
     if (this._treeController) {
       return this._treeController.refresh();
     }

src/explorer/explorerTreeController.ts

@@ -9,19 +9,25 @@ import { DOCUMENT_LIST_ITEM, CollectionTypes } from './documentListTreeItem';
 import EXTENSION_COMMANDS from '../commands';
 import { sortTreeItemsByLabel } from './treeItemUtils';
 import type { LoadedConnection } from '../storage/connectionStorage';
+import {
+  TreeItemExpandedTelemetryEvent,
+  type TelemetryService,
+} from '../telemetry';
+import type TreeItemParentInterface from './treeItemParentInterface';
 
 const log = createLogger('explorer tree controller');
 
 export default class ExplorerTreeController
   implements vscode.TreeDataProvider<vscode.TreeItem>
 {
-  private _connectionController: ConnectionController;
   private _connectionTreeItems: { [key: string]: ConnectionTreeItem };
 
-  constructor(connectionController: ConnectionController) {
+  constructor(
+    private _connectionController: ConnectionController,
+    private _telemetryService: TelemetryService
+  ) {
     this._onDidChangeTreeData = new vscode.EventEmitter<void>();
     this.onDidChangeTreeData = this._onDidChangeTreeData.event;
-    this._connectionController = connectionController;
 
     // Subscribe to changes in the connections.
     this._connectionController.addEventListener(
@@ -46,14 +52,19 @@ export default class ExplorerTreeController
   activateTreeViewEventHandlers = (
     treeView: vscode.TreeView<vscode.TreeItem>
   ): void => {
-    treeView.onDidCollapseElement((event: any) => {
+    treeView.onDidCollapseElement((event) => {
       log.info('Tree item was collapsed', event.element.label);
 
-      if (event.element.onDidCollapse) {
-        event.element.onDidCollapse();
+      const treeItem = event.element as vscode.TreeItem &
+        TreeItemParentInterface;
+      if (treeItem.onDidCollapse) {
+        treeItem.onDidCollapse();
       }
 
-      if (event.element.doesNotRequireTreeUpdate) {
+      if (
+        'doesNotRequireTreeUpdate' in treeItem &&
+        treeItem.doesNotRequireTreeUpdate
+      ) {
         // When the element is already loaded (synchronous), we do not need to
         // fully refresh the tree.
         return;
@@ -62,20 +73,29 @@ export default class ExplorerTreeController
       this._onTreeItemUpdate();
     });
 
-    treeView.onDidExpandElement(async (event: any): Promise<void> => {
-      log.info('Connection tree item was expanded', {
-        connectionId: event.element.connectionId,
-        connectionName: event.element.label,
-        isExpanded: event.element.isExpanded,
+    treeView.onDidExpandElement(async (event): Promise<void> => {
+      const treeItem = event.element as vscode.TreeItem &
+        TreeItemParentInterface;
+      this._telemetryService.track(
+        new TreeItemExpandedTelemetryEvent(treeItem)
+      );
+
+      log.info('Explorer tree item was expanded', {
+        type: treeItem.contextValue,
+        connectionName: treeItem.label,
+        isExpanded: treeItem.isExpanded,
       });
 
-      if (!event.element.onDidExpand) {
+      if (!treeItem.onDidExpand) {
         return;
       }
 
-      await event.element.onDidExpand();
+      await treeItem.onDidExpand();
 
-      if (event.element.doesNotRequireTreeUpdate) {
+      if (
+        'doesNotRequireTreeUpdate' in treeItem &&
+        treeItem.doesNotRequireTreeUpdate
+      ) {
         // When the element is already loaded (synchronous), we do not
         // need to fully refresh the tree.
         return;

src/explorer/helpExplorer.ts

@@ -1,23 +1,26 @@
-import * as vscode from 'vscode';
+import type * as vscode from 'vscode';
 import HelpTree from './helpTree';
 import type { TelemetryService } from '../telemetry';
+import { createTrackedTreeView } from '../utils/treeViewHelper';
 
 export default class HelpExplorer {
   _treeController: HelpTree;
   _treeView?: vscode.TreeView<vscode.TreeItem>;
 
-  constructor() {
+  constructor(private _telemetryService: TelemetryService) {
     this._treeController = new HelpTree();
   }
 
-  activateHelpTreeView(telemetryService: TelemetryService): void {
+  activateHelpTreeView(): void {
     if (!this._treeView) {
-      this._treeView = vscode.window.createTreeView('mongoDBHelpExplorer', {
-        treeDataProvider: this._treeController,
-      });
+      this._treeView = createTrackedTreeView(
+        'mongoDBHelpExplorer',
+        this._treeController,
+        this._telemetryService
+      );
       this._treeController.activateTreeViewEventHandlers(
         this._treeView,
-        telemetryService
+        this._telemetryService
       );
     }
   }

src/explorer/playgroundsExplorer.ts

@@ -1,21 +1,22 @@
-import * as vscode from 'vscode';
+import type * as vscode from 'vscode';
 import PlaygroundsTree from './playgroundsTree';
+import type { TelemetryService } from '../telemetry';
+import { createTrackedTreeView } from '../utils/treeViewHelper';
 
 export default class PlaygroundsExplorer {
   private _treeController: PlaygroundsTree;
   private _treeView?: vscode.TreeView<vscode.TreeItem>;
 
-  constructor() {
+  constructor(private _telemetryService: TelemetryService) {
     this._treeController = new PlaygroundsTree();
   }
 
   private createPlaygroundsTreeView = (): void => {
     if (!this._treeView) {
-      this._treeView = vscode.window.createTreeView(
+      this._treeView = createTrackedTreeView(
         'mongoDBPlaygroundsExplorer',
-        {
-          treeDataProvider: this._treeController,
-        }
+        this._treeController,
+        this._telemetryService
       );
       this._treeController.activateTreeViewEventHandlers(this._treeView);
     }

src/mdbExtensionController.ts

@@ -103,10 +103,11 @@ export default class MDBExtensionController implements vscode.Disposable {
     });
     this._languageServerController = new LanguageServerController(context);
     this._explorerController = new ExplorerController(
-      this._connectionController
+      this._connectionController,
+      this._telemetryService
     );
-    this._helpExplorer = new HelpExplorer();
-    this._playgroundsExplorer = new PlaygroundsExplorer();
+    this._helpExplorer = new HelpExplorer(this._telemetryService);
+    this._playgroundsExplorer = new PlaygroundsExplorer(this._telemetryService);
     this._editDocumentCodeLensProvider = new EditDocumentCodeLensProvider(
       this._connectionController
     );
@@ -175,7 +176,7 @@ export default class MDBExtensionController implements vscode.Disposable {
 
   async activate(): Promise<void> {
     this._explorerController.activateConnectionsTreeView();
-    this._helpExplorer.activateHelpTreeView(this._telemetryService);
+    this._helpExplorer.activateHelpTreeView();
     this._playgroundsExplorer.activatePlaygroundsTreeView();
     this._telemetryService.activateSegmentAnalytics();
     this._participantController.createParticipant(this._context);

src/telemetry/telemetryEvents.ts

@@ -76,7 +76,14 @@ abstract class TelemetryEventBase {
 export class PlaygroundExecutedTelemetryEvent implements TelemetryEventBase {
   type = 'Playground Code Executed';
   properties: {
-    /** The type of the executed operation, e.g. 'insert', 'update', 'delete', 'query', 'aggregation', 'other' */
+    /**
+     * The type of the executed operation. Common CRUD operations are mapped to
+     * 'insert', 'update', 'delete', 'query', 'aggregation'. Other operations return
+     * the type of the result returned by the shell API - e.g. 'collection', 'database',
+     * 'help', etc. for known shell types and 'string', 'number', 'undefined', etc. for
+     * plain JS types. In the unlikely case the shell evaluator was unable to determine
+     * a type, 'other' is returned.
+     */
     type: string | null;
 
     /** Whether the entire script was run or just a part of it */
@@ -118,7 +125,7 @@ export class PlaygroundExecutedTelemetryEvent implements TelemetryEventBase {
       return 'query';
     }
 
-    return 'other';
+    return shellApiType;
   }
 }
 
@@ -627,6 +634,41 @@ export class PresetConnectionEditedTelemetryEvent
   }
 }
 
+/** Reported when the extension side panel is opened. VSCode doesn't expose
+ * a subscribable event for this, so we're inferring it by subscribing to
+ * treeView.onDidChangeVisibility for all the extension treeviews and throttling
+ * the events.
+ */
+export class PanelOpenedTelemetryEvent implements TelemetryEventBase {
+  type = 'Side Panel Opened';
+  properties: {};
+
+  constructor() {
+    this.properties = {};
+  }
+}
+
+/**
+ * Reported when a tree item from the collection explorer is expanded.
+ */
+export class TreeItemExpandedTelemetryEvent implements TelemetryEventBase {
+  type = 'Section Expanded';
+  properties: {
+    /**
+     * The name of the section - e.g. database, collection, etc. This is obtained from the
+     * `contextValue` field of the tree item.
+     * */
+    section_name?: string;
+  };
+
+  constructor(item: vscode.TreeItem) {
+    // We suffix all tree item context values with 'TreeItem', which is redundant when sending to analytics.
+    this.properties = {
+      section_name: item.contextValue?.replace('TreeItem', ''),
+    };
+  }
+}
+
 export type TelemetryEvent =
   | PlaygroundExecutedTelemetryEvent
   | LinkClickedTelemetryEvent
@@ -649,4 +691,6 @@ export type TelemetryEvent =
   | ParticipantChatOpenedFromActionTelemetryEvent
   | ParticipantInputBoxSubmittedTelemetryEvent
   | ParticipantResponseGeneratedTelemetryEvent
-  | PresetConnectionEditedTelemetryEvent;
+  | PresetConnectionEditedTelemetryEvent
+  | PanelOpenedTelemetryEvent
+  | TreeItemExpandedTelemetryEvent;