Skip to content

Commit 9d3ec95

Browse files
rochdevrochdev
authored
fix mysql/mysql2/pg dbm trace id tests (#5436)
* fix mysql dbm trace id test * fix mysql2 and pg * code cleanup
1 parent 604cfa0 commit 9d3ec95

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

‎packages/datadog-plugin-mysql/test/index.spec.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -460,17 +460,15 @@ describe('Plugin', () => {
460460
it('query text should contain traceparent', done => {
461461
let queryText = ''
462462
agent.use(traces => {
463-
const expectedTimePrefix = Math.floor(clock.now / 1000).toString(16).padStart(8, '0').padEnd(16, '0')
463+
const expectedTimePrefix = traces[0][0].meta['_dd.p.tid'].toString(16).padStart(16, '0')
464464
const traceId = expectedTimePrefix + traces[0][0].trace_id.toString(16).padStart(16, '0')
465465
const spanId = traces[0][0].span_id.toString(16).padStart(16, '0')
466466

467467
expect(queryText).to.equal(
468468
`/*dddb='db',dddbs='post',dde='tester',ddh='127.0.0.1',ddps='test',ddpv='${ddpv}',` +
469469
`traceparent='00-${traceId}-${spanId}-00'*/ SELECT 1 + 1 AS solution`)
470470
}).then(done, done)
471-
const clock = sinon.useFakeTimers(new Date())
472471
connection.query('SELECT 1 + 1 AS solution', () => {
473-
clock.restore()
474472
queryText = connection._protocol._queue[0].sql
475473
})
476474
})
@@ -542,17 +540,15 @@ describe('Plugin', () => {
542540
it('query text should contain traceparent', done => {
543541
let queryText = ''
544542
agent.use(traces => {
545-
const expectedTimePrefix = Math.floor(clock.now / 1000).toString(16).padStart(8, '0').padEnd(16, '0')
543+
const expectedTimePrefix = traces[0][0].meta['_dd.p.tid'].toString(16).padStart(16, '0')
546544
const traceId = expectedTimePrefix + traces[0][0].trace_id.toString(16).padStart(16, '0')
547545
const spanId = traces[0][0].span_id.toString(16).padStart(16, '0')
548546

549547
expect(queryText).to.equal(
550548
`/*dddb='db',dddbs='post',dde='tester',ddh='127.0.0.1',ddps='test',ddpv='${ddpv}',` +
551549
`traceparent='00-${traceId}-${spanId}-00'*/ SELECT 1 + 1 AS solution`)
552550
}).then(done, done)
553-
const clock = sinon.useFakeTimers(new Date())
554551
pool.query('SELECT 1 + 1 AS solution', () => {
555-
clock.restore()
556552
queryText = pool._allConnections[0]._protocol._queue[0].sql
557553
})
558554
})

‎packages/datadog-plugin-mysql2/test/index.spec.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -447,17 +447,15 @@ describe('Plugin', () => {
447447
it('query text should contain traceparent', done => {
448448
let queryText = ''
449449
agent.use(traces => {
450-
const expectedTimePrefix = Math.floor(clock.now / 1000).toString(16).padStart(8, '0').padEnd(16, '0')
450+
const expectedTimePrefix = traces[0][0].meta['_dd.p.tid'].toString(16).padStart(16, '0')
451451
const traceId = expectedTimePrefix + traces[0][0].trace_id.toString(16).padStart(16, '0')
452452
const spanId = traces[0][0].span_id.toString(16).padStart(16, '0')
453453

454454
expect(queryText).to.equal(
455455
`/*dddb='db',dddbs='post',dde='tester',ddh='127.0.0.1',ddps='test',ddpv='${ddpv}',` +
456456
`traceparent='00-${traceId}-${spanId}-00'*/ SELECT 1 + 1 AS solution`)
457457
}).then(done, done)
458-
const clock = sinon.useFakeTimers(new Date())
459458
const connect = connection.query('SELECT 1 + 1 AS solution', () => {
460-
clock.restore()
461459
queryText = connect.sql
462460
})
463461
})
@@ -529,17 +527,15 @@ describe('Plugin', () => {
529527
it('query text should contain traceparent', done => {
530528
let queryText = ''
531529
agent.use(traces => {
532-
const expectedTimePrefix = Math.floor(clock.now / 1000).toString(16).padStart(8, '0').padEnd(16, '0')
530+
const expectedTimePrefix = traces[0][0].meta['_dd.p.tid'].toString(16).padStart(16, '0')
533531
const traceId = expectedTimePrefix + traces[0][0].trace_id.toString(16).padStart(16, '0')
534532
const spanId = traces[0][0].span_id.toString(16).padStart(16, '0')
535533

536534
expect(queryText).to.equal(
537535
`/*dddb='db',dddbs='post',dde='tester',ddh='127.0.0.1',ddps='test',ddpv='${ddpv}',` +
538536
`traceparent='00-${traceId}-${spanId}-00'*/ SELECT 1 + 1 AS solution`)
539537
}).then(done, done)
540-
const clock = sinon.useFakeTimers(new Date())
541538
const queryPool = pool.query('SELECT 1 + 1 AS solution', () => {
542-
clock.restore()
543539
queryText = queryPool.sql
544540
})
545541
})

‎packages/datadog-plugin-pg/test/index.spec.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -486,16 +486,14 @@ describe('Plugin', () => {
486486

487487
it('query text should contain traceparent', done => {
488488
agent.use(traces => {
489-
const expectedTimePrefix = Math.floor(clock.now / 1000).toString(16).padStart(8, '0').padEnd(16, '0')
489+
const expectedTimePrefix = traces[0][0].meta['_dd.p.tid'].toString(16).padStart(16, '0')
490490
const traceId = expectedTimePrefix + traces[0][0].trace_id.toString(16).padStart(16, '0')
491491
const spanId = traces[0][0].span_id.toString(16).padStart(16, '0')
492492
expect(seenTraceId).to.equal(traceId)
493493
expect(seenSpanId).to.equal(spanId)
494494
}).then(done, done)
495495

496-
const clock = sinon.useFakeTimers(new Date())
497496
client.query('SELECT $1::text as message', ['Hello World!'], (err, result) => {
498-
clock.restore()
499497
if (err) return done(err)
500498
expect(seenTraceParent).to.be.true
501499
client.end((err) => {
@@ -568,7 +566,7 @@ describe('Plugin', () => {
568566
}
569567

570568
agent.use(traces => {
571-
const expectedTimePrefix = Math.floor(clock.now / 1000).toString(16).padStart(8, '0').padEnd(16, '0')
569+
const expectedTimePrefix = traces[0][0].meta['_dd.p.tid'].toString(16).padStart(16, '0')
572570
const traceId = expectedTimePrefix + traces[0][0].trace_id.toString(16).padStart(16, '0')
573571
const spanId = traces[0][0].span_id.toString(16).padStart(16, '0')
574572

@@ -577,9 +575,7 @@ describe('Plugin', () => {
577575
`traceparent='00-${traceId}-${spanId}-00'*/ SELECT $1::text as message`)
578576
}).then(done, done)
579577

580-
const clock = sinon.useFakeTimers(new Date())
581578
client.query(query, ['Hello world!'], (err) => {
582-
clock.restore()
583579
if (err) return done(err)
584580

585581
client.end((err) => {

0 commit comments

Comments
 (0)