From 2d9ccda4a1ad830e3d8f6d5ffb2b0eaa614e0285 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 16 Jan 2019 09:37:42 -0800 Subject: [PATCH 1/3] Send original event name when sending error event --- src/client/telemetry/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/telemetry/index.ts b/src/client/telemetry/index.ts index f02e0fd37e27..cf54a8198337 100644 --- a/src/client/telemetry/index.ts +++ b/src/client/telemetry/index.ts @@ -71,6 +71,7 @@ export function sendTelemetryEvent(eventName: string, durationMs?: { [key: strin customProperties.stackTrace = getStackTrace(ex); } if (ex && eventName !== 'ERROR') { + customProperties.originalEventName = eventName; reporter.sendTelemetryEvent('ERROR', customProperties, measures); } reporter.sendTelemetryEvent(eventName, customProperties, measures); From ae17974fc12c626b7cc8cf9a65abdcc7f53b7d1b Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 16 Jan 2019 10:48:58 -0800 Subject: [PATCH 2/3] Fix tests --- src/test/telemetry/index.unit.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/telemetry/index.unit.test.ts b/src/test/telemetry/index.unit.test.ts index d3d66559a9fb..902289548e6b 100644 --- a/src/test/telemetry/index.unit.test.ts +++ b/src/test/telemetry/index.unit.test.ts @@ -77,7 +77,7 @@ suite('Telemetry', () => { expect(Reporter.eventName).to.equal(eventName); expect(Reporter.measures).to.deep.equal(measuers); - expect(Reporter.properties).to.deep.equal(properties); + expect(Reporter.properties).to.deep.equal({ ...properties, originalEventName: eventName }); expect(stackTrace).to.be.length.greaterThan(1); }); test('Send Error Telemetry', () => { @@ -115,7 +115,7 @@ at processImmediate [as _immediateCallback] (timers.js:722:5)`; expect(Reporter.eventName).to.equal(eventName); expect(Reporter.measures).to.deep.equal(measuers); - expect(Reporter.properties).to.deep.equal(properties); + expect(Reporter.properties).to.deep.equal({ ...properties, originalEventName: eventName }); expect(stackTrace).to.be.length.greaterThan(1); // tslint:disable-next-line:no-multiline-string @@ -162,7 +162,7 @@ at Immediate. (${EXTENSION_ROOT_DIR}/node_modules/mocha/lib/runner.js expect(Reporter.eventName).to.equal(eventName); expect(Reporter.measures).to.deep.equal(measuers); - expect(Reporter.properties).to.deep.equal(properties); + expect(Reporter.properties).to.deep.equal({ ...properties, originalEventName: eventName }); expect(stackTrace).to.be.length.greaterThan(1); // tslint:disable-next-line:no-multiline-string @@ -197,7 +197,7 @@ at Immediate. (${EXTENSION_ROOT_DIR}/node_modules/mocha/lib/runner.js expect(Reporter.eventName).to.equal(eventName); expect(Reporter.measures).to.deep.equal(measuers); - expect(Reporter.properties).to.deep.equal(properties); + expect(Reporter.properties).to.deep.equal({ ...properties, originalEventName: eventName }); expect(stackTrace).to.be.length.greaterThan(1); // tslint:disable-next-line:no-multiline-string From ed587305a01b134df5758cb136dc3188d2472b8f Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 16 Jan 2019 19:18:25 -0800 Subject: [PATCH 3/3] Fix imports --- src/test/datascience/history.functional.test.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/datascience/history.functional.test.tsx b/src/test/datascience/history.functional.test.tsx index a37d9340748a..18fdda98bb3b 100644 --- a/src/test/datascience/history.functional.test.tsx +++ b/src/test/datascience/history.functional.test.tsx @@ -12,7 +12,6 @@ import * as React from 'react'; import { SemVer } from 'semver'; import * as TypeMoq from 'typemoq'; import { CancellationToken, Disposable, TextDocument, TextEditor } from 'vscode'; - import { IApplicationShell, IDocumentManager,