Skip to content

Fix MongoDB flaky DBM test #7131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bojbrook wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix MongoDB flaky DBM test #7131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/datadog-plugin-mongodb-core/test/core.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,10 +662,10 @@ describe('Plugin', () => {

it('DBM propagation should inject full mode with traceparent as comment', done => {
agent
.assertSomeTraces(traces => {
const span = traces[0][0]
.assertFirstTraceSpan(span => {
const traceId = span.meta['_dd.p.tid'] + span.trace_id.toString(16).padStart(16, '0')
const spanId = span.span_id.toString(16).padStart(16, '0')
const samplingPriotrity = span.metrics._sampling_priority_v1 > 0 ? '01' : '00'

assert.strictEqual(startSpy.called, true)
const { comment } = startSpy.getCall(0).args[0].ops
Expand All @@ -677,7 +677,7 @@ describe('Plugin', () => {
`ddps='${encodeURIComponent(span.meta.service)}',` +
`ddpv='${ddpv}',` +
`ddprs='${encodeURIComponent(span.meta['peer.service'])}',` +
`traceparent='00-${traceId}-${spanId}-01'`
`traceparent='00-${traceId}-${spanId}-${samplingPriotrity}'`
)
})
.then(done)
Expand Down
17 changes: 10 additions & 7 deletions packages/datadog-plugin-mongodb-core/test/mongodb.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ describe('Plugin', () => {
let db
let BSON
let startSpy
let injectCommentSpy
let usesDelete

describe('mongodb-core', () => {
Expand Down Expand Up @@ -564,9 +565,7 @@ describe('Plugin', () => {

describe('with dbmPropagationMode full', () => {
before(() => {
return agent.load('mongodb-core', {
dbmPropagationMode: 'full'
})
return agent.load('mongodb-core', { dbmPropagationMode: 'full' })
})

after(() => {
Expand All @@ -579,21 +578,25 @@ describe('Plugin', () => {
collection = db.collection(collectionName)

startSpy = sinon.spy(MongodbCorePlugin.prototype, 'start')
injectCommentSpy = sinon.spy(MongodbCorePlugin.prototype, 'injectDbmComment')
})

afterEach(() => {
startSpy?.restore()
injectCommentSpy?.restore()
})

it('DBM propagation should inject full mode with traceparent as comment', done => {
agent
.assertSomeTraces(traces => {
const span = traces[0][0]
.assertFirstTraceSpan(span => {
const traceId = span.meta['_dd.p.tid'] + span.trace_id.toString(16).padStart(16, '0')
const spanId = span.span_id.toString(16).padStart(16, '0')
const samplingPriotrity = span.metrics._sampling_priority_v1 > 0 ? '01' : '00'

assert.strictEqual(startSpy.called, true)
const { comment } = startSpy.getCall(0).args[0].ops
assert.strictEqual(injectCommentSpy.called, true)

const comment = injectCommentSpy.getCall(0).returnValue
assert.strictEqual(comment,
`dddb='${encodeURIComponent(span.meta['db.name'])}',` +
'dddbs=\'test-mongodb\',' +
Expand All @@ -602,7 +605,7 @@ describe('Plugin', () => {
`ddps='${encodeURIComponent(span.meta.service)}',` +
`ddpv='${ddpv}',` +
`ddprs='${encodeURIComponent(span.meta['peer.service'])}',` +
`traceparent='00-${traceId}-${spanId}-01'`
`traceparent='00-${traceId}-${spanId}-${samplingPriotrity}'`
)
})
.then(done)
Expand Down
Loading