Skip to content

Commit 70ea1a3

Browse files
authored
chore(deps): Bump mysql2 test-version
1 parent 1bd86b7 commit 70ea1a3

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

packages/datadog-instrumentations/test/mysql2.spec.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('mysql2 instrumentation', () => {
2727
}
2828

2929
const sql = 'SELECT 1'
30-
let startCh, mysql2, shouldEmitEndAfterQueryAbort
30+
let startCh, mysql2, shouldEmitEndAfterQueryAbort, poolAddsErrorListenerOnQuery
3131
let apmQueryStartChannel, apmQueryStart, mysql2Version
3232

3333
before(() => {
@@ -40,6 +40,8 @@ describe('mysql2 instrumentation', () => {
4040
mysql2Version = mysql2Require.version()
4141
// in v1.3.3 CommandQuery started to emit 'end' after 'error' event
4242
shouldEmitEndAfterQueryAbort = semver.intersects(mysql2Version, '>=1.3.3')
43+
// in v3.17.2 Pool.query adds a once('error') listener for isReadOnlyError handling
44+
poolAddsErrorListenerOnQuery = semver.intersects(mysql2Version, '>=3.17.2')
4345
mysql2 = mysql2Require.get()
4446
apmQueryStartChannel = channel('apm:mysql2:query:start')
4547
})
@@ -490,7 +492,7 @@ describe('mysql2 instrumentation', () => {
490492

491493
await once(query, 'end')
492494

493-
assert.strictEqual(query.listenerCount('error'), 0)
495+
assert.strictEqual(query.listenerCount('error'), poolAddsErrorListenerOnQuery ? 1 : 0)
494496

495497
sinon.assert.called(apmQueryStart)
496498
})

packages/dd-trace/test/plugins/versions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
"mquery": "6.0.0",
154154
"multer": "2.0.2",
155155
"mysql": "2.18.1",
156-
"mysql2": "3.16.1",
156+
"mysql2": "3.18.2",
157157
"next": "16.1.3",
158158
"nock": "14.0.10",
159159
"node-serialize": "0.0.4",

0 commit comments

Comments
 (0)