-
Notifications
You must be signed in to change notification settings - Fork 829
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.
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
fix(instrumentation): only call onRequire
for full matches on core modules with sub-paths
#3451
Merged
dyladan
merged 7 commits into
open-telemetry:main
from
mhassan1:ritm-singleton-core-subpaths
Dec 5, 2022
Merged
fix(instrumentation): only call onRequire
for full matches on core modules with sub-paths
#3451
dyladan
merged 7 commits into
open-telemetry:main
from
mhassan1:ritm-singleton-core-subpaths
Dec 5, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…modules with sub-paths
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #3451 +/- ##
==========================================
- Coverage 93.75% 92.08% -1.67%
==========================================
Files 248 120 -128
Lines 7552 4180 -3372
Branches 1576 911 -665
==========================================
- Hits 7080 3849 -3231
+ Misses 472 331 -141
|
Flarna
approved these changes
Nov 30, 2022
dyladan
approved these changes
Dec 5, 2022
experimental/packages/opentelemetry-instrumentation/src/platform/node/ModuleNameTrie.ts
Outdated
Show resolved
Hide resolved
vmarchaud
approved these changes
Dec 5, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which problem is this PR solving?
In #3161, we introduced the
RequireInTheMiddleSingleton
, which should be a (mostly) drop-in replacement forrequire-in-the-middle
(RITM); however, the way these two handle core modules with sub-paths (e.g.fs/promises
) is different. This PR fixesRequireInTheMiddleSingleton
to be consistent with RITM.Fixes #3448
Short description of the changes
Consider the scenario where we are patching a core module (e.g.
@opentelemetry/instrumentation-fs
, which patchesfs
). When the application callsrequire
on that core module with a sub-path (e.g.fs/promises
), RITM does not see that as internal tofs
and thus does not call theonRequire
function; however,RequireInTheMiddleSingleton
does.To make
RequireInTheMiddleSingleton
more consistent with RITM, we should only call theonRequire
function for full matches (i.e.fs/promises
should call hooks forfs/promises
but not forfs
).We detect whether a module is a core module by checking whether
basedir
isundefined
.Type of change
How Has This Been Tested?
I fixed and added additional unit tests to
RequireInTheMiddleSingleton
.Checklist: