fix

Author: mydea

dev-packages/node-integration-tests/suites/tracing/mysql2/scenario.mjs

@@ -26,6 +26,8 @@ async function run() {
     async _ => {
       await connection.query('SELECT 1 + 1 AS solution');
       await connection.query('SELECT NOW()', ['1', '2']);
+      // A single, non-array bind value (`query(sql, scalar)`) must still be inlined into `db.statement`.
+      await connection.query('SELECT ? AS scalar_value', 42);
       // `execute` is instrumented the same way as `query`
       await connection.execute('SELECT 42 AS answer');
       // a failing query should produce a span with an error status

dev-packages/node-integration-tests/suites/tracing/mysql2/test.ts

@@ -38,6 +38,16 @@ describeWithDockerCompose('mysql2 auto instrumentation', { workingDirectory: [__
           'db.user': 'root',
         }),
       }),
+      // a single non-array bind value is inlined into `db.statement` (not left as a `?` placeholder)
+      expect.objectContaining({
+        description: 'SELECT 42 AS scalar_value',
+        op: 'db',
+        origin: ORIGIN,
+        data: expect.objectContaining({
+          'db.system': 'mysql',
+          'db.statement': 'SELECT 42 AS scalar_value',
+        }),
+      }),
       // `execute` is instrumented the same way as `query`
       expect.objectContaining({
         description: 'SELECT 42 AS answer',

packages/server-utils/src/integrations/tracing-channel/mysql2.ts

@@ -111,8 +111,11 @@ function getQueryText(connection: Mysql2Connection | undefined, args: unknown[])
     return undefined;
   }
 
-  // `query(sql, values, cb)` → values is `args[1]`; `query(sql, cb)` → no values.
-  const values = Array.isArray(args[1]) ? args[1] : undefined;
+  // `query(sql, values, cb)` → values is `args[1]`. mysql2 also accepts a single non-array bind value
+  // (`query(sql, scalar, cb)`); a non-array `args[1]` is only a value when a callback follows it,
+  // otherwise it is the callback itself (`query(sql, cb)`). Matches `@opentelemetry/instrumentation-mysql2`.
+  const values = Array.isArray(args[1]) ? args[1] : args[2] !== undefined ? [args[1]] : undefined;
+
   const objectValues =
     isObjectLike(args[0]) && 'values' in args[0] ? (args[0] as { values?: unknown }).values : undefined;
   const boundValues = values ?? objectValues;