From 844781fceeecbe3e66e5e7df21e120b44a7a0689 Mon Sep 17 00:00:00 2001 From: Simon Stone Date: Mon, 5 Jul 2021 16:25:56 +0100 Subject: [PATCH] fix(mysql): bind get connection callback to active context Signed-off-by: Simon Stone --- .../src/instrumentation.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts index 301b85e51d..97d7af9fc3 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { diag, Span, SpanKind, SpanStatusCode } from '@opentelemetry/api'; +import { context, diag, Span, SpanKind, SpanStatusCode } from '@opentelemetry/api'; import { InstrumentationBase, InstrumentationNodeModuleDefinition, @@ -203,6 +203,7 @@ export class MySQLInstrumentation extends InstrumentationBase< private _getConnectionCallbackPatchFn(cb: Function, format: formatType) { const thisPlugin = this; + const activeContext = context.active(); return function () { if (arguments[1]) { // this is the callback passed into a query @@ -216,7 +217,9 @@ export class MySQLInstrumentation extends InstrumentationBase< } } if (typeof cb === 'function') { - cb(...arguments); + context.with(activeContext, () => { + cb(...arguments); + }); } }; }