Merge branch 'master' into changelog/minFindSymbolsFilterLength

Author: dmgonch

src/observers/TelemetryObserver.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { PlatformInformation } from "../platform";
-import { BaseEvent, PackageInstallation, InstallationFailure, InstallationSuccess, OmnisharpDelayTrackerEventMeasures, OmnisharpStart, TestExecutionCountReport, TelemetryEventWithMeasures } from "../omnisharp/loggingEvents";
+import { BaseEvent, PackageInstallation, InstallationFailure, InstallationSuccess, OmnisharpDelayTrackerEventMeasures, OmnisharpStart, TestExecutionCountReport, TelemetryEventWithMeasures, TelemetryEvent } from "../omnisharp/loggingEvents";
 import { PackageError } from "../packageManager/PackageError";
 
 export interface ITelemetryReporter {
@@ -39,6 +39,10 @@ export class TelemetryObserver {
             case TestExecutionCountReport.name:
                 this.handleTestExecutionCountReport(<TestExecutionCountReport>event);
                 break;
+            case TelemetryEvent.name:
+                let telemetryEvent = <TelemetryEvent>event;
+                this.reporter.sendTelemetryEvent(telemetryEvent.eventName, telemetryEvent.properties, telemetryEvent.measures);
+                break;
         }
     }
 

src/omnisharp/loggingEvents.ts

@@ -11,6 +11,10 @@ import { LaunchTarget } from "./launcher";
 export interface BaseEvent {
 }
 
+export class TelemetryEvent implements BaseEvent {
+    constructor(public eventName: string, public properties?: { [key: string]: string }, public measures?: { [key: string]: number }){ }
+}
+
 export class TelemetryEventWithMeasures implements BaseEvent {
     constructor(public eventName: string, public measures: { [key: string]: number }) {
     }

test/unitTests/logging/TelemetryObserver.test.ts

@@ -5,7 +5,7 @@
 import { should, expect } from 'chai';
 import { TelemetryObserver } from '../../../src/observers/TelemetryObserver';
 import { PlatformInformation } from '../../../src/platform';
-import { PackageInstallation, InstallationFailure, InstallationSuccess, TestExecutionCountReport, TelemetryEventWithMeasures, OmnisharpDelayTrackerEventMeasures, OmnisharpStart } from '../../../src/omnisharp/loggingEvents';
+import { PackageInstallation, InstallationFailure, InstallationSuccess, TestExecutionCountReport, TelemetryEventWithMeasures, OmnisharpDelayTrackerEventMeasures, OmnisharpStart, TelemetryEvent } from '../../../src/omnisharp/loggingEvents';
 import { getNullTelemetryReporter } from '../testAssets/Fakes';
 import { Package } from '../../../src/packageManager/Package';
 import { PackageError } from '../../../src/packageManager/PackageError';
@@ -60,6 +60,14 @@ suite('TelemetryReporterObserver', () => {
         });
     });
 
+    test(`${TelemetryEvent.name}: SendTelemetry event is called with the name, properties and measures`, () => {
+        let event = new TelemetryEvent("someName", { "key": "value" }, { someKey: 1 });
+        observer.post(event);
+        expect(name).to.contain(event.eventName);
+        expect(measure).to.be.containingAllOf([event.measures]);
+        expect(property).to.be.equal(event.properties);
+    });
+
     suite('InstallationFailure', () => {
         test("Telemetry Props contains platform information, install stage and an event name", () => {
             let event = new InstallationFailure("someStage", "someError");
@@ -69,7 +77,7 @@ suite('TelemetryReporterObserver', () => {
             expect(property).to.have.property("installStage");
             expect(name).to.not.be.empty;
         });
-    
+
         test(`Telemetry Props contains message and packageUrl if error is package error`, () => {
             let error = new PackageError("someError", <Package>{ "description": "foo", "url": "someurl" });
             let event = new InstallationFailure("someStage", error);