Use telemetry wrapper to unify BI format. (#417)

* Use telemetry wrapper to unify BI format.

* Turn off debug mode.

* Resolve comments: not export help function.

Author: Eskibear

package-lock.json

@@ -393,6 +393,7 @@
   "dependencies": {
     "lodash": "^4.17.10",
     "opn": "^5.3.0",
-    "vscode-extension-telemetry": "0.0.18"
+    "vscode-extension-telemetry": "0.0.18",
+    "vscode-extension-telemetry-wrapper": "^0.3.1"
   }
 }

package.json

@@ -5,6 +5,7 @@ import * as os from "os";
 import * as path from "path";
 import * as vscode from "vscode";
 
+import { instrumentOperation } from "vscode-extension-telemetry-wrapper";
 import * as anchor from "./anchor";
 import * as commands from "./commands";
 import { logger, Type } from "./logger";
@@ -30,20 +31,26 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
     // Returns an initial debug configurations based on contextual information.
     public provideDebugConfigurations(folder: vscode.WorkspaceFolder | undefined, token?: vscode.CancellationToken):
         vscode.ProviderResult<vscode.DebugConfiguration[]> {
-        return <Thenable<vscode.DebugConfiguration[]>>this.provideDebugConfigurationsAsync(folder);
+        const provideDebugConfigurationsHandler = instrumentOperation("provideDebugConfigurations", (operationId: string) => {
+            return <Thenable<vscode.DebugConfiguration[]>>this.provideDebugConfigurationsAsync(folder);
+        });
+        return provideDebugConfigurationsHandler();
     }
 
     // Try to add all missing attributes to the debug configuration being launched.
     public resolveDebugConfiguration(folder: vscode.WorkspaceFolder | undefined, config: vscode.DebugConfiguration, token?: vscode.CancellationToken):
         vscode.ProviderResult<vscode.DebugConfiguration> {
-        this.resolveVariables(folder, config);
-        return this.heuristicallyResolveDebugConfiguration(folder, config);
+        const resolveDebugConfigurationHandler = instrumentOperation("resolveDebugConfiguration", (operationId: string) => {
+            this.resolveVariables(folder, config);
+            return this.heuristicallyResolveDebugConfiguration(folder, config);
+        });
+        return resolveDebugConfigurationHandler();
     }
 
     private provideDebugConfigurationsAsync(folder: vscode.WorkspaceFolder | undefined, token?: vscode.CancellationToken) {
-        return vscode.window.withProgress({location: vscode.ProgressLocation.Window}, (p) => {
+        return vscode.window.withProgress({ location: vscode.ProgressLocation.Window }, (p) => {
             return new Promise((resolve, reject) => {
-                p.report({message: "Auto generating configuration..."});
+                p.report({ message: "Auto generating configuration..." });
                 resolveMainClass(folder ? folder.uri : undefined).then((res: IMainClassOption[]) => {
                     let cache;
                     cache = {};
@@ -75,7 +82,7 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
                     };
                     resolve([defaultLaunchConfig, ...launchConfigs, defaultAttachConfig]);
                 }, (ex) => {
-                    p.report({message: `failed to generate configuration. ${ex}`});
+                    p.report({ message: `failed to generate configuration. ${ex}` });
                     reject(ex);
                 });
             });
@@ -84,8 +91,8 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
 
     private resolveVariables(folder: vscode.WorkspaceFolder, config: vscode.DebugConfiguration): void {
         // all the properties whose values are string or array of string
-        const keys =  ["mainClass", "args", "vmArgs", "modulePaths", "classPaths", "projectName",
-            "env", "sourcePaths", "encoding",  "cwd",  "hostName"];
+        const keys = ["mainClass", "args", "vmArgs", "modulePaths", "classPaths", "projectName",
+            "env", "sourcePaths", "encoding", "cwd", "hostName"];
         if (!config) {
             return;
         }
@@ -225,7 +232,7 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
      * Converts an array of arguments to a string as the args and vmArgs.
      */
     private concatArgs(args: any[]): string {
-        return _.join(_.map(args, (arg: any): string  => {
+        return _.join(_.map(args, (arg: any): string => {
             const str = String(arg);
             // if it has quotes or spaces, use double quotes to wrap it
             if (/['"\s]/.test(str)) {
@@ -440,7 +447,7 @@ function resolveMainClass(workspaceUri: vscode.Uri): Promise<IMainClassOption[]>
 
 function validateLaunchConfig(workspaceUri: vscode.Uri, mainClass: string, projectName: string, containsExternalClasspaths: boolean):
     Promise<ILaunchValidationResponse> {
-    return <Promise<ILaunchValidationResponse>> commands.executeJavaLanguageServerCommand(commands.JAVA_VALIDATE_LAUNCHCONFIG,
+    return <Promise<ILaunchValidationResponse>>commands.executeJavaLanguageServerCommand(commands.JAVA_VALIDATE_LAUNCHCONFIG,
         workspaceUri ? workspaceUri.toString() : undefined, mainClass, projectName, containsExternalClasspaths);
 }
 

src/configurationProvider.ts

@@ -3,6 +3,7 @@
 
 import * as path from "path";
 import * as vscode from "vscode";
+import { initializeFromJsonFile, instrumentOperation } from "vscode-extension-telemetry-wrapper";
 import * as commands from "./commands";
 import { JavaDebugConfigurationProvider } from "./configurationProvider";
 import { HCR_EVENT, JAVA_LANGID, USER_NOTIFICATION_EVENT } from "./constants";
@@ -11,7 +12,12 @@ import { handleHotCodeReplaceCustomEvent, initializeHotCodeReplace } from "./hot
 import { logger, Type } from "./logger";
 import * as utility from "./utility";
 
-export function activate(context: vscode.ExtensionContext) {
+export async function activate(context: vscode.ExtensionContext) {
+    await initializeFromJsonFile(context.asAbsolutePath("./package.json"));
+    await instrumentOperation("activation", initializeExtension)(context);
+}
+
+function initializeExtension(operationId: string, context: vscode.ExtensionContext) {
     logger.initialize(context);
     logger.log(Type.ACTIVATEEXTENSION, {}); // TODO: Activation belongs to usage data, remove this line.
     logger.log(Type.USAGEDATA, {
@@ -39,7 +45,7 @@ export function activate(context: vscode.ExtensionContext) {
     });
 
     context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider("java", new JavaDebugConfigurationProvider()));
-    context.subscriptions.push(vscode.commands.registerCommand("JavaDebug.SpecifyProgramArgs", async () => {
+    context.subscriptions.push(instrumentAndRegisterCommand("JavaDebug.SpecifyProgramArgs", async () => {
         return specifyProgramArguments(context);
     }));
     initializeHotCodeReplace(context);
@@ -102,3 +108,8 @@ function specifyProgramArguments(context: vscode.ExtensionContext): Thenable<str
         return text || " ";
     });
 }
+
+function instrumentAndRegisterCommand(name: string, cb: (...args: any[]) => any) {
+    const instrumented = instrumentOperation(name, async (_operationId, myargs) => await cb(myargs));
+    return vscode.commands.registerCommand(name, instrumented);
+}