add telemetry wrapper for common operations. (#71)

* add telemetry wrapper for common operations.

Author: andxu

package-lock.json

@@ -113,6 +113,7 @@
     "find-java-home": "^0.2.0",
     "fs-extra": "^7.0.0",
     "vscode-extension-telemetry": "0.0.22",
+    "vscode-extension-telemetry-wrapper": "^0.3.3",
     "xml2js": "^0.4.19"
   }
 }

package.json

@@ -2,23 +2,32 @@
 // Licensed under the MIT license.
 
 import { commands, ExtensionContext } from "vscode";
+import { dispose as disposeTelemetryWrapper, initializeFromJsonFile, instrumentOperation } from "vscode-extension-telemetry-wrapper";
 import { Commands } from "./commands";
 import { ProjectController } from "./controllers/projectController";
 import { Services } from "./services";
 import { Settings } from "./settings";
-import { Telemetry } from "./telemetry";
-import { DependencyExplorer } from "./views/depedencyExplorer";
+import { DependencyExplorer } from "./views/dependencyExplorer";
 
-export function activate(context: ExtensionContext) {
-    Telemetry.sendEvent("activateExtension", {});
+export async function activate(context: ExtensionContext): Promise<any> {
+    await initializeFromJsonFile(context.asAbsolutePath("./package.json"));
+    return instrumentOperation("activation", activateExtension)(context);
+}
 
+function activateExtension(operationId: string, context: ExtensionContext) {
     commands.executeCommand("setContext", "extensionActivated", true);
 
     Services.initialize(context);
     Settings.initialize(context);
 
     const projectController: ProjectController = new ProjectController(context);
-    context.subscriptions.push(commands.registerCommand(Commands.JAVA_PROJECT_CREATE, async () => { projectController.createJavaProject(); }));
+    const instrumented = instrumentOperation(Commands.JAVA_PROJECT_CREATE, () => projectController.createJavaProject());
+    context.subscriptions.push(commands.registerCommand(Commands.JAVA_PROJECT_CREATE, instrumented));
 
     context.subscriptions.push(new DependencyExplorer(context));
 }
+
+// this method is called when your extension is deactivated
+export async function deactivate() {
+    await disposeTelemetryWrapper();
+}

src/extension.ts

@@ -5,11 +5,11 @@ import {
     commands, Event, EventEmitter, ExtensionContext, ProviderResult, Range,
     Selection, TextEditorRevealType, TreeDataProvider, TreeItem, Uri, window, workspace,
 } from "vscode";
+import { instrumentOperation } from "vscode-extension-telemetry-wrapper";
 import { Commands } from "../commands";
 import { Jdtls } from "../java/jdtls";
 import { INodeData, NodeKind } from "../java/nodeData";
 import { Telemetry } from "../telemetry";
-import { DataNode } from "./dataNode";
 import { ExplorerNode } from "./explorerNode";
 import { ProjectNode } from "./projectNode";
 import { WorkspaceNode } from "./workspaceNode";
@@ -24,9 +24,12 @@ export class DependencyDataProvider implements TreeDataProvider<ExplorerNode> {
     private _rootItems: ExplorerNode[] = null;
 
     constructor(public readonly context: ExtensionContext) {
-        context.subscriptions.push(commands.registerCommand(Commands.VIEW_PACKAGE_REFRESH, this.refresh, this));
-        context.subscriptions.push(commands.registerCommand(Commands.VIEW_PACKAGE_OPEN_FILE, this.openFile, this));
-        context.subscriptions.push(commands.registerCommand(Commands.VIEW_PACKAGE_OUTLINE, this.goToOutline, this));
+        context.subscriptions.push(commands.registerCommand(Commands.VIEW_PACKAGE_REFRESH,
+            instrumentOperation(Commands.VIEW_PACKAGE_REFRESH, () => this.refresh())));
+        context.subscriptions.push(commands.registerCommand(Commands.VIEW_PACKAGE_OPEN_FILE,
+            instrumentOperation(Commands.VIEW_PACKAGE_OPEN_FILE, (_operationId, uri) => this.openFile(uri))));
+        context.subscriptions.push(commands.registerCommand(Commands.VIEW_PACKAGE_OUTLINE,
+            instrumentOperation(Commands.VIEW_PACKAGE_OUTLINE, (_operationId, uri, range) => this.goToOutline(uri, range))));
     }
 
     public refresh() {
@@ -36,14 +39,12 @@ export class DependencyDataProvider implements TreeDataProvider<ExplorerNode> {
 
     public openFile(uri: string) {
         return workspace.openTextDocument(Uri.parse(uri)).then((res) => {
-            Telemetry.sendEvent("open source file");
             return window.showTextDocument(res);
         });
     }
 
     public goToOutline(uri: string, range: Range): Thenable<{}> {
         return this.openFile(uri).then((editor) => {
-            Telemetry.sendEvent("view package outline");
             editor.revealRange(range, TextEditorRevealType.Default);
             editor.selection = new Selection(range.start, range.start);
             return commands.executeCommand("workbench.action.focusActiveEditorGroup");

src/views/dependencyDataProvider.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import { Command, commands, DocumentSymbol, SymbolInformation, TextDocument, ThemeIcon, Uri, workspace } from "vscode";
+import { createUuid, sendOperationEnd, sendOperationStart } from "vscode-extension-telemetry-wrapper";
 import { Commands } from "../commands";
 import { INodeData } from "../java/nodeData";
 import { ITypeRootNodeData, TypeRootKind } from "../java/typeRootNodeData";
@@ -62,11 +63,23 @@ export class TypeRootNode extends DataNode {
         return Settings.showOutline();
     }
 
-    private getSymbols(document: TextDocument): Thenable<SymbolInformation[] | DocumentSymbol[]> {
-        return commands.executeCommand<SymbolInformation[]>(
-            "vscode.executeDocumentSymbolProvider",
-            document.uri,
-        );
+    private async getSymbols(document: TextDocument): Promise<SymbolInformation[] | DocumentSymbol[]> {
+        let error;
+        const operationId = createUuid();
+        const startAt: number = Date.now();
+        sendOperationStart(operationId, "vscode.executeDocumentSymbolProvider");
+        try {
+            return await commands.executeCommand<SymbolInformation[]>(
+                "vscode.executeDocumentSymbolProvider",
+                document.uri,
+            );
+        } catch (err) {
+            error = err;
+            throw err;
+        } finally {
+            const duration = Date.now() - startAt;
+            sendOperationEnd(operationId, "vscode.executeDocumentSymbolProvider", duration, error);
+        }
     }
 
     private buildSymbolTree(symbols: SymbolInformation[]): Map<string, SymbolInformation[]> {