clean up - removed unused telemetry

DonJayamanne · DonJayamanne · commit 67fde9fc00a6 · 2017-02-26T22:14:37.000+11:00
diff --git a/src/client/providers/formatOnSaveProvider.ts b/src/client/providers/formatOnSaveProvider.ts
@@ -7,8 +7,6 @@ import { BaseFormatter } from "./../formatters/baseFormatter";
 import { YapfFormatter } from "./../formatters/yapfFormatter";
 import { AutoPep8Formatter } from "./../formatters/autoPep8Formatter";
 import * as settings from "./../common/configSettings";
-import * as telemetryHelper from "../common/telemetry";
-import * as telemetryContracts from "../common/telemetryContracts";
 
 export function activateFormatOnSaveProvider(languageFilter: vscode.DocumentFilter, settings: settings.IPythonSettings, outputChannel: vscode.OutputChannel, workspaceRootPath?: string): vscode.Disposable {
     let formatters = new Map<string, BaseFormatter>();
@@ -30,7 +28,6 @@ export function activateFormatOnSaveProvider(languageFilter: vscode.DocumentFilt
         const globalEditorFormatOnSave = editorConfig && editorConfig.has('formatOnSave') && editorConfig.get('formatOnSave') === true;
         if ((pythonSettings.formatting.formatOnSave || globalEditorFormatOnSave) && textEditor.document === document) {
             let formatter = formatters.get(pythonSettings.formatting.provider);
-            telemetryHelper.sendTelemetryEvent(telemetryContracts.IDE.Format, { Format_Provider: formatter.Id, Format_OnSave: "true" });
             e.waitUntil(formatter.formatDocument(document, null, null));
         }
     }, null, null);
diff --git a/src/client/providers/formatProvider.ts b/src/client/providers/formatProvider.ts
@@ -1,13 +1,10 @@
 'use strict';
 
 import * as vscode from 'vscode';
-import * as path from 'path';
 import {BaseFormatter} from './../formatters/baseFormatter';
 import {YapfFormatter} from './../formatters/yapfFormatter';
 import {AutoPep8Formatter} from './../formatters/autoPep8Formatter';
 import * as settings from './../common/configSettings';
-import * as telemetryHelper from '../common/telemetry';
-import * as telemetryContracts from '../common/telemetryContracts';
 
 export class PythonFormattingEditProvider implements vscode.DocumentFormattingEditProvider, vscode.DocumentRangeFormattingEditProvider {
     private formatters = new Map<string, BaseFormatter>();
@@ -25,12 +22,7 @@ export class PythonFormattingEditProvider implements vscode.DocumentFormattingEd
 
     public provideDocumentRangeFormattingEdits(document: vscode.TextDocument, range: vscode.Range, options: vscode.FormattingOptions, token: vscode.CancellationToken): Thenable<vscode.TextEdit[]> {
         let formatter = this.formatters.get(this.settings.formatting.provider);
-        let delays = new telemetryHelper.Delays();
-        return formatter.formatDocument(document, options, token, range).then(edits => {
-            delays.stop();
-            telemetryHelper.sendTelemetryEvent(telemetryContracts.IDE.Format, { Format_Provider: formatter.Id }, delays.toMeasures());
-            return edits;
-        });
+        return formatter.formatDocument(document, options, token, range);
     }
 
 }
diff --git a/src/client/providers/lintProvider.ts b/src/client/providers/lintProvider.ts
@@ -11,8 +11,6 @@ import * as flake8 from './../linters/flake8';
 import * as pydocstyle from './../linters/pydocstyle';
 import * as mypy from './../linters/mypy';
 import * as settings from '../common/configSettings';
-import * as telemetryHelper from '../common/telemetry';
-import * as telemetryContracts from '../common/telemetryContracts';
 import * as fs from 'fs';
 import { LinterErrors } from '../common/constants';
 const Minimatch = require("minimatch").Minimatch;
@@ -164,12 +162,7 @@ export class LintProvider extends vscode.Disposable {
                 return Promise.resolve([]);
             }
             // turn off telemetry for linters (at least for now)
-            //let delays = new telemetryHelper.Delays();
-            return linter.runLinter(document, cancelToken.token).then(results => {
-                //delays.stop();
-                //telemetryHelper.sendTelemetryEvent(telemetryContracts.IDE.Lint, { Lint_Provider: linter.Id }, delays.toMeasures());
-                return results;
-            });
+            return linter.runLinter(document, cancelToken.token);
         });
         this.documentHasJupyterCodeCells(document, cancelToken.token).then(hasJupyterCodeCells => {
             // linters will resolve asynchronously - keep a track of all 
diff --git a/src/client/refactor/proxy.ts b/src/client/refactor/proxy.ts
@@ -5,7 +5,6 @@ import * as path from 'path';
 import * as child_process from 'child_process';
 import { IPythonSettings } from '../common/configSettings';
 import { REFACTOR } from '../common/telemetryContracts';
-import { sendTelemetryEvent, Delays } from '../common/telemetry';
 import { IS_WINDOWS, getCustomEnvVars, getWindowsLineEndingCount } from '../common/utils';
 import { mergeEnvVariables } from '../common/envFileParser';
 
@@ -41,8 +40,8 @@ export class RefactorProxy extends vscode.Disposable {
         // So for each line, reduce one characer (for CR)
         // But Not all Windows users use CRLF
         const offset = document.offsetAt(position);
-        const winEols = getWindowsLineEndingCount(document, offset);        
-        
+        const winEols = getWindowsLineEndingCount(document, offset);
+
         return offset - winEols;
     }
     rename<T>(document: vscode.TextDocument, name: string, filePath: string, range: vscode.Range, options?: vscode.TextEditorOptions): Promise<T> {
@@ -95,21 +94,12 @@ export class RefactorProxy extends vscode.Disposable {
         return this.sendCommand<T>(JSON.stringify(command), REFACTOR.ExtractMethod);
     }
     private sendCommand<T>(command: string, telemetryEvent: string): Promise<T> {
-        let timer = new Delays();
         return this.initialize(this.pythonSettings.pythonPath).then(() => {
             return new Promise<T>((resolve, reject) => {
                 this._commandResolve = resolve;
                 this._commandReject = reject;
                 this._process.stdin.write(command + '\n');
             });
-        }).then(value => {
-            timer.stop();
-            sendTelemetryEvent(telemetryEvent, null, timer.toMeasures());
-            return value;
-        }).catch(reason => {
-            timer.stop();
-            sendTelemetryEvent(telemetryEvent, null, timer.toMeasures());
-            return Promise.reject(reason);
         });
     }
     private initialize(pythonPath: string): Promise<string> {
diff --git a/src/client/sortImports.ts b/src/client/sortImports.ts
@@ -2,8 +2,6 @@
 
 import * as vscode from 'vscode';
 import * as sortProvider from './providers/importSortProvider';
-import * as telemetryHelper from './common/telemetry';
-import * as telemetryContracts from './common/telemetryContracts';
 import * as os from 'os';
 
 export function activate(context: vscode.ExtensionContext, outChannel: vscode.OutputChannel) {
@@ -18,8 +16,6 @@ export function activate(context: vscode.ExtensionContext, outChannel: vscode.Ou
             return Promise.resolve();
         }
 
-        let delays = new telemetryHelper.Delays();
-
         // Hack, if the document doesn't contain an empty line at the end, then add it
         // Else the library strips off the last line
         const lastLine = activeEditor.document.lineAt(activeEditor.document.lineCount - 1);
@@ -41,9 +37,6 @@ export function activate(context: vscode.ExtensionContext, outChannel: vscode.Ou
             return activeEditor.edit(builder => {
                 changes.forEach(change => builder.replace(change.range, change.newText));
             });
-        }).then(() => {
-            delays.stop();
-            telemetryHelper.sendTelemetryEvent(telemetryContracts.Commands.SortImports, null, delays.toMeasures());
         }).catch(error => {
             let message = typeof error === 'string' ? error : (error.message ? error.message : error);
             outChannel.appendLine(error);
diff --git a/src/client/unittests/common/baseTestManager.ts b/src/client/unittests/common/baseTestManager.ts
@@ -2,8 +2,6 @@
 import { Tests, TestStatus, TestsToRun, CANCELLATION_REASON } from './contracts';
 import * as vscode from 'vscode';
 import { resetTestResults, displayTestErrorMessage, storeDiscoveredTests } from './testUtils';
-import * as telemetryHelper from '../../common/telemetry';
-import * as telemetryContracts from '../../common/telemetryContracts';
 import { Installer, Product } from '../../common/installer';
 import { isNotInstalledError } from '../../common/helpers';
 
@@ -62,7 +60,6 @@ export abstract class BaseTestManager {
             this._status = TestStatus.Idle;
             return Promise.resolve(this.tests);
         }
-        let delays = new telemetryHelper.Delays();
         this._status = TestStatus.Discovering;
 
         this.createCancellationToken();
@@ -90,11 +87,6 @@ export abstract class BaseTestManager {
                 storeDiscoveredTests(tests);
                 this.disposeCancellationToken();
 
-                delays.stop();
-                telemetryHelper.sendTelemetryEvent(telemetryContracts.UnitTests.Discover, {
-                    Test_Provider: this.testProvider
-                }, delays.toMeasures());
-
                 return tests;
             }).catch(reason => {
                 if (isNotInstalledError(reason) && !quietMode) {
@@ -114,12 +106,6 @@ export abstract class BaseTestManager {
                 }
                 storeDiscoveredTests(null);
                 this.disposeCancellationToken();
-
-                delays.stop();
-                telemetryHelper.sendTelemetryEvent(telemetryContracts.UnitTests.Discover, {
-                    Test_Provider: this.testProvider
-                }, delays.toMeasures());
-
                 return Promise.reject(reason);
             });
     }
@@ -157,8 +143,6 @@ export abstract class BaseTestManager {
             this.resetTestResults();
         }
 
-        let delays = new telemetryHelper.Delays();
-
         this._status = TestStatus.Running;
         this.createCancellationToken();
         // If running failed tests, then don't clear the previously build UnitTests
@@ -181,8 +165,6 @@ export abstract class BaseTestManager {
             }).then(() => {
                 this._status = TestStatus.Idle;
                 this.disposeCancellationToken();
-                delays.stop();
-                telemetryHelper.sendTelemetryEvent(telemetryContracts.UnitTests.Run, moreInfo as any, delays.toMeasures());
                 return this.tests;
             }).catch(reason => {
                 if (this.cancellationToken && this.cancellationToken.isCancellationRequested) {
@@ -193,8 +175,6 @@ export abstract class BaseTestManager {
                     this._status = TestStatus.Error;
                 }
                 this.disposeCancellationToken();
-                delays.stop();
-                telemetryHelper.sendTelemetryEvent(telemetryContracts.UnitTests.Run, moreInfo as any, delays.toMeasures());
                 return Promise.reject(reason);
             });
     }
