Merge branch 'master' into sabrenner/llmobs-annotation-context

sabrenner · web-flow · commit cb217b6a454a · 2025-10-21T09:16:13.000-04:00
diff --git a/.github/actions/node/action.yml b/.github/actions/node/action.yml
@@ -8,7 +8,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+    - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
       with:
         node-version: ${{ inputs.version == 'eol' && '16' || inputs.version == 'oldest' && '18' || inputs.version == 'maintenance' && '20' || inputs.version == 'active' && '22' || inputs.version == 'latest' && '24' || inputs.version }}
         check-latest: true
diff --git a/.github/workflows/apm-integrations.yml b/.github/workflows/apm-integrations.yml
@@ -233,7 +233,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - uses: ./.github/actions/testagent/start
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: ${{ matrix.node-version }}
       - uses: ./.github/actions/install
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,7 +38,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
+      uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
       with:
         languages: ${{ matrix.language }}
         config-file: .github/codeql_config.yml
@@ -48,7 +48,7 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
+      uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
+      uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
@@ -73,7 +73,7 @@ jobs:
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Check code meets quality and security standards
       id: datadog-static-analysis
-      uses: DataDog/datadog-static-analyzer-github-action@4b0a60943e8263c9d574254bbb206a87a0f75531 # v1.2.4
+      uses: DataDog/datadog-static-analyzer-github-action@2cc0e0621ea2863272b29d9aea230d9aad238086 # v2.0.0
       with:
         dd_api_key: ${{ secrets.DD_API_KEY }}
         dd_app_key: ${{ secrets.DD_APP_KEY }}
diff --git a/.github/workflows/release-latest.yml b/.github/workflows/release-latest.yml
@@ -48,7 +48,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
       - run: node scripts/release/status
 
   docs:
diff --git a/integration-tests/ci-visibility/mocha-retries-test-fn/mocha-async.js b/integration-tests/ci-visibility/mocha-retries-test-fn/mocha-async.js
@@ -0,0 +1,15 @@
+'use strict'
+
+const assert = require('assert')
+let attempt = 0
+
+describe('mocha-async-retries', function () {
+  this.retries(4)
+
+  it('will be retried and pass', async () => {
+    await new Promise(resolve => {
+      setTimeout(resolve, 0)
+    })
+    assert.equal(attempt++, 2)
+  })
+})
diff --git a/integration-tests/ci-visibility/mocha-retries-test-fn/mocha-done.js b/integration-tests/ci-visibility/mocha-retries-test-fn/mocha-done.js
@@ -0,0 +1,13 @@
+'use strict'
+
+const assert = require('assert')
+let attempt = 0
+
+describe('mocha-done-retries', function () {
+  this.retries(4)
+
+  it('will be retried and pass', (done) => {
+    assert.equal(attempt++, 2)
+    done()
+  })
+})
diff --git a/integration-tests/ci-visibility/mocha-retries-test-fn/mocha-promise.js b/integration-tests/ci-visibility/mocha-retries-test-fn/mocha-promise.js
@@ -0,0 +1,13 @@
+'use strict'
+
+const assert = require('assert')
+let attempt = 0
+
+describe('mocha-promise-retries', function () {
+  this.retries(4)
+
+  it('will be retried and pass', () => {
+    assert.equal(attempt++, 2)
+    return Promise.resolve()
+  })
+})
diff --git a/integration-tests/ci-visibility/mocha-retries-test-fn/mocha-sync.js b/integration-tests/ci-visibility/mocha-retries-test-fn/mocha-sync.js
@@ -0,0 +1,12 @@
+'use strict'
+
+const assert = require('assert')
+let attempt = 0
+
+describe('mocha-sync-retries', function () {
+  this.retries(4)
+
+  it('will be retried and pass', () => {
+    assert.equal(attempt++, 2)
+  })
+})
diff --git a/integration-tests/ci-visibility/test-nested-hooks/test-nested-hooks.js b/integration-tests/ci-visibility/test-nested-hooks/test-nested-hooks.js
@@ -17,10 +17,15 @@ describe('describe', function () {
     console.log('afterEach')
   })
 
-  it('is not nested', function () {
+  it('is not nested', function (done) {
     // eslint-disable-next-line no-console
     console.log('is not nested')
-    expect(process.env.SHOULD_FAIL ? globalAttempts++ : 1).to.equal(1)
+    try {
+      expect(process.env.SHOULD_FAIL ? globalAttempts++ : 1).to.equal(1)
+      done()
+    } catch (error) {
+      done(error)
+    }
   })
 
   context('context', () => {
diff --git a/integration-tests/esbuild/package.json b/integration-tests/esbuild/package.json
@@ -27,7 +27,7 @@
     "esbuild": "0.25.11",
     "express": "4.21.2",
     "knex": "3.1.0",
-    "koa": "3.0.1",
-    "openai": "6.4.0"
+    "koa": "3.0.3",
+    "openai": "6.5.0"
   }
 }
diff --git a/integration-tests/mocha/mocha.spec.js b/integration-tests/mocha/mocha.spec.js
@@ -4057,7 +4057,7 @@ describe(`mocha@${MOCHA_VERSION}`, function () {
   })
 
   context('retry and hooks', () => {
-    it('works when tests are not retried', (done) => {
+    it('works when tests are not retried', async () => {
       let stdout = ''
       const eventsPromise = receiver.gatherPayloadsMaxTimeout(({ url }) => url.endsWith('citestcycle'), (payloads) => {
         const events = payloads.flatMap(({ payload }) => payload.events)
@@ -4094,19 +4094,20 @@ describe(`mocha@${MOCHA_VERSION}`, function () {
         stdout += data
       })
 
-      childProcess.on('exit', () => {
-        eventsPromise.then(() => {
-          assert.include(stdout, 'beforeEach')
-          assert.include(stdout, 'beforeEach in context')
-          assert.include(stdout, 'test')
-          assert.include(stdout, 'afterEach')
-          assert.include(stdout, 'afterEach in context')
-          done()
-        }).catch(done)
-      })
+      await Promise.all([
+        once(childProcess, 'exit'),
+        once(childProcess.stdout, 'end'),
+        eventsPromise
+      ])
+
+      assert.include(stdout, 'beforeEach')
+      assert.include(stdout, 'beforeEach in context')
+      assert.include(stdout, 'test')
+      assert.include(stdout, 'afterEach')
+      assert.include(stdout, 'afterEach in context')
     })
 
-    onlyLatestIt('works when tests are retried', (done) => {
+    onlyLatestIt('works when tests are retried', async () => {
       let stdout = ''
       const eventsPromise = receiver.gatherPayloadsMaxTimeout(({ url }) => url.endsWith('citestcycle'), (payloads) => {
         const events = payloads.flatMap(({ payload }) => payload.events)
@@ -4128,6 +4129,16 @@ describe(`mocha@${MOCHA_VERSION}`, function () {
         const retriedTests = tests.filter(test => test.meta[TEST_IS_RETRY] === 'true')
         assert.equal(retriedTests.length, 1)
         assert.equal(retriedTests[0].meta[TEST_STATUS], 'pass')
+
+        const notNestedTests = tests.filter(test => test.resource ===
+          'ci-visibility/test-nested-hooks/test-nested-hooks.js.describe is not nested'
+        )
+
+        assert.equal(notNestedTests.length, 2)
+        const failedAttempts = notNestedTests.filter(test => test.meta[TEST_STATUS] === 'fail')
+        assert.equal(failedAttempts.length, 1)
+        const passedAttempts = notNestedTests.filter(test => test.meta[TEST_STATUS] === 'pass')
+        assert.equal(passedAttempts.length, 1)
       })
 
       childProcess = exec(
@@ -4149,16 +4160,17 @@ describe(`mocha@${MOCHA_VERSION}`, function () {
         stdout += data
       })
 
-      childProcess.on('exit', () => {
-        eventsPromise.then(() => {
-          assert.include(stdout, 'beforeEach')
-          assert.include(stdout, 'beforeEach in context')
-          assert.include(stdout, 'test')
-          assert.include(stdout, 'afterEach')
-          assert.include(stdout, 'afterEach in context')
-          done()
-        }).catch(done)
-      })
+      await Promise.all([
+        once(childProcess, 'exit'),
+        once(childProcess.stdout, 'end'),
+        eventsPromise
+      ])
+
+      assert.include(stdout, 'beforeEach')
+      assert.include(stdout, 'beforeEach in context')
+      assert.include(stdout, 'test')
+      assert.include(stdout, 'afterEach')
+      assert.include(stdout, 'afterEach in context')
     })
   })
 
@@ -4370,4 +4382,104 @@ describe(`mocha@${MOCHA_VERSION}`, function () {
       })
     })
   })
+
+  context('preserves test function on retries', () => {
+    const getTestAssertions = () =>
+      receiver.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)
+        if (MOCHA_VERSION === 'latest') {
+          assert.equal(tests.length, 3)
+          const failedTests = tests.filter(test => test.meta[TEST_STATUS] === 'fail')
+          assert.equal(failedTests.length, 2)
+          const passedTests = tests.filter(test => test.meta[TEST_STATUS] === 'pass')
+          assert.equal(passedTests.length, 1)
+          const [passedTest] = passedTests
+          assert.equal(passedTest.meta[TEST_IS_RETRY], 'true')
+        } else {
+          // there's no `retry` handled so it's just reported as a single passed test event
+          // because the test ends up passing after retries
+          assert.equal(tests.length, 1)
+          const passedTests = tests.filter(test => test.meta[TEST_STATUS] === 'pass')
+          assert.equal(passedTests.length, 1)
+        }
+      })
+
+    it('respects "done" callback', async () => {
+      childProcess = exec(
+        runTestsCommand,
+        {
+          cwd,
+          env: {
+            ...getCiVisAgentlessConfig(receiver.port),
+            TESTS_TO_RUN: JSON.stringify([
+              './mocha-retries-test-fn/mocha-done.js'
+            ])
+          }
+        }
+      )
+
+      await Promise.all([
+        once(childProcess, 'exit'),
+        getTestAssertions()
+      ])
+    })
+    it('respects async/await', async () => {
+      childProcess = exec(
+        runTestsCommand,
+        {
+          cwd,
+          env: {
+            ...getCiVisAgentlessConfig(receiver.port),
+            TESTS_TO_RUN: JSON.stringify([
+              './mocha-retries-test-fn/mocha-async.js'
+            ])
+          }
+        }
+      )
+
+      await Promise.all([
+        once(childProcess, 'exit'),
+        getTestAssertions()
+      ])
+    })
+    it('respects promises', async () => {
+      childProcess = exec(
+        runTestsCommand,
+        {
+          cwd,
+          env: {
+            ...getCiVisAgentlessConfig(receiver.port),
+            TESTS_TO_RUN: JSON.stringify([
+              './mocha-retries-test-fn/mocha-promise.js'
+            ])
+          }
+        }
+      )
+
+      await Promise.all([
+        once(childProcess, 'exit'),
+        getTestAssertions()
+      ])
+    })
+    it('respects sync functions', async () => {
+      childProcess = exec(
+        runTestsCommand,
+        {
+          cwd,
+          env: {
+            ...getCiVisAgentlessConfig(receiver.port),
+            TESTS_TO_RUN: JSON.stringify([
+              './mocha-retries-test-fn/mocha-sync.js'
+            ])
+          }
+        }
+      )
+
+      await Promise.all([
+        once(childProcess, 'exit'),
+        getTestAssertions()
+      ])
+    })
+  })
 })
diff --git a/package.json b/package.json
@@ -120,7 +120,7 @@
   ],
   "dependencies": {
     "@datadog/libdatadog": "0.7.0",
-    "@datadog/native-appsec": "10.2.1",
+    "@datadog/native-appsec": "10.3.0",
     "@datadog/native-iast-taint-tracking": "4.0.0",
     "@datadog/native-metrics": "3.1.1",
     "@datadog/openfeature-node-server": "0.1.0-preview.10",
@@ -158,7 +158,7 @@
   },
   "peerDependencies": {
     "@openfeature/core": "^1.9.0",
-    "@openfeature/server-sdk": "~1.18.0"
+    "@openfeature/server-sdk": "~1.19.0"
   },
   "peerDependenciesMeta": {
     "@openfeature/core": {
@@ -174,7 +174,7 @@
     "@eslint/js": "^9.29.0",
     "@msgpack/msgpack": "^3.1.2",
     "@openfeature/core": "^1.8.1",
-    "@openfeature/server-sdk": "~1.18.0",
+    "@openfeature/server-sdk": "~1.19.0",
     "@stylistic/eslint-plugin": "^5.0.0",
     "@types/chai": "^4.3.16",
     "@types/mocha": "^10.0.10",
diff --git a/packages/datadog-instrumentations/src/mocha/utils.js b/packages/datadog-instrumentations/src/mocha/utils.js
@@ -163,14 +163,13 @@ function runnableWrapper (RunnablePackage, libraryConfig) {
       const ctx = getTestContext(test)
 
       if (ctx) {
-        const originalFn = this.fn
         // we bind the test fn to the correct context
-        const newFn = function () {
+        const newFn = shimmer.wrapFunction(this.fn, originalFn => function () {
           return testFnCh.runStores(ctx, () => originalFn.apply(this, arguments))
-        }
+        })
 
         // we store the original function, not to lose it
-        originalFns.set(newFn, originalFn)
+        originalFns.set(newFn, this.fn)
         this.fn = newFn
 
         wrappedFunctions.add(this.fn)
diff --git a/yarn.lock b/yarn.lock
