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

Jump to bottom

perf(opentelemetry-node): plugin loader search required cache #1807

Merged
merged 4 commits into from
Jan 12, 2021
Merged

perf(opentelemetry-node): plugin loader search required cache #1807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99be399
perf(opentelemetry-node): plugin loader search required cache
blumamir Jan 11, 2021
3780136
perf(instrumentation): plugin loader search required cache
blumamir Jan 11, 2021
1f6fcd4
Merge branch 'master' into plugin-loader-pref
blumamir Jan 12, 2021
58e63d5
Merge branch 'master' into plugin-loader-pref
obecny Jan 12, 2021
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
19 changes: 8 additions & 11 deletions packages/opentelemetry-instrumentation/src/platform/node/old/PluginLoader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,17 +107,14 @@ export class PluginLoader {
return this;
}

const alreadyRequiredModules = Object.keys(require.cache);
const requiredModulesToHook = modulesToHook.filter(
name =>
alreadyRequiredModules.find(cached => {
try {
return require.resolve(name) === cached;
} catch (err) {
return false;
}
}) !== undefined
);
const requiredModulesToHook = modulesToHook.filter((name: string) => {
try {
const moduleResolvedFilename = require.resolve(name);
return moduleResolvedFilename in require.cache;
} catch {
return false;
}
});
if (requiredModulesToHook.length > 0) {
this.logger.warn(
`Some modules (${requiredModulesToHook.join(
Expand Down
19 changes: 8 additions & 11 deletions packages/opentelemetry-node/src/instrumentation/PluginLoader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,14 @@ export class PluginLoader {
return this;
}

const alreadyRequiredModules = Object.keys(require.cache);
const requiredModulesToHook = modulesToHook.filter(
name =>
alreadyRequiredModules.find(cached => {
try {
return require.resolve(name) === cached;
} catch (err) {
return false;
}
}) !== undefined
);
const requiredModulesToHook = modulesToHook.filter((name: string) => {
try {
const moduleResolvedFilename = require.resolve(name);
return moduleResolvedFilename in require.cache;
} catch {
return false;
}
});
if (requiredModulesToHook.length > 0) {
this.logger.warn(
`Some modules (${requiredModulesToHook.join(
Expand Down