Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove @microsoft/typescript-etw dependency #1351

Merged
merged 2 commits into from
Jun 28, 2024
Merged

Remove @microsoft/typescript-etw dependency #1351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f53d02
Remove @microsoft/typescript-etw dependency
hectorhdzg Jun 27, 2024
630cdd2
Merge branch 'main' into hectorhdzg/typedep
JacksonWeber Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/agent/diagnostics/writers/etwWritter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@

import * as fs from 'fs';
import * as path from 'path';
import type * as etwTypes from '@microsoft/typescript-etw';
import { Util } from "../../../shared/util";
import { IAgentLogger } from "../../types";

export class EtwWritter implements IAgentLogger {
private _etwModule: typeof etwTypes | undefined;
private _etwModule: any;

constructor() {
const nodeMajVer = parseInt(process.versions.node.split('.')[0], 10);
Expand Down Expand Up @@ -46,14 +45,14 @@ export class EtwWritter implements IAgentLogger {
}
}

private _loadEtwModule(nodeMajVer: number): typeof etwTypes | undefined {
private _loadEtwModule(nodeMajVer: number){
// Try to load precompiled ETW module if it exists and is "importable"
const dirname = path.join(__dirname, '../../../../../../../etw', `etw_${nodeMajVer}`);
try {
// throws an error if directory is not readable / does not exist
fs.accessSync(dirname, fs.constants.R_OK);
// eslint-disable-next-line @typescript-eslint/no-var-requires
return require(dirname) as typeof etwTypes;
return require(dirname);
} catch (e) {
// Could not load ETW, return nothing
return undefined;
Expand Down
Loading