Skip to content

fix: added safety promise checks in redis, mongodb #2363

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

Open
abhilash-sivan wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: added safety promise checks in redis, mongodb #2363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
578f075
fix: added safety promise checks in redis, mongodb
abhilash-sivan Feb 23, 2026
3a24aa5
chore: cleanup
abhilash-sivan Feb 24, 2026
d1beec0
chore: cleanup mongodb
abhilash-sivan Feb 24, 2026
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
15 changes: 10 additions & 5 deletions packages/core/src/tracing/instrumentation/databases/ioredis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,16 @@ function instrumentSendCommand(original) {
span.stack = tracingUtil.getStackTrace(wrappedInternalSendCommand);

callback = cls.ns.bind(onResult);
command.promise.then(
// make sure that the first parameter is never truthy
callback.bind(null, null),
callback
);
if (typeof command.promise?.then === 'function') {
command.promise.then(
// make sure that the first parameter is never truthy
callback.bind(null, null),
callback
);
} else {
tracingUtil.handleUnexpectedReturnValue(command.promise, exports.spanName, `command "${command.name}"`);
onResult();
}

return original.apply(client, argsForOriginal);

Expand Down
20 changes: 12 additions & 8 deletions packages/core/src/tracing/instrumentation/databases/mongodb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,16 +434,19 @@ function stringifyWhenNecessary(obj) {
return tracingUtil.shortenDatabaseStatement(JSON.stringify(obj));
}

function finishSpan(span) {
span.d = Date.now() - span.ts;
span.transmit();
}

function createWrappedCallback(span, originalCallback) {
return cls.ns.bind(function (error) {
if (error) {
span.ec = 1;
tracingUtil.setErrorDetails(span, error, 'mongo');
}

span.d = Date.now() - span.ts;
span.transmit();

finishSpan(span);
return originalCallback.apply(this, arguments);
});
}
Expand All @@ -457,20 +460,21 @@ function handleCallbackOrPromise(ctx, originalArgs, originalFunction, span) {

const resultPromise = originalFunction.apply(ctx, originalArgs);

if (resultPromise && resultPromise.then) {
if (resultPromise && typeof resultPromise.then === 'function') {
resultPromise
.then(result => {
span.d = Date.now() - span.ts;
span.transmit();
finishSpan(span);
return result;
})
.catch(err => {
span.ec = 1;
tracingUtil.setErrorDetails(span, err, 'mongo');
span.d = Date.now() - span.ts;
span.transmit();
finishSpan(span);
return err;
});
} else {
tracingUtil.handleUnexpectedReturnValue(resultPromise, exports.spanName, 'command');
finishSpan(span);
}

return resultPromise;
Expand Down
7 changes: 5 additions & 2 deletions packages/core/src/tracing/instrumentation/databases/redis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,10 @@ function instrumentCommand(original, command, address, cbStyle) {
if (typeof userProvidedCallback !== 'function') {
userProvidedCallback = null;
modifiedArgs.push(callback);
return original.apply(origCtx, modifiedArgs);
} else {
modifiedArgs[modifiedArgs.length - 1] = callback;
return original.apply(origCtx, modifiedArgs);
}
return original.apply(origCtx, modifiedArgs);
} else {
const promise = original.apply(origCtx, origArgs);
if (typeof promise?.then === 'function') {
Expand All @@ -361,6 +360,7 @@ function instrumentCommand(original, command, address, cbStyle) {
});
} else {
// UNKNOWN CASE
tracingUtil.handleUnexpectedReturnValue(promise, exports.spanName, `command "${command}"`);
onResult();
}
return promise;
Expand Down Expand Up @@ -492,6 +492,9 @@ function instrumentMultiExec(origCtx, origArgs, original, address, isAtomic, cbS
onResult(error);
return error;
});
} else {
tracingUtil.handleUnexpectedReturnValue(promise, exports.spanName, 'multi/pipeline operation');
onResult();
}

return promise;
Expand Down