fix: updated db instrumentations with safety promise check#2392
Merged
abhilash-sivan merged 2 commits intomainfrom Mar 10, 2026
Merged
fix: updated db instrumentations with safety promise check#2392abhilash-sivan merged 2 commits intomainfrom
abhilash-sivan merged 2 commits intomainfrom
Conversation
abhilash-sivan
commented
Mar 6, 2026
| span.transmit(); | ||
| }); | ||
| } else { | ||
| tracingUtil.handleUnexpectedReturnValue(result, exports.spanName, obj[0].sql); |
Contributor
Author
There was a problem hiding this comment.
Already we were cancelling the span on this case, so keeping the same
abhilash-sivan
commented
Mar 6, 2026
| }); | ||
| } else { | ||
| tracingUtil.handleUnexpectedReturnValue(prom, exports.spanName, sql); | ||
| span.cancel(); |
Contributor
Author
There was a problem hiding this comment.
same cancellation logic goes here
abhilash-sivan
force-pushed
the
fix-safety-promise-db
branch
from
61ad816 to
ec8641c
Compare
abhilash-sivan
commented
Mar 6, 2026
| return originalCallback.apply(this, arguments); | ||
| }; | ||
| originalArgs[1] = cls.ns.bind(wrappedCallback); | ||
| return originalFunction.apply(ctx, originalArgs); |
Contributor
Author
There was a problem hiding this comment.
When there's a callback, we don't have to handle the promise; this way we prevent finishing the span twice
abhilash-sivan
force-pushed
the
fix-safety-promise-db
branch
from
6001131 to
69a716d
Compare
|
aryamohanan
pushed a commit
that referenced
this pull request
Mar 13, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
refs https://jsw.ibm.com/browse/INSTA-70534
This PR covers the remaining DB instrumentations