fix(instrumentation-fs): fix instrumentation of fs/promises
#1375
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
This reverts commit 90d9f0d.
|
I just merged #1332 and it seems to create conflicts in this PR, sorry about that |
| spans | ||
| ) => { | ||
| const rootSpanName = `${name} test span`; | ||
| it(`promises.${name} ${error ? 'error' : 'success'}`, async () => { |
There was a problem hiding this comment.
Maybe I'm missing something, but isn't this test already exist in the file 'fs.test.ts' ?
There was a problem hiding this comment.
This is testing fs/promises, whereas fs.test.ts is testing fs.promises.
dyladan
reviewed
Feb 22, 2023
Comment on lines
+59
to
+62
| init(): ( | ||
| | InstrumentationNodeModuleDefinition<FS> | ||
| | InstrumentationNodeModuleDefinition<FSPromises> | ||
| )[] { |
There was a problem hiding this comment.
nit: i think this type is more explicit
Suggested change
| init(): ( | |
| | InstrumentationNodeModuleDefinition<FS> | |
| | InstrumentationNodeModuleDefinition<FSPromises> | |
| )[] { | |
| init(): [InstrumentationNodeModuleDefinition<FS>, InstrumentationNodeModuleDefinition<FSPromises>] { |
dyladan
approved these changes
Feb 22, 2023
blumamir
reviewed
Feb 26, 2023
Comment on lines
+31
to
+32
| const supportsPromises = | ||
| parseInt(process.versions.node.split('.')[0], 10) >= 14; |
There was a problem hiding this comment.
The repo supports node >= 14 anyway, so I guess this is not needed?
|
Sorry, I merged this PR but now I see there is still a comment about it: #1375 (comment). If you want to address this comment, I suggest to do it on another PR. |
|
@haddasbronfman #1375 (comment) will be addressed in #1413. |
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?
This PR fixes
@opentelemetry/instrumentation-fswhen used withfs/promises.Short description of the changes
This PR adds logic to
@opentelemetry/instrumentation-fsthat instrumentsfs/promises. This will properly instrumentfsmethods when they come fromfs/promises; currently, that instrumentation is not happening.