v4.47.0

.github/actions/node/latest/action.yml

@@ -4,4 +4,4 @@ runs:
   steps:
     - uses: actions/setup-node@v3
       with:
-        node-version: '22.6'
+        node-version: 'latest'

.github/workflows/appsec.yml

@@ -214,7 +214,8 @@ jobs:
       matrix:
         version:
           - 18
-          - 22.6
+          - latest
+        range: ['9.5.0', '11.1.4', '13.2.0', '14.2.6']
     runs-on: ubuntu-latest
     env:
       PLUGINS: next

.github/workflows/debugger.yml

@@ -0,0 +1,33 @@
+name: Debugger
+
+on:
+  pull_request:
+  push:
+    branches: [master]
+  schedule:
+    - cron: '0 4 * * *'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/testagent/start
+      - uses: ./.github/actions/node/setup
+      - uses: ./.github/actions/install
+      - uses: ./.github/actions/node/18
+      - run: yarn test:debugger:ci
+      - run: yarn test:integration:debugger
+      - uses: ./.github/actions/node/20
+      - run: yarn test:debugger:ci
+      - run: yarn test:integration:debugger
+      - uses: ./.github/actions/node/latest
+      - run: yarn test:debugger:ci
+      - run: yarn test:integration:debugger
+      - if: always()
+        uses: ./.github/actions/testagent/logs
+      - uses: codecov/codecov-action@v3

.github/workflows/package-size.yml

@@ -12,6 +12,8 @@ concurrency:
 jobs:
   package-size-report:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node.js

.github/workflows/plugins.yml

@@ -87,7 +87,7 @@ jobs:
         uses: ./.github/actions/testagent/logs
       - uses: codecov/codecov-action@v3
 
-  amqp10: # TODO: move rhea to its own job
+  amqp10:
     runs-on: ubuntu-latest
     services:
       qpid:
@@ -98,7 +98,7 @@ jobs:
         ports:
           - 5673:5672
     env:
-      PLUGINS: amqp10|rhea
+      PLUGINS: amqp10
       SERVICES: qpid
       DD_DATA_STREAMS_ENABLED: true
     steps:
@@ -130,7 +130,7 @@ jobs:
   aws-sdk:
     strategy:
       matrix:
-        node-version: ['18', '22.6']
+        node-version: ['18', 'latest']
     runs-on: ubuntu-latest
     services:
       localstack:
@@ -236,7 +236,11 @@ jobs:
   couchbase:
     strategy:
       matrix:
-        range: ['^2.6.12', '^3.0.7', '>=4.2.0']
+        node-version: [16]
+        range: ['^2.6.12', '^3.0.7', '>=4.0.0 <4.2.0']
+        include:
+          - node-version: 18
+            range: '>=4.2.0'
     runs-on: ubuntu-latest
     services:
       couchbase:
@@ -253,8 +257,11 @@ jobs:
       - uses: ./.github/actions/testagent/start
       - uses: ./.github/actions/node/setup
       - uses: ./.github/actions/install
-      - uses: ./.github/actions/node/oldest
-      - run: yarn test:plugins:ci
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: yarn config set ignore-engines true
+      - run: yarn test:plugins:ci --ignore-engines
       - uses: codecov/codecov-action@v3
 
   connect:
@@ -405,7 +412,7 @@ jobs:
   http:
     strategy:
       matrix:
-        node-version: ['18', '20', '22.6']
+        node-version: ['18', '20', 'latest']
     runs-on: ubuntu-latest
     env:
       PLUGINS: http
@@ -645,7 +652,8 @@ jobs:
       matrix:
         version:
           - 18
-          - 22.6
+          - latest
+        range: ['9.5.0', '11.1.4', '13.2.0', '14.2.6']
     runs-on: ubuntu-latest
     env:
       PLUGINS: next
@@ -820,6 +828,24 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/plugins/test
 
+  rhea:
+    runs-on: ubuntu-latest
+    services:
+      qpid:
+        image: scholzj/qpid-cpp:1.38.0
+        env:
+          QPIDD_ADMIN_USERNAME: admin
+          QPIDD_ADMIN_PASSWORD: admin
+        ports:
+          - 5673:5672
+    env:
+      PLUGINS: rhea
+      SERVICES: qpid
+      DD_DATA_STREAMS_ENABLED: true
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/plugins/test-and-upstream
+
   router:
     runs-on: ubuntu-latest
     env:
@@ -847,7 +873,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mssql:
-        image: mcr.microsoft.com/mssql/server:2017-latest-ubuntu
+        image: mcr.microsoft.com/mssql/server:2019-latest
         env:
           ACCEPT_EULA: 'Y'
           SA_PASSWORD: DD_HUNTER2

.github/workflows/project.yml

@@ -18,7 +18,7 @@ jobs:
       # setting fail-fast to false in an attempt to prevent this from happening
       fail-fast: false
       matrix:
-        version: [18, 20, 22.6]
+        version: [18, 20, latest]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -47,7 +47,7 @@ jobs:
   integration-ci:
     strategy:
       matrix:
-        version: [18, 22.6]
+        version: [18, latest]
         framework: [cucumber, playwright, selenium, jest, mocha]
     runs-on: ubuntu-latest
     env:
@@ -89,7 +89,7 @@ jobs:
         # Important: This is outside the minimum supported version of dd-trace-js
         # Node > 16 does not work with [email protected] (not even without our plugin)
         # TODO: figure out what to do with this: we might have to deprecate support for [email protected]
-        version: [16, 22.6]
+        version: [16, latest]
         # 6.7.0 is the minimum version we support
         cypress-version: [6.7.0, latest]
         module-type: ['commonJS', 'esm']

.github/workflows/system-tests.yml

@@ -27,35 +27,30 @@ jobs:
           path: ./binaries/**/*
 
   get-essential-scenarios:
-    runs-on: ubuntu-latest
-    outputs:
-      scenario: ${{ steps.parse-yml.outputs.scenario }}
-    steps:
-      - name: Checkout system tests
-        uses: actions/checkout@v4
-        with:
-          repository: 'DataDog/system-tests'
-      - name: Get Essential Scenarios
-        id: parse-yml
-        run: yq -o tsv .TRACER_ESSENTIAL_SCENARIOS ./scenario_groups.yml | xargs node -p "x=process.argv;x.shift();x.push('CROSSED_TRACING_LIBRARIES');'scenario='+JSON.stringify(x)" >> $GITHUB_OUTPUT
-
+    name: Get parameters
+    uses: DataDog/system-tests/.github/workflows/compute-workflow-parameters.yml@main
+    with:
+      library: nodejs
+      scenarios: CROSSED_TRACING_LIBRARIES
+      scenarios_groups: essentials
 
   system-tests:
     runs-on: ${{ contains(fromJSON('["CROSSED_TRACING_LIBRARIES", "INTEGRATIONS"]'), matrix.scenario) && 'ubuntu-latest-16-cores' || 'ubuntu-latest' }}
     needs:
       - get-essential-scenarios
     strategy:
       matrix:
-        weblog-variant:
-          - express4
-          - express4-typescript
-          - nextjs
-        scenario: ${{fromJson(needs.get-essential-scenarios.outputs.scenario)}}
+        weblog-variant: ${{fromJson(needs.get-essential-scenarios.outputs.endtoend_weblogs)}}
+        scenario: ${{fromJson(needs.get-essential-scenarios.outputs.endtoend_scenarios)}}
 
     env:
       TEST_LIBRARY: nodejs
       WEBLOG_VARIANT: ${{ matrix.weblog-variant }}
       DD_API_KEY: ${{ secrets.DD_API_KEY }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.IDM_AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.IDM_AWS_SECRET_ACCESS_KEY }}
+      AWS_REGION: us-east-1
+      AWS_DEFAULT_REGION: us-east-1  # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION`
 
     steps:
       - name: Checkout system tests
@@ -86,7 +81,7 @@ jobs:
         if: ${{ always() }}
         run: tar -czvf artifact.tar.gz $(ls | grep logs)
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: logs_${{ matrix.weblog-variant }}-${{ matrix.scenario }}

.vscode/launch.json

@@ -8,15 +8,11 @@
       "type": "node",
       "request": "launch",
       "name": "Test Current File",
-      "runtimeExecutable": "yarn",
-      "runtimeArgs": [
-        "tdd",
-        "${file}",
-        "--inspect-brk=9229"
+      "skipFiles": [
+        "<node_internals>/**"
       ],
-      "port": 9229,
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen"
-    },
+      "program": "${file}",
+      "console": "integratedTerminal"
+    }
   ]
 }

LICENSE-3rdparty.csv

@@ -14,6 +14,7 @@ require,import-in-the-middle,Apache license 2.0,Copyright 2021 Datadog Inc.
 require,int64-buffer,MIT,Copyright 2015-2016 Yusuke Kawasaki
 require,istanbul-lib-coverage,BSD-3-Clause,Copyright 2012-2015 Yahoo! Inc.
 require,jest-docblock,MIT,Copyright Meta Platforms, Inc. and affiliates.
+require,jsonpath-plus,MIT,Copyright (c) 2011-2019 Stefan Goessner, Subbu Allamaraju, Mike Brevoort, Robert Krahn, Brett Zamir, Richard Schneider
 require,koalas,MIT,Copyright 2013-2017 Brian Woodward
 require,limiter,MIT,Copyright 2011 John Hurliman
 require,lodash.sortby,MIT,Copyright JS Foundation and other contributors
@@ -26,6 +27,7 @@ require,pprof-format,MIT,Copyright 2022 Stephen Belanger
 require,protobufjs,BSD-3-Clause,Copyright 2016 Daniel Wirtz
 require,tlhunter-sorted-set,MIT,Copyright (c) 2023 Datadog Inc.
 require,retry,MIT,Copyright 2011 Tim Koschützki Felix Geisendörfer
+require,rfdc,MIT,Copyright 2019 David Mark Clements
 require,semver,ISC,Copyright Isaac Z. Schlueter and Contributors
 require,shell-quote,mit,Copyright (c) 2013 James Halliday
 dev,@types/node,MIT,Copyright Authors

docs/test.ts

@@ -320,9 +320,6 @@ tracer.use('http', {
 tracer.use('http', {
   client: httpClientOptions
 });
-tracer.use('http', {
-  enablePropagationWithAmazonHeaders: true
-});
 tracer.use('http2');
 tracer.use('http2', {
   server: http2ServerOptions

index.d.ts

@@ -729,6 +729,26 @@ declare namespace tracer {
      * The selection and priority order of context propagation injection and extraction mechanisms.
      */
     propagationStyle?: string[] | PropagationStyle
+
+    /**
+     * Cloud payload report as tags
+     */
+    cloudPayloadTagging?: {
+      /**
+       *  Additional JSONPath queries to replace with `redacted` in request payloads
+       *  Undefined or invalid JSONPath queries disable the feature for requests.
+       */
+      request?: string,
+      /**
+       *  Additional JSONPath queries to replace with `redacted` in response payloads
+       *  Undefined or invalid JSONPath queries disable the feature for responses.
+       */
+      response?: string,
+      /**
+       *  Maximum depth of payload traversal for tags
+       */
+      maxDepth?: number
+    }
   }
 
   /**
@@ -1010,14 +1030,6 @@ declare namespace tracer {
        * @default code => code < 500
        */
       validateStatus?: (code: number) => boolean;
-
-      /**
-       * Enable injection of tracing headers into requests signed with AWS IAM headers.
-       * Disable this if you get AWS signature errors (HTTP 403).
-       *
-       * @default false
-       */
-      enablePropagationWithAmazonHeaders?: boolean;
     }
 
     /** @hidden */

integration-tests/ci-visibility/features-flaky/support/steps.js

@@ -8,5 +8,11 @@ Then('I should have heard {string}', function (expectedResponse) {
 })
 
 When('the greeter says flaky', function () {
-  this.whatIHeard = globalCounter++ % 2 === 0 ? 'flaky' : 'not flaky'
+  // It's important that the first time this fails. The reason is the following:
+  // In `getWrappedRunTestCase` we were returning the first result from
+  // `runTestCaseFunction`, so if the first time it passed, the EFD logic was
+  // not kicking in. By making it fail, `runTestCaseResult` is false (fail),
+  // and the EFD logic is tested correctly, i.e. the test passes as long as a single
+  // attempt has passed.
+  this.whatIHeard = globalCounter++ % 2 === 1 ? 'flaky' : 'not flaky'
 })

integration-tests/ci-visibility/test-api-manual/test.fake.js

@@ -31,7 +31,7 @@ describe('can run tests', () => {
   })
   test('integration test', () => {
     // Just for testing purposes, so we don't create a custom span
-    if (!process.env.DD_CIVISIBILITY_MANUAL_API_ENABLED) {
+    if (process.env.DD_CIVISIBILITY_MANUAL_API_ENABLED === 'false') {
       return Promise.resolve()
     }
     const testSpan = tracer.scope().active()

integration-tests/ci-visibility/vitest-tests/early-flake-detection.mjs

@@ -0,0 +1,33 @@
+import { describe, test, expect } from 'vitest'
+import { sum } from './sum'
+
+let numAttempt = 0
+let numOtherAttempt = 0
+
+describe('early flake detection', () => {
+  test('can retry tests that eventually pass', { repeats: process.env.SHOULD_REPEAT && 2 }, () => {
+    expect(sum(1, 2)).to.equal(numAttempt++ > 1 ? 3 : 4)
+  })
+
+  test('can retry tests that always pass', { repeats: process.env.SHOULD_REPEAT && 2 }, () => {
+    if (process.env.ALWAYS_FAIL) {
+      expect(sum(1, 2)).to.equal(4)
+    } else {
+      expect(sum(1, 2)).to.equal(3)
+    }
+  })
+
+  test('does not retry if it is not new', () => {
+    expect(sum(1, 2)).to.equal(3)
+  })
+
+  test.skip('does not retry if the test is skipped', () => {
+    expect(sum(1, 2)).to.equal(3)
+  })
+
+  if (process.env.SHOULD_ADD_EVENTUALLY_FAIL) {
+    test('can retry tests that eventually fail', () => {
+      expect(sum(1, 2)).to.equal(numOtherAttempt++ < 3 ? 3 : 4)
+    })
+  }
+})