@@ -35,9 +35,10 @@ const {
3535 TEST_SESSION_NAME ,
3636 TEST_LEVEL_EVENT_TYPES ,
3737 DI_ERROR_DEBUG_INFO_CAPTURED ,
38- DI_DEBUG_ERROR_FILE ,
39- DI_DEBUG_ERROR_SNAPSHOT_ID ,
40- DI_DEBUG_ERROR_LINE
38+ DI_DEBUG_ERROR_PREFIX ,
39+ DI_DEBUG_ERROR_FILE_SUFFIX ,
40+ DI_DEBUG_ERROR_SNAPSHOT_ID_SUFFIX ,
41+ DI_DEBUG_ERROR_LINE_SUFFIX
4142} = require ( '../../packages/dd-trace/src/plugins/util/test' )
4243const { DD_HOST_CPU_COUNT } = require ( '../../packages/dd-trace/src/plugins/util/env' )
4344const { ERROR_MESSAGE } = require ( '../../packages/dd-trace/src/constants' )
@@ -2426,11 +2427,12 @@ describe('jest CommonJS', () => {
24262427 assert . equal ( retriedTests . length , 1 )
24272428 const [ retriedTest ] = retriedTests
24282429
2429- assert . notProperty ( retriedTest . meta , DI_ERROR_DEBUG_INFO_CAPTURED )
2430- assert . notProperty ( retriedTest . meta , DI_DEBUG_ERROR_FILE )
2431- assert . notProperty ( retriedTest . metrics , DI_DEBUG_ERROR_LINE )
2432- assert . notProperty ( retriedTest . meta , DI_DEBUG_ERROR_SNAPSHOT_ID )
2430+ const hasDebugTags = Object . keys ( retriedTest . meta )
2431+ . some ( property => property . startsWith ( DI_DEBUG_ERROR_PREFIX ) || property === DI_ERROR_DEBUG_INFO_CAPTURED )
2432+
2433+ assert . isFalse ( hasDebugTags )
24332434 } )
2435+
24342436 const logsPromise = receiver
24352437 . gatherPayloadsMaxTimeout ( ( { url } ) => url . endsWith ( '/api/v2/logs' ) , ( payloads ) => {
24362438 if ( payloads . length > 0 ) {
@@ -2472,10 +2474,10 @@ describe('jest CommonJS', () => {
24722474 assert . equal ( retriedTests . length , 1 )
24732475 const [ retriedTest ] = retriedTests
24742476
2475- assert . notProperty ( retriedTest . meta , DI_ERROR_DEBUG_INFO_CAPTURED )
2476- assert . notProperty ( retriedTest . meta , DI_DEBUG_ERROR_FILE )
2477- assert . notProperty ( retriedTest . metrics , DI_DEBUG_ERROR_LINE )
2478- assert . notProperty ( retriedTest . meta , DI_DEBUG_ERROR_SNAPSHOT_ID )
2477+ const hasDebugTags = Object . keys ( retriedTest . meta )
2478+ . some ( property => property . startsWith ( DI_DEBUG_ERROR_PREFIX ) || property === DI_ERROR_DEBUG_INFO_CAPTURED )
2479+
2480+ assert . isFalse ( hasDebugTags )
24792481 } )
24802482 const logsPromise = receiver
24812483 . gatherPayloadsMaxTimeout ( ( { url } ) => url . endsWith ( '/api/v2/logs' ) , ( payloads ) => {
@@ -2522,15 +2524,17 @@ describe('jest CommonJS', () => {
25222524 const [ retriedTest ] = retriedTests
25232525
25242526 assert . propertyVal ( retriedTest . meta , DI_ERROR_DEBUG_INFO_CAPTURED , 'true' )
2525- assert . propertyVal (
2526- retriedTest . meta ,
2527- DI_DEBUG_ERROR_FILE ,
2528- 'ci-visibility/dynamic-instrumentation/dependency.js'
2527+
2528+ assert . isTrue (
2529+ retriedTest . meta [ ` ${ DI_DEBUG_ERROR_PREFIX } .0. ${ DI_DEBUG_ERROR_FILE_SUFFIX } ` ]
2530+ . endsWith ( 'ci-visibility/dynamic-instrumentation/dependency.js' )
25292531 )
2530- assert . equal ( retriedTest . metrics [ DI_DEBUG_ERROR_LINE ] , 4 )
2531- assert . exists ( retriedTest . meta [ DI_DEBUG_ERROR_SNAPSHOT_ID ] )
2532+ assert . equal ( retriedTest . metrics [ `${ DI_DEBUG_ERROR_PREFIX } .0.${ DI_DEBUG_ERROR_LINE_SUFFIX } ` ] , 4 )
25322533
2533- snapshotIdByTest = retriedTest . meta [ DI_DEBUG_ERROR_SNAPSHOT_ID ]
2534+ const snapshotIdKey = `${ DI_DEBUG_ERROR_PREFIX } .0.${ DI_DEBUG_ERROR_SNAPSHOT_ID_SUFFIX } `
2535+ assert . exists ( retriedTest . meta [ snapshotIdKey ] )
2536+
2537+ snapshotIdByTest = retriedTest . meta [ snapshotIdKey ]
25342538 spanIdByTest = retriedTest . span_id . toString ( )
25352539 traceIdByTest = retriedTest . trace_id . toString ( )
25362540
@@ -2603,14 +2607,10 @@ describe('jest CommonJS', () => {
26032607 assert . equal ( retriedTests . length , 1 )
26042608 const [ retriedTest ] = retriedTests
26052609
2606- assert . propertyVal ( retriedTest . meta , DI_ERROR_DEBUG_INFO_CAPTURED , 'true' )
2607- assert . propertyVal (
2608- retriedTest . meta ,
2609- DI_DEBUG_ERROR_FILE ,
2610- 'ci-visibility/dynamic-instrumentation/dependency.js'
2611- )
2612- assert . equal ( retriedTest . metrics [ DI_DEBUG_ERROR_LINE ] , 4 )
2613- assert . exists ( retriedTest . meta [ DI_DEBUG_ERROR_SNAPSHOT_ID ] )
2610+ const hasDebugTags = Object . keys ( retriedTest . meta )
2611+ . some ( property => property . startsWith ( DI_DEBUG_ERROR_PREFIX ) || property === DI_ERROR_DEBUG_INFO_CAPTURED )
2612+
2613+ assert . isFalse ( hasDebugTags )
26142614 } )
26152615 const logsPromise = receiver
26162616 . gatherPayloadsMaxTimeout ( ( { url } ) => url . endsWith ( '/api/v2/logs' ) , ( payloads ) => {
0 commit comments