Skip to content

Commit 67fde9f

Browse files
DonJayamanneDonJayamanne
committed
clean up - removed unused telemetry
1 parent 2250480 commit 67fde9f

6 files changed

Lines changed: 4 additions & 59 deletions

File tree

‎src/client/providers/formatOnSaveProvider.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import { BaseFormatter } from "./../formatters/baseFormatter";
77
import { YapfFormatter } from "./../formatters/yapfFormatter";
88
import { AutoPep8Formatter } from "./../formatters/autoPep8Formatter";
99
import * as settings from "./../common/configSettings";
10-
import * as telemetryHelper from "../common/telemetry";
11-
import * as telemetryContracts from "../common/telemetryContracts";
1210

1311
export function activateFormatOnSaveProvider(languageFilter: vscode.DocumentFilter, settings: settings.IPythonSettings, outputChannel: vscode.OutputChannel, workspaceRootPath?: string): vscode.Disposable {
1412
let formatters = new Map<string, BaseFormatter>();
@@ -30,7 +28,6 @@ export function activateFormatOnSaveProvider(languageFilter: vscode.DocumentFilt
3028
const globalEditorFormatOnSave = editorConfig && editorConfig.has('formatOnSave') && editorConfig.get('formatOnSave') === true;
3129
if ((pythonSettings.formatting.formatOnSave || globalEditorFormatOnSave) && textEditor.document === document) {
3230
let formatter = formatters.get(pythonSettings.formatting.provider);
33-
telemetryHelper.sendTelemetryEvent(telemetryContracts.IDE.Format, { Format_Provider: formatter.Id, Format_OnSave: "true" });
3431
e.waitUntil(formatter.formatDocument(document, null, null));
3532
}
3633
}, null, null);

‎src/client/providers/formatProvider.ts‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
'use strict';
22

33
import * as vscode from 'vscode';
4-
import * as path from 'path';
54
import {BaseFormatter} from './../formatters/baseFormatter';
65
import {YapfFormatter} from './../formatters/yapfFormatter';
76
import {AutoPep8Formatter} from './../formatters/autoPep8Formatter';
87
import * as settings from './../common/configSettings';
9-
import * as telemetryHelper from '../common/telemetry';
10-
import * as telemetryContracts from '../common/telemetryContracts';
118

129
export class PythonFormattingEditProvider implements vscode.DocumentFormattingEditProvider, vscode.DocumentRangeFormattingEditProvider {
1310
private formatters = new Map<string, BaseFormatter>();
@@ -25,12 +22,7 @@ export class PythonFormattingEditProvider implements vscode.DocumentFormattingEd
2522

2623
public provideDocumentRangeFormattingEdits(document: vscode.TextDocument, range: vscode.Range, options: vscode.FormattingOptions, token: vscode.CancellationToken): Thenable<vscode.TextEdit[]> {
2724
let formatter = this.formatters.get(this.settings.formatting.provider);
28-
let delays = new telemetryHelper.Delays();
29-
return formatter.formatDocument(document, options, token, range).then(edits => {
30-
delays.stop();
31-
telemetryHelper.sendTelemetryEvent(telemetryContracts.IDE.Format, { Format_Provider: formatter.Id }, delays.toMeasures());
32-
return edits;
33-
});
25+
return formatter.formatDocument(document, options, token, range);
3426
}
3527

3628
}

‎src/client/providers/lintProvider.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import * as flake8 from './../linters/flake8';
1111
import * as pydocstyle from './../linters/pydocstyle';
1212
import * as mypy from './../linters/mypy';
1313
import * as settings from '../common/configSettings';
14-
import * as telemetryHelper from '../common/telemetry';
15-
import * as telemetryContracts from '../common/telemetryContracts';
1614
import * as fs from 'fs';
1715
import { LinterErrors } from '../common/constants';
1816
const Minimatch = require("minimatch").Minimatch;
@@ -164,12 +162,7 @@ export class LintProvider extends vscode.Disposable {
164162
return Promise.resolve([]);
165163
}
166164
// turn off telemetry for linters (at least for now)
167-
//let delays = new telemetryHelper.Delays();
168-
return linter.runLinter(document, cancelToken.token).then(results => {
169-
//delays.stop();
170-
//telemetryHelper.sendTelemetryEvent(telemetryContracts.IDE.Lint, { Lint_Provider: linter.Id }, delays.toMeasures());
171-
return results;
172-
});
165+
return linter.runLinter(document, cancelToken.token);
173166
});
174167
this.documentHasJupyterCodeCells(document, cancelToken.token).then(hasJupyterCodeCells => {
175168
// linters will resolve asynchronously - keep a track of all

‎src/client/refactor/proxy.ts‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import * as path from 'path';
55
import * as child_process from 'child_process';
66
import { IPythonSettings } from '../common/configSettings';
77
import { REFACTOR } from '../common/telemetryContracts';
8-
import { sendTelemetryEvent, Delays } from '../common/telemetry';
98
import { IS_WINDOWS, getCustomEnvVars, getWindowsLineEndingCount } from '../common/utils';
109
import { mergeEnvVariables } from '../common/envFileParser';
1110

@@ -41,8 +40,8 @@ export class RefactorProxy extends vscode.Disposable {
4140
// So for each line, reduce one characer (for CR)
4241
// But Not all Windows users use CRLF
4342
const offset = document.offsetAt(position);
44-
const winEols = getWindowsLineEndingCount(document, offset);
45-
43+
const winEols = getWindowsLineEndingCount(document, offset);
44+
4645
return offset - winEols;
4746
}
4847
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 {
9594
return this.sendCommand<T>(JSON.stringify(command), REFACTOR.ExtractMethod);
9695
}
9796
private sendCommand<T>(command: string, telemetryEvent: string): Promise<T> {
98-
let timer = new Delays();
9997
return this.initialize(this.pythonSettings.pythonPath).then(() => {
10098
return new Promise<T>((resolve, reject) => {
10199
this._commandResolve = resolve;
102100
this._commandReject = reject;
103101
this._process.stdin.write(command + '\n');
104102
});
105-
}).then(value => {
106-
timer.stop();
107-
sendTelemetryEvent(telemetryEvent, null, timer.toMeasures());
108-
return value;
109-
}).catch(reason => {
110-
timer.stop();
111-
sendTelemetryEvent(telemetryEvent, null, timer.toMeasures());
112-
return Promise.reject(reason);
113103
});
114104
}
115105
private initialize(pythonPath: string): Promise<string> {

‎src/client/sortImports.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import * as vscode from 'vscode';
44
import * as sortProvider from './providers/importSortProvider';
5-
import * as telemetryHelper from './common/telemetry';
6-
import * as telemetryContracts from './common/telemetryContracts';
75
import * as os from 'os';
86

97
export function activate(context: vscode.ExtensionContext, outChannel: vscode.OutputChannel) {
@@ -18,8 +16,6 @@ export function activate(context: vscode.ExtensionContext, outChannel: vscode.Ou
1816
return Promise.resolve();
1917
}
2018

21-
let delays = new telemetryHelper.Delays();
22-
2319
// Hack, if the document doesn't contain an empty line at the end, then add it
2420
// Else the library strips off the last line
2521
const lastLine = activeEditor.document.lineAt(activeEditor.document.lineCount - 1);
@@ -41,9 +37,6 @@ export function activate(context: vscode.ExtensionContext, outChannel: vscode.Ou
4137
return activeEditor.edit(builder => {
4238
changes.forEach(change => builder.replace(change.range, change.newText));
4339
});
44-
}).then(() => {
45-
delays.stop();
46-
telemetryHelper.sendTelemetryEvent(telemetryContracts.Commands.SortImports, null, delays.toMeasures());
4740
}).catch(error => {
4841
let message = typeof error === 'string' ? error : (error.message ? error.message : error);
4942
outChannel.appendLine(error);

‎src/client/unittests/common/baseTestManager.ts‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
import { Tests, TestStatus, TestsToRun, CANCELLATION_REASON } from './contracts';
33
import * as vscode from 'vscode';
44
import { resetTestResults, displayTestErrorMessage, storeDiscoveredTests } from './testUtils';
5-
import * as telemetryHelper from '../../common/telemetry';
6-
import * as telemetryContracts from '../../common/telemetryContracts';
75
import { Installer, Product } from '../../common/installer';
86
import { isNotInstalledError } from '../../common/helpers';
97

@@ -62,7 +60,6 @@ export abstract class BaseTestManager {
6260
this._status = TestStatus.Idle;
6361
return Promise.resolve(this.tests);
6462
}
65-
let delays = new telemetryHelper.Delays();
6663
this._status = TestStatus.Discovering;
6764

6865
this.createCancellationToken();
@@ -90,11 +87,6 @@ export abstract class BaseTestManager {
9087
storeDiscoveredTests(tests);
9188
this.disposeCancellationToken();
9289

93-
delays.stop();
94-
telemetryHelper.sendTelemetryEvent(telemetryContracts.UnitTests.Discover, {
95-
Test_Provider: this.testProvider
96-
}, delays.toMeasures());
97-
9890
return tests;
9991
}).catch(reason => {
10092
if (isNotInstalledError(reason) && !quietMode) {
@@ -114,12 +106,6 @@ export abstract class BaseTestManager {
114106
}
115107
storeDiscoveredTests(null);
116108
this.disposeCancellationToken();
117-
118-
delays.stop();
119-
telemetryHelper.sendTelemetryEvent(telemetryContracts.UnitTests.Discover, {
120-
Test_Provider: this.testProvider
121-
}, delays.toMeasures());
122-
123109
return Promise.reject(reason);
124110
});
125111
}
@@ -157,8 +143,6 @@ export abstract class BaseTestManager {
157143
this.resetTestResults();
158144
}
159145

160-
let delays = new telemetryHelper.Delays();
161-
162146
this._status = TestStatus.Running;
163147
this.createCancellationToken();
164148
// If running failed tests, then don't clear the previously build UnitTests
@@ -181,8 +165,6 @@ export abstract class BaseTestManager {
181165
}).then(() => {
182166
this._status = TestStatus.Idle;
183167
this.disposeCancellationToken();
184-
delays.stop();
185-
telemetryHelper.sendTelemetryEvent(telemetryContracts.UnitTests.Run, moreInfo as any, delays.toMeasures());
186168
return this.tests;
187169
}).catch(reason => {
188170
if (this.cancellationToken && this.cancellationToken.isCancellationRequested) {
@@ -193,8 +175,6 @@ export abstract class BaseTestManager {
193175
this._status = TestStatus.Error;
194176
}
195177
this.disposeCancellationToken();
196-
delays.stop();
197-
telemetryHelper.sendTelemetryEvent(telemetryContracts.UnitTests.Run, moreInfo as any, delays.toMeasures());
198178
return Promise.reject(reason);
199179
});
200180
}

0 commit comments

Comments
 (0)