v5.102.1 proposal

.github/workflows/apm-integrations.yml

@@ -334,8 +334,6 @@ jobs:
       matrix:
         node-version: [eol]
         range:
-          # - '^2.6.12' skipping due to bug with couchbase integration that is blocking CI.
-          # TODO: diagnose and fix failures. Link to bug issue: https://github.com/DataDog/dd-trace-js/issues/6400
           - "^3.0.7"
           - ">=4.0.0 <4.2.0"
         include:

.gitignore

@@ -32,6 +32,7 @@ Temporary Items
 # Logs
 logs
 *.log
+node-*-junit.xml
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

integration-tests/ci-visibility/automatic-log-submission-playwright/automatic-log-submission-test.js

@@ -10,7 +10,7 @@ test.beforeEach(async ({ page }) => {
 
 test.describe('playwright', () => {
   test('should be able to log to the console', async ({ page }) => {
-    test.step('log to the console', async () => {
+    await test.step('log to the console', async () => {
       logger.log('info', 'Hello simple log!')
     })
 

integration-tests/ci-visibility/jest-stack-on-import/jest-stack-on-import-test.js

@@ -0,0 +1,9 @@
+'use strict'
+
+const stack = require('./read-stack')
+
+describe('stack during module import', () => {
+  it('can read a default error stack while loading the test module', () => {
+    expect(stack).toContain('Error: stack from module import')
+  })
+})

integration-tests/ci-visibility/jest-stack-on-import/read-stack.js

@@ -0,0 +1,9 @@
+'use strict'
+
+const stack = new Error('stack from module import').stack
+
+if (!stack.includes('stack from module import')) {
+  throw new Error('Expected stack to include the original error message')
+}
+
+module.exports = stack

integration-tests/ci-visibility/playwright-efd-duration/efd-duration-test.js

@@ -0,0 +1,14 @@
+'use strict'
+
+const { test, expect } = require('@playwright/test')
+
+test.describe('efd duration retries', () => {
+  test('instant test', async () => {
+    expect(1 + 1).toBe(2)
+  })
+
+  test('slightly slow test', async () => {
+    await new Promise(resolve => setTimeout(resolve, 11_000))
+    expect(1 + 1).toBe(2)
+  })
+})

integration-tests/ci-visibility/playwright-efd-projects/project-duration-test.js

@@ -0,0 +1,12 @@
+'use strict'
+
+const { test, expect } = require('@playwright/test')
+
+test.describe('efd project duration', () => {
+  test('project scoped test', async ({ browserName }, testInfo) => {
+    if (browserName && testInfo.project.name === 'second-chromium') {
+      await new Promise(resolve => setTimeout(resolve, 6_000))
+    }
+    expect(1 + 1).toBe(2)
+  })
+})

integration-tests/ci-visibility/playwright-efd-repeat-duration/repeat-duration-test.js

@@ -0,0 +1,13 @@
+'use strict'
+
+const { test, expect } = require('@playwright/test')
+
+test.describe('efd repeat duration', () => {
+  test('repeat-scoped test', async () => {
+    if (test.info().repeatEachIndex === 0) {
+      await new Promise(resolve => setTimeout(resolve, 6_000))
+    }
+
+    expect(1 + 1).toBe(2)
+  })
+})

integration-tests/ci-visibility/playwright-efd-repeat/repeat-each-test.js

@@ -0,0 +1,9 @@
+'use strict'
+
+const { test, expect } = require('@playwright/test')
+
+test.describe('efd repeat each', () => {
+  test('native repeat test', async () => {
+    expect(1 + 1).toBe(2)
+  })
+})

integration-tests/ci-visibility/test-optimization-wrong-init.spec.js

@@ -19,7 +19,10 @@ const testFrameworks = [
   {
     testFramework: 'jest',
     command: 'node ./ci-visibility/test-optimization-wrong-init/run-jest.js',
-    expectedOutput: 'PASS ci-visibility/test-optimization-wrong-init/sum-wrong-init-test.js',
+    expectedOutput: [
+      'PASS ci-visibility/test-optimization-wrong-init/sum-wrong-init-test.js',
+      'Test Suites:\\s+1 passed, 1 total',
+    ].join('|'),
   },
   {
     testFramework: 'vitest',

integration-tests/cucumber/cucumber.spec.js

@@ -81,6 +81,13 @@ const { DD_HOST_CPU_COUNT } = require('../../packages/dd-trace/src/plugins/util/
 const { NODE_MAJOR } = require('../../version')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../packages/dd-trace/src/constants')
 
+function assertItrSkippingEnabledTags (events, expected) {
+  const testSuite = events.find(event => event.type === 'test_suite_end').content
+  assert.strictEqual(testSuite.meta[TEST_ITR_SKIPPING_ENABLED], expected)
+  const test = events.find(event => event.type === 'test').content
+  assert.strictEqual(test.meta[TEST_ITR_SKIPPING_ENABLED], expected)
+}
+
 const version = process.env.CUCUMBER_VERSION || 'latest'
 
 const onlyLatestIt = version === 'latest' ? it : it.skip
@@ -646,6 +653,7 @@ describe(`cucumber@${version} commonJS`, () => {
             assert.strictEqual(testModule.meta[TEST_ITR_TESTS_SKIPPED], 'false')
             assert.strictEqual(testModule.meta[TEST_CODE_COVERAGE_ENABLED], 'false')
             assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_ENABLED], 'false')
+            assertItrSkippingEnabledTags(payload.events, 'false')
           }, ({ url }) => url.endsWith('/api/v2/citestcycle')).then(() => done()).catch(done)
 
           childProcess = exec(
@@ -720,6 +728,7 @@ describe(`cucumber@${version} commonJS`, () => {
               assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_ENABLED], 'true')
               assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_TYPE], 'suite')
               assert.strictEqual(testModule.metrics[TEST_ITR_SKIPPING_COUNT], 1)
+              assertItrSkippingEnabledTags(eventsRequest.payload.events, 'true')
               done()
             }).catch(done)
 
@@ -763,6 +772,7 @@ describe(`cucumber@${version} commonJS`, () => {
             assert.strictEqual(testModule.meta[TEST_ITR_TESTS_SKIPPED], 'false')
             assert.strictEqual(testModule.meta[TEST_CODE_COVERAGE_ENABLED], 'true')
             assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_ENABLED], 'true')
+            assertItrSkippingEnabledTags(payload.events, 'true')
           }, ({ url }) => url.endsWith('/api/v2/citestcycle')).then(() => done()).catch(done)
 
           childProcess = exec(
@@ -962,6 +972,7 @@ describe(`cucumber@${version} commonJS`, () => {
               assert.strictEqual(testModule.meta[TEST_CODE_COVERAGE_ENABLED], 'true')
               assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_ENABLED], 'true')
               assert.strictEqual(testModule.metrics[TEST_ITR_SKIPPING_COUNT], 0)
+              assertItrSkippingEnabledTags(events, 'true')
             }, 25000)
 
           childProcess = exec(
@@ -1130,6 +1141,7 @@ describe(`cucumber@${version} commonJS`, () => {
               tests.forEach(test => {
                 assert.ok(!test.meta[TEST_SUITE].includes('farewell'))
               })
+              assertItrSkippingEnabledTags(events, 'true')
             })
 
           childProcess = exec(

integration-tests/cypress/cypress-itr.spec.js

@@ -33,6 +33,13 @@ const oldestVersion = DD_MAJOR >= 6 ? '12.0.0' : '6.7.0'
 const version = requestedVersion === 'oldest' ? oldestVersion : requestedVersion
 const hookFile = 'dd-trace/loader-hook.mjs'
 
+function assertItrSkippingEnabledTags (events, expected) {
+  const testSuite = events.find(event => event.type === 'test_suite_end').content
+  assert.strictEqual(testSuite.meta[TEST_ITR_SKIPPING_ENABLED], expected)
+  const test = events.find(event => event.type === 'test').content
+  assert.strictEqual(test.meta[TEST_ITR_SKIPPING_ENABLED], expected)
+}
+
 function shouldTestsRun (type) {
   if (DD_MAJOR === 5) {
     if (NODE_MAJOR <= 16) {
@@ -270,6 +277,7 @@ moduleTypes.forEach(({
             assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_ENABLED], 'true')
             assert.strictEqual(testModule.metrics[TEST_ITR_SKIPPING_COUNT], 1)
             assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_TYPE], 'test')
+            assertItrSkippingEnabledTags(events, 'true')
           }, 25000)
 
         const coverageRequestPromise = receiver
@@ -528,6 +536,7 @@ moduleTypes.forEach(({
             assert.strictEqual(testModule.meta[TEST_CODE_COVERAGE_ENABLED], 'true')
             assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_ENABLED], 'true')
             assert.strictEqual(testModule.metrics[TEST_ITR_SKIPPING_COUNT], 0)
+            assertItrSkippingEnabledTags(events, 'true')
           }, 30000)
 
         const skippableRequestPromise = receiver

integration-tests/esbuild/package.json

@@ -20,13 +20,13 @@
   "author": "Thomas Hunter II <tlhunter@datadog.com>",
   "license": "ISC",
   "dependencies": {
-    "@apollo/server": "5.5.0",
+    "@apollo/server": "5.5.1",
     "@koa/router": "15.5.0",
     "aws-sdk": "2.1693.0",
     "axios": "1.16.0",
     "express": "4.22.1",
     "knex": "3.2.10",
     "koa": "3.2.0",
-    "openai": "6.35.0"
+    "openai": "6.37.0"
   }
 }

integration-tests/jest/jest.core.spec.js

@@ -1108,6 +1108,42 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
     })
   })
 
+  it('keeps default stack formatting when imported modules read error stacks', async () => {
+    const eventsPromise = receiver
+      .gatherPayloadsMaxTimeout(({ url }) => url.endsWith('/api/v2/citestcycle'), (payloads) => {
+        const events = payloads.flatMap(({ payload }) => payload.events)
+        const suites = events.filter(event => event.type === 'test_suite_end')
+        const stackImportSuites = suites.filter(
+          suite => suite.content.meta[TEST_SUITE] ===
+            'ci-visibility/jest-stack-on-import/jest-stack-on-import-test.js'
+        )
+
+        assert.strictEqual(stackImportSuites.length, 1)
+        assert.strictEqual(stackImportSuites[0].content.meta[TEST_STATUS], 'pass')
+      })
+
+    childProcess = exec(runTestsCommand, {
+      cwd,
+      env: {
+        ...getCiVisAgentlessConfig(receiver.port),
+        TESTS_TO_RUN: 'jest-stack-on-import/jest-stack-on-import-test',
+        SHOULD_CHECK_RESULTS: 'true',
+      },
+    })
+    childProcess.stdout?.on('data', (chunk) => {
+      testOutput += chunk.toString()
+    })
+    childProcess.stderr?.on('data', (chunk) => {
+      testOutput += chunk.toString()
+    })
+
+    const [exitCode] = await once(childProcess, 'exit')
+
+    assert.strictEqual(exitCode, 0, testOutput)
+    assert.doesNotMatch(testOutput, /originalPrepareStackTrace is not a function/)
+    await eventsPromise
+  })
+
   it('reports parsing errors in the test file', (done) => {
     const eventsPromise = receiver
       .gatherPayloadsMaxTimeout(({ url }) => url.endsWith('/api/v2/citestcycle'), (payloads) => {

integration-tests/jest/jest.itr-efd.spec.js

@@ -61,6 +61,13 @@ const JEST_VERSION = requestedJestVersion === 'oldest' ? oldestJestVersion : req
 const onlyLatestIt = JEST_VERSION === 'latest' ? it : it.skip
 const shouldInstallJestEnvironmentJsdom = JEST_VERSION === 'latest' || Number(JEST_VERSION.split('.')[0]) >= 28
 
+function assertItrSkippingEnabledTags (events, expected) {
+  const testSuite = events.find(event => event.type === 'test_suite_end').content
+  assert.strictEqual(testSuite.meta[TEST_ITR_SKIPPING_ENABLED], expected)
+  const test = events.find(event => event.type === 'test').content
+  assert.strictEqual(test.meta[TEST_ITR_SKIPPING_ENABLED], expected)
+}
+
 // TODO: add ESM tests
 describe(`jest@${JEST_VERSION} commonJS`, () => {
   let receiver
@@ -233,6 +240,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
         assert.strictEqual(testModule.meta[TEST_ITR_TESTS_SKIPPED], 'false')
         assert.strictEqual(testModule.meta[TEST_CODE_COVERAGE_ENABLED], 'false')
         assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_ENABLED], 'false')
+        assertItrSkippingEnabledTags(payload.events, 'false')
       }, ({ url }) => url === '/api/v2/citestcycle').then(() => done()).catch(done)
 
       childProcess = exec(
@@ -298,6 +306,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
         assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_ENABLED], 'true')
         assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_TYPE], 'suite')
         assert.strictEqual(testModule.metrics[TEST_ITR_SKIPPING_COUNT], 1)
+        assertItrSkippingEnabledTags(eventsRequest.payload.events, 'true')
         done()
       }).catch(done)
 
@@ -380,6 +389,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
         assert.strictEqual(testModule.meta[TEST_ITR_TESTS_SKIPPED], 'false')
         assert.strictEqual(testModule.meta[TEST_CODE_COVERAGE_ENABLED], 'true')
         assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_ENABLED], 'true')
+        assertItrSkippingEnabledTags(payload.events, 'true')
       }, ({ url }) => url === '/api/v2/citestcycle').then(() => done()).catch(done)
 
       childProcess = exec(
@@ -584,6 +594,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
           assert.strictEqual(testModule.meta[TEST_ITR_TESTS_SKIPPED], 'false')
           assert.strictEqual(testModule.meta[TEST_CODE_COVERAGE_ENABLED], 'true')
           assert.strictEqual(testModule.meta[TEST_ITR_SKIPPING_ENABLED], 'true')
+          assertItrSkippingEnabledTags(events, 'true')
         }, 25000)
 
       childProcess = exec(

integration-tests/jest/jest.test-management.spec.js

@@ -1383,12 +1383,17 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
           .gatherPayloadsMaxTimeout(({ url }) => url.endsWith('/api/v2/citestcycle'), (payloads) => {
             const events = payloads.flatMap(({ payload }) => payload.events)
             const tests = events.filter(event => event.type === 'test').map(event => event.content)
+            const suites = events.filter(event => event.type === 'test_suite_end').map(event => event.content)
             const testSession = events.find(event => event.type === 'test_session_end').content
 
             if (isQuarantining) {
               assert.strictEqual(testSession.meta[TEST_MANAGEMENT_ENABLED], 'true')
               // test session is passed even though a test fails because the test is quarantined
               assert.strictEqual(testSession.meta[TEST_STATUS], 'pass')
+              const quarantinedSuite = suites.find(
+                suite => suite.meta[TEST_SUITE] === 'ci-visibility/test-management/test-quarantine-1.js'
+              )
+              assert.strictEqual(quarantinedSuite.meta[TEST_STATUS], 'pass')
             } else {
               assert.ok(!(TEST_MANAGEMENT_ENABLED in testSession.meta))
               assert.strictEqual(testSession.meta[TEST_STATUS], 'fail')