diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts
index 8c90080980..6a80fd5983 100644
--- a/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts
+++ b/plugins/node/opentelemetry-instrumentation-mysql2/src/instrumentation.ts
@@ -39,8 +39,6 @@ import {
 /** @knipignore */
 import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
 
-type formatType = typeof mysqlTypes.format;
-
 export class MySQL2Instrumentation extends InstrumentationBase<MySQL2InstrumentationConfig> {
   static readonly COMMON_ATTRIBUTES = {
     [SEMATTRS_DB_SYSTEM]: DBSYSTEMVALUES_MYSQL,
@@ -64,7 +62,7 @@ export class MySQL2Instrumentation extends InstrumentationBase<MySQL2Instrumenta
           this._wrap(
             ConnectionPrototype,
             'query',
-            this._patchQuery(moduleExports.format, false) as any
+            this._patchQuery(false) as any
           );
 
           if (isWrapped(ConnectionPrototype.execute)) {
@@ -73,7 +71,7 @@ export class MySQL2Instrumentation extends InstrumentationBase<MySQL2Instrumenta
           this._wrap(
             ConnectionPrototype,
             'execute',
-            this._patchQuery(moduleExports.format, true) as any
+            this._patchQuery(true) as any
           );
 
           return moduleExports;
@@ -82,14 +80,18 @@ export class MySQL2Instrumentation extends InstrumentationBase<MySQL2Instrumenta
           if (moduleExports === undefined) return;
           const ConnectionPrototype: mysqlTypes.Connection =
             moduleExports.Connection.prototype;
-          this._unwrap(ConnectionPrototype, 'query');
-          this._unwrap(ConnectionPrototype, 'execute');
+          if (isWrapped(ConnectionPrototype.query)) {
+            this._unwrap(ConnectionPrototype, 'query');
+          }
+          if (isWrapped(ConnectionPrototype.execute)) {
+            this._unwrap(ConnectionPrototype, 'execute');
+          }
         }
       ),
     ];
   }
 
-  private _patchQuery(format: formatType, isPrepared: boolean) {
+  private _patchQuery(isPrepared: boolean) {
     return (originalQuery: Function): Function => {
       const thisPlugin = this;
       return function query(
@@ -110,7 +112,7 @@ export class MySQL2Instrumentation extends InstrumentationBase<MySQL2Instrumenta
           attributes: {
             ...MySQL2Instrumentation.COMMON_ATTRIBUTES,
             ...getConnectionAttributes(this.config),
-            [SEMATTRS_DB_STATEMENT]: getDbStatement(query, format, values),
+            [SEMATTRS_DB_STATEMENT]: getDbStatement(query, values),
           },
         });
 
@@ -150,11 +152,18 @@ export class MySQL2Instrumentation extends InstrumentationBase<MySQL2Instrumenta
               );
             }
           }
-
           span.end();
         });
-
-        if (arguments.length === 1) {
+        function findCallback(_arguments: IArguments) {
+          for (let i = 0; i < _arguments.length; i++) {
+            if (typeof _arguments[i] === 'function') {
+              return i;
+            }
+          }
+          return -1;
+        }
+        const cb = findCallback(arguments);
+        if (cb < 0) {
           if (typeof (query as any).onResult === 'function') {
             thisPlugin._wrap(
               query as any,
@@ -178,22 +187,13 @@ export class MySQL2Instrumentation extends InstrumentationBase<MySQL2Instrumenta
             });
 
           return streamableQuery;
-        }
-
-        if (typeof arguments[1] === 'function') {
+        } else {
           thisPlugin._wrap(
             arguments,
-            1,
-            thisPlugin._patchCallbackQuery(endSpan)
-          );
-        } else if (typeof arguments[2] === 'function') {
-          thisPlugin._wrap(
-            arguments,
-            2,
+            cb,
             thisPlugin._patchCallbackQuery(endSpan)
           );
         }
-
         return originalQuery.apply(this, arguments);
       };
     };
diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/src/utils.ts b/plugins/node/opentelemetry-instrumentation-mysql2/src/utils.ts
index bb0fb763d3..33e3074aab 100644
--- a/plugins/node/opentelemetry-instrumentation-mysql2/src/utils.ts
+++ b/plugins/node/opentelemetry-instrumentation-mysql2/src/utils.ts
@@ -36,10 +36,6 @@ interface QueryOptions {
   values?: any | any[] | { [param: string]: any };
 }
 
-interface Query {
-  sql: string;
-}
-
 interface Config {
   host?: string;
   port?: number;
@@ -47,6 +43,7 @@ interface Config {
   user?: string;
   connectionConfig?: Config;
 }
+
 /**
  * Get an Attributes map from a mysql connection config object
  *
@@ -97,29 +94,28 @@ function getJDBCString(
 }
 
 /**
- * Conjures up the value for the db.statement attribute by formatting a SQL query.
- *
- * @returns the database statement being executed.
+ * Returns a string representing the SQL query that is appropriate to return
+ * in telemetry. If there are no `values` then, to be cautious, it is assumed
+ * the query SQL may include sensitive data and `undefined` is returned, so
+ * that no DB statement is included in telemetry.
  */
 export function getDbStatement(
-  query: string | Query | QueryOptions,
-  format: (
-    sql: string,
-    values: any[],
-    stringifyObjects?: boolean,
-    timeZone?: string
-  ) => string,
+  query: string | QueryOptions,
   values?: any[]
-): string {
+): string | undefined {
+  let statement = '';
   if (typeof query === 'string') {
-    return values ? format(query, values) : query;
+    if (!values) {
+      return;
+    }
+    statement = query;
   } else {
-    // According to https://github.com/mysqljs/mysql#performing-queries
-    // The values argument will override the values in the option object.
-    return values || (query as QueryOptions).values
-      ? format(query.sql, values || (query as QueryOptions).values)
-      : query.sql;
+    if (!query.values && !values) {
+      return;
+    }
+    statement = query.sql;
   }
+  return statement;
 }
 
 /**
@@ -128,7 +124,7 @@ export function getDbStatement(
  *
  * @returns SQL statement without variable arguments or SQL verb
  */
-export function getSpanName(query: string | Query | QueryOptions): string {
+export function getSpanName(query: string | QueryOptions): string {
   const rawQuery = typeof query === 'object' ? query.sql : query;
   // Extract the SQL verb
   const firstSpace = rawQuery?.indexOf(' ');
diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts b/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts
index ef14d7d982..69736ffff4 100644
--- a/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts
+++ b/plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts
@@ -48,6 +48,9 @@ const instrumentation = new MySQL2Instrumentation();
 instrumentation.enable();
 instrumentation.disable();
 
+const instrumentation2 = new MySQL2Instrumentation();
+instrumentation2.disable();
+
 import * as mysqlTypes from 'mysql2';
 
 interface Result extends mysqlTypes.RowDataPacket {
@@ -67,13 +70,17 @@ describe('mysql2', () => {
   const memoryExporter = new InMemorySpanExporter();
 
   const getLastQueries = (count: number) =>
-    new Promise<string[]>(res => {
+    new Promise<string[]>((res, reject) => {
       const queries: string[] = [];
       const query = rootConnection.query({
         sql: "SELECT * FROM mysql.general_log WHERE command_type = 'Query' ORDER BY event_time DESC LIMIT ? OFFSET 1",
         values: [count],
       });
 
+      query.on('error', err => {
+        reject(err);
+      });
+
       query.on('result', (row: { argument: string | Buffer }) => {
         if (typeof row.argument === 'string') {
           queries.push(row.argument);
@@ -110,12 +117,12 @@ describe('mysql2', () => {
   });
 
   after(function (done) {
-    rootConnection.end(() => {
+    rootConnection.end(err => {
       if (testMysqlLocally) {
         this.timeout(5000);
         testUtils.cleanUpDocker('mysql');
       }
-      done();
+      done(err);
     });
   });
 
@@ -156,33 +163,76 @@ describe('mysql2', () => {
     memoryExporter.reset();
     instrumentation.setConfig({});
     instrumentation.disable();
-    connection.end(() => {
+    connection.end(err => {
       pool.end(() => {
         if (isPoolClusterEndIgnoreCallback()) {
           poolCluster.end();
-          done();
+          done(err);
         } else {
           // PoolCluster.end types in the package are invalid
           // https://github.com/sidorares/node-mysql2/pull/1332
           (poolCluster as any).end(() => {
-            done();
+            done(err);
           });
         }
       });
     });
   });
 
+  describe('initialization', () => {
+    let connection: mysqlTypes.Connection;
+    before(() => {
+      instrumentation2.enable();
+      connection = mysqlTypes.createConnection({
+        port,
+        user,
+        host,
+        password,
+        database,
+      });
+    });
+    after(done => {
+      connection.end(() => {
+        instrumentation2.disable();
+        done();
+      });
+    });
+    it('should not wrap more than once', done => {
+      const sql = 'SELECT 1+? as solution';
+      const query = connection.query(sql, [1]);
+      query.on('end', () => {
+        let err;
+        try {
+          const spans = memoryExporter.getFinishedSpans();
+          assert.strictEqual(spans.length, 1);
+          assert.strictEqual(spans[0].name, 'SELECT');
+          assert.strictEqual(
+            spans[0].attributes[SEMATTRS_DB_STATEMENT],
+            'SELECT 1+? as solution'
+          );
+        } catch (e) {
+          err = e;
+        }
+        done(err);
+      });
+    });
+  });
+
   describe('when the query is a string', () => {
     it('should name the span accordingly ', done => {
       const span = provider.getTracer('default').startSpan('test span');
       context.with(trace.setSpan(context.active(), span), () => {
-        const sql = 'SELECT 1+1 as solution';
-        const query = connection.query(sql);
+        const sql = 'SELECT 1+? as solution';
+        const query = connection.query(sql, [1]);
 
         query.on('end', () => {
           const spans = memoryExporter.getFinishedSpans();
+          assert.strictEqual(spans.length, 1);
           assert.strictEqual(spans[0].name, 'SELECT');
-          assert.strictEqual(spans[0].attributes[SEMATTRS_DB_STATEMENT], sql);
+          assert.strictEqual(
+            spans[0].attributes[SEMATTRS_DB_STATEMENT],
+            'SELECT 1+? as solution'
+          );
           done();
         });
       });
@@ -195,13 +245,20 @@ describe('mysql2', () => {
       context.with(trace.setSpan(context.active(), span), () => {
         const sql = 'SELECT 1+? as solution';
         const query = connection.query({ sql, values: [1] });
+        let rows = 0;
+
+        query.on('result', (row: mysqlTypes.RowDataPacket) => {
+          assert.strictEqual(row.solution, 2);
+          rows += 1;
+        });
 
         query.on('end', () => {
+          assert.strictEqual(rows, 1);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans[0].name, 'SELECT');
           assert.strictEqual(
             spans[0].attributes[SEMATTRS_DB_STATEMENT],
-            query.sql
+            'SELECT 1+? as solution'
           );
           done();
         });
@@ -213,23 +270,23 @@ describe('mysql2', () => {
     it('should intercept connection.query(text: string)', done => {
       const span = provider.getTracer('default').startSpan('test span');
       context.with(trace.setSpan(context.active(), span), () => {
-        const sql = 'SELECT 1+1 as solution';
-        const query = connection.query<Result[]>(sql);
+        const sql = 'SELECT 1+? as solution';
+        const query = connection.query(sql, [1]);
         let rows = 0;
 
         query.on('result', (row: mysqlTypes.RowDataPacket) => {
           assert.strictEqual(row.solution, 2);
           rows += 1;
         });
-
         query.on('end', () => {
           try {
             assert.strictEqual(rows, 1);
             const spans = memoryExporter.getFinishedSpans();
             assert.strictEqual(spans.length, 1);
-            assertSpan(spans[0], sql);
+            assertSpan(spans[0], sql, true);
           } catch (e) {
             done(e);
+            return;
           }
           done();
         });
@@ -246,7 +303,7 @@ describe('mysql2', () => {
           assert.strictEqual(res[0].solution, 2);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql);
+          assertSpan(spans[0], sql, false);
           done();
         });
       });
@@ -264,7 +321,7 @@ describe('mysql2', () => {
             assert.strictEqual(res[0].solution, 2);
             const spans = memoryExporter.getFinishedSpans();
             assert.strictEqual(spans.length, 1);
-            assertSpan(spans[0], sql, [1]);
+            assertSpan(spans[0], sql, true);
             done();
           }
         );
@@ -284,7 +341,7 @@ describe('mysql2', () => {
             assert.strictEqual(res[0].solution, 2);
             const spans = memoryExporter.getFinishedSpans();
             assert.strictEqual(spans.length, 1);
-            assertSpan(spans[0], sql, [1]);
+            assertSpan(spans[0], sql, true);
             done();
           }
         );
@@ -301,7 +358,7 @@ describe('mysql2', () => {
           assert.strictEqual(res[0].solution, 1);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql, [1]);
+          assertSpan(spans[0], sql, true);
           done();
         });
       });
@@ -317,7 +374,7 @@ describe('mysql2', () => {
           assert.strictEqual(res[0].solution, 1);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql, [1]);
+          assertSpan(spans[0], sql, true);
           done();
         });
       });
@@ -326,12 +383,14 @@ describe('mysql2', () => {
     it('should attach error messages to spans', done => {
       const span = provider.getTracer('default').startSpan('test span');
       context.with(trace.setSpan(context.active(), span), () => {
-        const sql = 'SELECT ? as solution';
-        connection.query(sql, (err, res) => {
+        const sql = `SELECT c1
+                     from t1_${Date.now()}
+                     where c2 = ?`;
+        connection.query(sql, ['test'], (err, res) => {
           assert.ok(err);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql, undefined, err!.message);
+          assertSpan(spans[0], sql, true, err!.message);
           done();
         });
       });
@@ -458,7 +517,7 @@ describe('mysql2', () => {
             assert.strictEqual(res[0].solution, 2);
             const spans = memoryExporter.getFinishedSpans();
             assert.strictEqual(spans.length, 1);
-            assertSpan(spans[0], sql, [1]);
+            assertSpan(spans[0], sql, true);
             done();
           }
         );
@@ -478,7 +537,7 @@ describe('mysql2', () => {
             assert.strictEqual(res[0].solution, 2);
             const spans = memoryExporter.getFinishedSpans();
             assert.strictEqual(spans.length, 1);
-            assertSpan(spans[0], sql, [1]);
+            assertSpan(spans[0], sql, true);
             done();
           }
         );
@@ -495,7 +554,7 @@ describe('mysql2', () => {
           assert.strictEqual(res[0].solution, 2);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql, [1]);
+          assertSpan(spans[0], sql, true);
           done();
         });
       });
@@ -511,13 +570,13 @@ describe('mysql2', () => {
           assert.strictEqual(res[0].solution, 2);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql, [1]);
+          assertSpan(spans[0], sql, true);
           done();
         });
       });
     });
 
-    it('should attach error messages to spans', done => {
+    it('should attach error messages to spans connection.execute(text: string, callback)', done => {
       const span = provider.getTracer('default').startSpan('test span');
       context.with(trace.setSpan(context.active(), span), () => {
         const sql = 'SELECT ? as solution';
@@ -530,6 +589,21 @@ describe('mysql2', () => {
         });
       });
     });
+
+    it('should attach error messages to spans connection.execute(text: string, values: [])', done => {
+      const span = provider.getTracer('default').startSpan('test span');
+      context.with(trace.setSpan(context.active(), span), () => {
+        const sql = 'SELECT 1+? as solution from non_existent_table';
+        const query = connection.execute<Result[]>(sql, [1]);
+        query.on('error', err => {
+          const spans = memoryExporter.getFinishedSpans();
+          assert.strictEqual(spans.length, 1);
+          assert.strictEqual(spans[0].status.code, SpanStatusCode.ERROR);
+          assertSpan(spans[0], sql, true);
+          done();
+        });
+      });
+    });
   });
 
   describe('#Pool.query', () => {
@@ -625,7 +699,7 @@ describe('mysql2', () => {
             assert.strictEqual(res[0].solution, 2);
             const spans = memoryExporter.getFinishedSpans();
             assert.strictEqual(spans.length, 1);
-            assertSpan(spans[0], sql, [1]);
+            assertSpan(spans[0], sql, true);
             done();
           }
         );
@@ -642,12 +716,33 @@ describe('mysql2', () => {
           assert.strictEqual(res[0].solution, 2);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql, [1]);
+          assertSpan(spans[0], sql, true);
           done();
         });
       });
     });
 
+    it('should intercept pool.query(text: options, callback, null)', done => {
+      const span = provider.getTracer('default').startSpan('test span');
+      context.with(trace.setSpan(context.active(), span), () => {
+        const sql = 'SELECT 1+1 as solution';
+        // @ts-ignore
+        pool.query(
+          { sql },
+          (err, res: mysqlTypes.RowDataPacket[]) => {
+            assert.ifError(err);
+            assert.ok(res);
+            assert.strictEqual(res[0].solution, 2);
+            const spans = memoryExporter.getFinishedSpans();
+            assert.strictEqual(spans.length, 1);
+            assertSpan(spans[0], sql);
+            done();
+          },
+          null
+        );
+      });
+    });
+
     it('should intercept pool.query(text: string, values: [], callback)', done => {
       const span = provider.getTracer('default').startSpan('test span');
       context.with(trace.setSpan(context.active(), span), () => {
@@ -658,7 +753,7 @@ describe('mysql2', () => {
           assert.strictEqual(res[0].solution, 1);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql, [1]);
+          assertSpan(spans[0], sql, true);
           done();
         });
       });
@@ -674,7 +769,7 @@ describe('mysql2', () => {
           assert.strictEqual(res[0].solution, 1);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql, [1]);
+          assertSpan(spans[0], sql, true);
           done();
         });
       });
@@ -770,7 +865,7 @@ describe('mysql2', () => {
           assert.strictEqual(row[0].solution, 2);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql);
+          assertSpan(spans[0], sql, true);
           done();
         });
       });
@@ -781,6 +876,9 @@ describe('mysql2', () => {
       context.with(trace.setSpan(context.active(), span), () => {
         const sql = 'SELECT 1+1 as solution';
         pool.getConnection((err, conn) => {
+          if (err) {
+            return done(err);
+          }
           const query = conn.execute(sql);
           let rows = 0;
 
@@ -790,11 +888,15 @@ describe('mysql2', () => {
           });
 
           query.on('end', () => {
-            assert.strictEqual(rows, 1);
-            const spans = memoryExporter.getFinishedSpans();
-            assert.strictEqual(spans.length, 1);
-            assertSpan(spans[0], sql);
-            done();
+            try {
+              assert.strictEqual(rows, 1);
+              const spans = memoryExporter.getFinishedSpans();
+              assert.strictEqual(spans.length, 1);
+              assertSpan(spans[0], sql);
+              done();
+            } catch (e) {
+              done(e);
+            }
           });
         });
       });
@@ -805,13 +907,17 @@ describe('mysql2', () => {
       context.with(trace.setSpan(context.active(), span), () => {
         const sql = 'SELECT 1+1 as solution';
         pool.execute(sql, (err, res: mysqlTypes.RowDataPacket[]) => {
-          assert.ifError(err);
-          assert.ok(res);
-          assert.strictEqual(res[0].solution, 2);
-          const spans = memoryExporter.getFinishedSpans();
-          assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql);
-          done();
+          try {
+            assert.ifError(err);
+            assert.ok(res);
+            assert.strictEqual(res[0].solution, 2);
+            const spans = memoryExporter.getFinishedSpans();
+            assert.strictEqual(spans.length, 1);
+            assertSpan(spans[0], sql, true);
+            done();
+          } catch (e) {
+            done(e);
+          }
         });
       });
     });
@@ -846,7 +952,7 @@ describe('mysql2', () => {
             assert.strictEqual(res[0].solution, 2);
             const spans = memoryExporter.getFinishedSpans();
             assert.strictEqual(spans.length, 1);
-            assertSpan(spans[0], sql);
+            assertSpan(spans[0], sql, true);
             done();
           }
         );
@@ -863,7 +969,7 @@ describe('mysql2', () => {
           assert.strictEqual(res[0].solution, 2);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql, [1]);
+          assertSpan(spans[0], sql, true);
           done();
         });
       });
@@ -879,7 +985,7 @@ describe('mysql2', () => {
           assert.strictEqual(res[0].solution, 2);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql, [1]);
+          assertSpan(spans[0], sql, true);
           done();
         });
       });
@@ -895,7 +1001,7 @@ describe('mysql2', () => {
           assert.strictEqual(res[0].solution, 2);
           const spans = memoryExporter.getFinishedSpans();
           assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql, [1]);
+          assertSpan(spans[0], sql, true);
           done();
         });
       });
@@ -906,11 +1012,15 @@ describe('mysql2', () => {
       context.with(trace.setSpan(context.active(), span), () => {
         const sql = 'SELECT ? as solution';
         pool.execute(sql, (err, res) => {
-          assert.ok(err);
-          const spans = memoryExporter.getFinishedSpans();
-          assert.strictEqual(spans.length, 1);
-          assertSpan(spans[0], sql, undefined, err!.message);
-          done();
+          try {
+            assert.ok(err);
+            const spans = memoryExporter.getFinishedSpans();
+            assert.strictEqual(spans.length, 1);
+            assertSpan(spans[0], sql, true, err!.message);
+            done();
+          } catch (e) {
+            done(e);
+          }
         });
       });
     });
@@ -978,7 +1088,7 @@ describe('mysql2', () => {
               assert.strictEqual(res[0].solution, 2);
               const spans = memoryExporter.getFinishedSpans();
               assert.strictEqual(spans.length, 1);
-              assertSpan(spans[0], sql, [1]);
+              assertSpan(spans[0], sql, true);
               done();
             }
           );
@@ -1001,7 +1111,7 @@ describe('mysql2', () => {
               assert.strictEqual(res[0].solution, 2);
               const spans = memoryExporter.getFinishedSpans();
               assert.strictEqual(spans.length, 1);
-              assertSpan(spans[0], sql, [1]);
+              assertSpan(spans[0], sql, true);
               done();
             }
           );
@@ -1024,7 +1134,7 @@ describe('mysql2', () => {
               assert.strictEqual(res[0].solution, 1);
               const spans = memoryExporter.getFinishedSpans();
               assert.strictEqual(spans.length, 1);
-              assertSpan(spans[0], sql, [1]);
+              assertSpan(spans[0], sql, true);
               done();
             }
           );
@@ -1047,7 +1157,7 @@ describe('mysql2', () => {
               assert.strictEqual(res[0].solution, 1);
               const spans = memoryExporter.getFinishedSpans();
               assert.strictEqual(spans.length, 1);
-              assertSpan(spans[0], sql, [1]);
+              assertSpan(spans[0], sql, true);
               done();
             }
           );
@@ -1222,7 +1332,7 @@ describe('mysql2', () => {
 function assertSpan(
   span: ReadableSpan,
   sql: string,
-  values?: any,
+  hasAttrDbStatement?: boolean,
   errorMessage?: string
 ) {
   assert.strictEqual(span.attributes[SEMATTRS_DB_SYSTEM], DBSYSTEMVALUES_MYSQL);
@@ -1230,10 +1340,12 @@ function assertSpan(
   assert.strictEqual(span.attributes[SEMATTRS_NET_PEER_PORT], port);
   assert.strictEqual(span.attributes[SEMATTRS_NET_PEER_NAME], host);
   assert.strictEqual(span.attributes[SEMATTRS_DB_USER], user);
-  assert.strictEqual(
-    span.attributes[SEMATTRS_DB_STATEMENT],
-    mysqlTypes.format(sql, values)
-  );
+  if (hasAttrDbStatement) {
+    assert.strictEqual(span.attributes[SEMATTRS_DB_STATEMENT], sql);
+  } else {
+    assert.strictEqual(span.attributes[SEMATTRS_DB_STATEMENT], undefined);
+  }
+
   if (errorMessage) {
     assert.strictEqual(span.status.message, errorMessage);
     assert.strictEqual(span.status.code, SpanStatusCode.ERROR);