Code review feedback

1. Add aiKey back into package.json for debug-adapter telemetry. In addition, to avoid duplicating the aiKey, the code that constructs a TelemetryReporter once again pulls the key from the package.json.
2. A couple of renames for clarity.

Author: DustinCampbell

package.json

@@ -157,6 +157,7 @@
         "windows": {
           "program": "./coreclr-debug/debugAdapters/OpenDebugAD7.exe"
         },
+        "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
         "configurationAttributes": {
           "launch": {
             "required": [

src/omnisharpMain.ts

@@ -31,8 +31,8 @@ export function activate(context: vscode.ExtensionContext): any {
 
     const extensionId = 'ms-vscode.csharp';
     const extension = vscode.extensions.getExtension(extensionId);
-    const extensionVersion = extension.packageJSON['version'];
-    const aiKey = 'AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217';
+    const extensionVersion = extension.packageJSON.version;
+    const aiKey = extension.packageJSON.contributes.debuggers[0].aiKey;
 
     const reporter = new TelemetryReporter(extensionId, extensionVersion, aiKey);
 
@@ -82,7 +82,7 @@ export function activate(context: vscode.ExtensionContext): any {
 	// stop server on deactivate
 	disposables.push(new vscode.Disposable(() => {
 		advisor.dispose();
-        server.reportAndClearTelemetry();
+		server.reportAndClearTelemetry();
 		server.stop();
 	}));
 

src/omnisharpServer.ts

@@ -105,7 +105,7 @@ class Delays {
 export abstract class OmnisharpServer {
 
     private _reporter: TelemetryReporter;
-    private _telemetryDelays: { [path: string]: Delays };
+    private _requestDelays: { [requestName: string]: Delays };
 
 	private _eventBus = new EventEmitter();
 	private _start: Promise<void>;
@@ -139,25 +139,25 @@ export abstract class OmnisharpServer {
 		}
 	}
 
-    private _recordDelay(path: string, elapsedTime: number) {
-        let delays = this._telemetryDelays[path];
+    private _recordRequestDelay(requestName: string, elapsedTime: number) {
+        let delays = this._requestDelays[requestName];
         if (!delays) {
             delays = new Delays();
-            this._telemetryDelays[path] = delays;
+            this._requestDelays[requestName] = delays;
         }
 
         delays.report(elapsedTime);
     }
 
     public reportAndClearTelemetry() {
-        for (var path in this._telemetryDelays) {
+        for (var path in this._requestDelays) {
             const eventName = 'omnisharp' + path;
-            const measures = this._telemetryDelays[path].toMeasures();
+            const measures = this._requestDelays[path].toMeasures();
 
             this._reporter.sendTelemetryEvent(eventName, null, measures);
         }
 
-        this._telemetryDelays = null;
+        this._requestDelays = null;
     }
 
 	public getSolutionPathOrFolder(): string {
@@ -266,7 +266,7 @@ export abstract class OmnisharpServer {
 
 		return omnisharpLauncher(cwd, argv).then(value => {
 			this._serverProcess = value.process;
-            this._telemetryDelays = {};
+            this._requestDelays = {};
             this._fireEvent(Events.StdOut, `[INFO] Started OmniSharp from '${value.command}' with process id ${value.process.pid}...\n`);
             this._fireEvent(Events.ServerStart, solutionPath);
 			this._setState(ServerState.Started);
@@ -405,7 +405,7 @@ export abstract class OmnisharpServer {
 		return promise.then(response => {
             let endTime = Date.now();
             let elapsedTime = endTime - startTime;
-            this._recordDelay(path, elapsedTime);
+            this._recordRequestDelay(path, elapsedTime);
 
             return response;
         });