From 3454156b32f4333a2e5c069652f6e59e493f3fbf Mon Sep 17 00:00:00 2001
From: Simon Stone <simonstone1@gmail.com>
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 <simonstone1@gmail.com>
---
 .../src/instrumentation.ts                          | 13 +++++++++++--
 1 file changed, 11 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..dec0427606 100644
--- a/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts
+++ b/plugins/node/opentelemetry-instrumentation-mysql/src/instrumentation.ts
@@ -14,7 +14,13 @@
  * 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 +209,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 +223,9 @@ export class MySQLInstrumentation extends InstrumentationBase<
         }
       }
       if (typeof cb === 'function') {
-        cb(...arguments);
+        context.with(activeContext, () => {
+          cb(...arguments);
+        });
       }
     };
   }