Skip to content

Commit e30b5fb

Browse files
jakebaileyjakebailey
authored
Remove typescript-etw (microsoft#58832)
1 parent e370c86 commit e30b5fb

13 files changed

+1
-113
lines changed

‎package-lock.json

Lines changed: 0 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"@esfx/canceltoken": "^1.0.0",
4545
"@octokit/rest": "^20.1.1",
4646
"@types/chai": "^4.3.16",
47-
"@types/microsoft__typescript-etw": "^0.1.3",
4847
"@types/minimist": "^1.2.5",
4948
"@types/mocha": "^10.0.6",
5049
"@types/ms": "^0.7.34",
@@ -102,7 +101,6 @@
102101
"path": false,
103102
"crypto": false,
104103
"buffer": false,
105-
"@microsoft/typescript-etw": false,
106104
"source-map-support": false,
107105
"inspector": false,
108106
"perf_hooks": false

‎src/compiler/_namespaces/ts.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ export * from "../core.js";
55
export * from "../debug.js";
66
export * from "../semver.js";
77
export * from "../performanceCore.js";
8-
export * from "../perfLogger.js";
98
export * from "../tracing.js";
109
export * from "../types.js";
1110
export * from "../sys.js";

‎src/compiler/binder.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ import {
269269
ParenthesizedExpression,
270270
Pattern,
271271
PatternAmbientModule,
272-
perfLogger,
273272
PostfixUnaryExpression,
274273
PrefixUnaryExpression,
275274
PrivateIdentifier,
@@ -513,9 +512,7 @@ const binder = /* @__PURE__ */ createBinder();
513512
/** @internal */
514513
export function bindSourceFile(file: SourceFile, options: CompilerOptions) {
515514
performance.mark("beforeBind");
516-
perfLogger?.logStartBindFile("" + file.fileName);
517515
binder(file, options);
518-
perfLogger?.logStopBindFile();
519516
performance.mark("afterBind");
520517
performance.measure("Bind", "beforeBind", "afterBind");
521518
}

‎src/compiler/moduleNameResolver.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ import {
8383
pathIsRelative,
8484
Pattern,
8585
patternText,
86-
perfLogger,
8786
readJson,
8887
removeExtension,
8988
removeFileExtension,
@@ -1431,7 +1430,6 @@ export function resolveModuleName(moduleName: string, containingFile: string, co
14311430
}
14321431
}
14331432

1434-
perfLogger?.logStartResolveModule(moduleName /* , containingFile, ModuleResolutionKind[moduleResolution]*/);
14351433
switch (moduleResolution) {
14361434
case ModuleResolutionKind.Node16:
14371435
result = node16ModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
@@ -1451,8 +1449,6 @@ export function resolveModuleName(moduleName: string, containingFile: string, co
14511449
default:
14521450
return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
14531451
}
1454-
if (result && result.resolvedModule) perfLogger?.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
1455-
perfLogger?.logStopResolveModule((result && result.resolvedModule) ? "" + result.resolvedModule.resolvedFileName : "null");
14561452

14571453
if (cache && !cache.isReadonly) {
14581454
cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(moduleName, resolutionMode, result);

‎src/compiler/parser.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ import {
293293
ParenthesizedExpression,
294294
ParenthesizedTypeNode,
295295
PartiallyEmittedExpression,
296-
perfLogger,
297296
PlusToken,
298297
PostfixUnaryExpression,
299298
PostfixUnaryOperator,
@@ -1343,7 +1342,6 @@ export function createSourceFile(fileName: string, sourceText: string, languageV
13431342
performance.mark("beforeParse");
13441343
let result: SourceFile;
13451344

1346-
perfLogger?.logStartParseSourceFile(fileName);
13471345
const {
13481346
languageVersion,
13491347
setExternalModuleIndicator: overrideSetExternalModuleIndicator,
@@ -1360,7 +1358,6 @@ export function createSourceFile(fileName: string, sourceText: string, languageV
13601358
};
13611359
result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind, setIndicator, jsDocParsingMode);
13621360
}
1363-
perfLogger?.logStopParseSourceFile();
13641361

13651362
performance.mark("afterParse");
13661363
performance.measure("Parse", "beforeParse", "afterParse");

‎src/compiler/perfLogger.ts

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/compiler/sys.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import {
3535
normalizeSlashes,
3636
orderedRemoveItem,
3737
Path,
38-
perfLogger,
3938
PollingWatchKind,
4039
resolveJSModule,
4140
some,
@@ -1786,7 +1785,7 @@ export let sys: System = (() => {
17861785
);
17871786
}
17881787

1789-
function readFileWorker(fileName: string, _encoding?: string): string | undefined {
1788+
function readFile(fileName: string, _encoding?: string): string | undefined {
17901789
let buffer: Buffer;
17911790
try {
17921791
buffer = _fs.readFileSync(fileName);
@@ -1818,15 +1817,7 @@ export let sys: System = (() => {
18181817
return buffer.toString("utf8");
18191818
}
18201819

1821-
function readFile(fileName: string, _encoding?: string): string | undefined {
1822-
perfLogger?.logStartReadFile(fileName);
1823-
const file = readFileWorker(fileName, _encoding);
1824-
perfLogger?.logStopReadFile();
1825-
return file;
1826-
}
1827-
18281820
function writeFile(fileName: string, data: string, writeByteOrderMark?: boolean): void {
1829-
perfLogger?.logEvent("WriteFile: " + fileName);
18301821
// If a BOM is required, emit one
18311822
if (writeByteOrderMark) {
18321823
data = byteOrderMarkIndicator + data;
@@ -1846,7 +1837,6 @@ export let sys: System = (() => {
18461837
}
18471838

18481839
function getAccessibleFileSystemEntries(path: string): FileSystemEntries {
1849-
perfLogger?.logEvent("ReadDir: " + (path || "."));
18501840
try {
18511841
const entries = _fs.readdirSync(path || ".", { withFileTypes: true });
18521842
const files: string[] = [];

‎src/compiler/watchPublic.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ import {
6262
parseConfigHostFromCompilerHostLike,
6363
ParsedCommandLine,
6464
Path,
65-
perfLogger,
6665
PollingInterval,
6766
ProgramUpdateLevel,
6867
ProjectReference,
@@ -891,19 +890,15 @@ export function createWatchProgram<T extends BuilderProgram>(host: WatchCompiler
891890
function updateProgram() {
892891
switch (updateLevel) {
893892
case ProgramUpdateLevel.RootNamesAndUpdate:
894-
perfLogger?.logStartUpdateProgram("PartialConfigReload");
895893
reloadFileNamesFromConfigFile();
896894
break;
897895
case ProgramUpdateLevel.Full:
898-
perfLogger?.logStartUpdateProgram("FullConfigReload");
899896
reloadConfigFile();
900897
break;
901898
default:
902-
perfLogger?.logStartUpdateProgram("SynchronizeProgram");
903899
synchronizeProgram();
904900
break;
905901
}
906-
perfLogger?.logStopUpdateProgram("Done");
907902
return getCurrentBuilderProgram();
908903
}
909904

‎src/server/project.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ import {
9393
ParsedCommandLine,
9494
parsePackageName,
9595
Path,
96-
perfLogger,
9796
PerformanceEvent,
9897
PluginImport,
9998
PollingInterval,
@@ -1360,7 +1359,6 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
13601359
*/
13611360
updateGraph(): boolean {
13621361
tracing?.push(tracing.Phase.Session, "updateGraph", { name: this.projectName, kind: ProjectKind[this.projectKind] });
1363-
perfLogger?.logStartUpdateGraph();
13641362
this.resolutionCache.startRecordingFilesWithChangedResolutions();
13651363

13661364
const hasNewProgram = this.updateGraphWorker();
@@ -1405,7 +1403,6 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
14051403
// Preload auto import provider so it's not created during completions request
14061404
this.getPackageJsonAutoImportProvider();
14071405
}
1408-
perfLogger?.logStopUpdateGraph();
14091406
tracing?.pop();
14101407
return !hasNewProgram;
14111408
}

‎src/server/session.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ import {
102102
OutliningSpan,
103103
PasteEdits,
104104
Path,
105-
perfLogger,
106105
PerformanceEvent,
107106
PossibleProgramFileInfo,
108107
Program,
@@ -1206,7 +1205,6 @@ export class Session<TMessage = string> implements EventSender {
12061205

12071206
protected writeMessage(msg: protocol.Message) {
12081207
const msgText = formatMessage(msg, this.logger, this.byteLength, this.host.newLine);
1209-
perfLogger?.logEvent(`Response message size: ${msgText.length}`);
12101208
this.host.write(msgText);
12111209
}
12121210

@@ -3698,7 +3696,6 @@ export class Session<TMessage = string> implements EventSender {
36983696
relevantFile = request.arguments && (request as protocol.FileRequest).arguments.file ? (request as protocol.FileRequest).arguments : undefined;
36993697

37003698
tracing?.instant(tracing.Phase.Session, "request", { seq: request.seq, command: request.command });
3701-
perfLogger?.logStartCommand("" + request.command, this.toStringMessage(message).substring(0, 100));
37023699

37033700
tracing?.push(tracing.Phase.Session, "executeCommand", { seq: request.seq, command: request.command }, /*separateBeginAndEnd*/ true);
37043701
const { response, responseRequired } = this.executeCommand(request);
@@ -3715,7 +3712,6 @@ export class Session<TMessage = string> implements EventSender {
37153712
}
37163713

37173714
// Note: Log before writing the response, else the editor can complete its activity before the server does
3718-
perfLogger?.logStopCommand("" + request.command, "Success");
37193715
tracing?.instant(tracing.Phase.Session, "response", { seq: request.seq, command: request.command, success: !!response });
37203716
if (response) {
37213717
this.doOutput(response, request.command, request.seq, /*success*/ true);
@@ -3730,14 +3726,12 @@ export class Session<TMessage = string> implements EventSender {
37303726

37313727
if (err instanceof OperationCanceledException) {
37323728
// Handle cancellation exceptions
3733-
perfLogger?.logStopCommand("" + (request && request.command), "Canceled: " + err);
37343729
tracing?.instant(tracing.Phase.Session, "commandCanceled", { seq: request?.seq, command: request?.command });
37353730
this.doOutput({ canceled: true }, request!.command, request!.seq, /*success*/ true);
37363731
return;
37373732
}
37383733

37393734
this.logErrorWorker(err, this.toStringMessage(message), relevantFile);
3740-
perfLogger?.logStopCommand("" + (request && request.command), "Error: " + err);
37413735
tracing?.instant(tracing.Phase.Session, "commandError", { seq: request?.seq, command: request?.command, message: (err as Error).message });
37423736

37433737
this.doOutput(

‎src/server/utilities.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {
33
Comparer,
44
getBaseFileName,
55
identity,
6-
perfLogger,
76
SortedArray,
87
} from "./_namespaces/ts.js";
98
import {
@@ -48,13 +47,11 @@ export class ThrottledOperations {
4847
}
4948

5049
private static run(operationId: string, self: ThrottledOperations, cb: () => void) {
51-
perfLogger?.logStartScheduledOperation(operationId);
5250
self.pendingTimeouts.delete(operationId);
5351
if (self.logger) {
5452
self.logger.info(`Running: ${operationId}`);
5553
}
5654
cb();
57-
perfLogger?.logStopScheduledOperation();
5855
}
5956
}
6057

@@ -75,7 +72,6 @@ export class GcTimer {
7572
private static run(self: GcTimer) {
7673
self.timerId = undefined;
7774

78-
perfLogger?.logStartScheduledOperation("GC collect");
7975
const log = self.logger.hasLevel(LogLevel.requestTime);
8076
const before = log && self.host.getMemoryUsage!(); // TODO: GH#18217
8177

@@ -84,7 +80,6 @@ export class GcTimer {
8480
const after = self.host.getMemoryUsage!(); // TODO: GH#18217
8581
self.logger.perftrc(`GC::before ${before}, after ${after}`);
8682
}
87-
perfLogger?.logStopScheduledOperation();
8883
}
8984
}
9085

‎src/tsserver/nodeServer.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
noopFileWatcher,
1515
normalizePath,
1616
normalizeSlashes,
17-
perfLogger,
1817
startTracing,
1918
stripQuotes,
2019
sys,
@@ -213,18 +212,6 @@ export function initializeNodeSystem(): StartInput {
213212
return this.loggingEnabled() && this.level >= level;
214213
}
215214
msg(s: string, type: ts.server.Msg = ts.server.Msg.Err) {
216-
switch (type) {
217-
case ts.server.Msg.Info:
218-
perfLogger?.logInfoEvent(s);
219-
break;
220-
case ts.server.Msg.Perf:
221-
perfLogger?.logPerfEvent(s);
222-
break;
223-
default: // Msg.Err
224-
perfLogger?.logErrEvent(s);
225-
break;
226-
}
227-
228215
if (!this.canWrite()) return;
229216

230217
s = `[${ts.server.nowString()}] ${s}\n`;

0 commit comments

Comments
 (0)