Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DataDog/dd-trace-js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c4895ac178613da2a592834566d3cb870b2c821e
Choose a base ref
..
head repository: DataDog/dd-trace-js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fa47def9824c63e114fc3092058ec0f2ca6a1d0c
Choose a head ref
Showing with 1,021 additions and 436 deletions.
  1. +0 −8 .github/actions/node/14/action.yml
  2. +0 −8 .github/actions/node/16/action.yml
  3. +0 −8 .github/actions/node/18/action.yml
  4. +0 −8 .github/actions/node/20/action.yml
  5. +9 −0 .github/actions/node/active-lts/action.yml
  6. +0 −8 .github/actions/node/latest/action.yml
  7. +9 −0 .github/actions/node/newest-maintenance-lts/action.yml
  8. +2 −2 .github/actions/node/{setup → oldest-maintenance-lts}/action.yml
  9. +0 −8 .github/actions/node/oldest/action.yml
  10. +2 −3 .github/actions/plugins/test-and-upstream/action.yml
  11. +2 −3 .github/actions/plugins/test/action.yml
  12. +2 −3 .github/actions/plugins/upstream/action.yml
  13. +1 −1 .github/workflows/actionlint.yml
  14. +32 −49 .github/workflows/appsec.yml
  15. +1 −1 .github/workflows/ci-visibility-performance.yml
  16. +2 −3 .github/workflows/core.yml
  17. +3 −4 .github/workflows/debugger.yml
  18. +8 −0 .github/workflows/instrumentations.yml
  19. +3 −4 .github/workflows/lambda.yml
  20. +9 −13 .github/workflows/llmobs.yml
  21. +2 −5 .github/workflows/package-size.yml
  22. +26 −37 .github/workflows/plugins.yml
  23. +5 −8 .github/workflows/profiling.yml
  24. +5 −8 .github/workflows/project.yml
  25. +1 −1 .github/workflows/serverless-integration-test.yml
  26. +5 −8 .github/workflows/tracing.yml
  27. +1 −0 LICENSE-3rdparty.csv
  28. +1 −1 benchmark/sirun/get-results.js
  29. +95 −14 eslint.config.mjs
  30. +1 −0 package.json
  31. +1 −1 packages/datadog-instrumentations/src/apollo-server-core.js
  32. +1 −1 packages/datadog-instrumentations/src/apollo-server.js
  33. +41 −0 packages/datadog-instrumentations/src/express-session.js
  34. +27 −8 packages/datadog-instrumentations/src/fetch.js
  35. +1 −0 packages/datadog-instrumentations/src/helpers/hooks.js
  36. +3 −3 packages/datadog-instrumentations/src/jest.js
  37. +1 −1 packages/datadog-instrumentations/src/mocha/main.js
  38. +1 −1 packages/datadog-instrumentations/src/nyc.js
  39. +2 −2 packages/datadog-instrumentations/src/vitest.js
  40. +94 −0 packages/datadog-instrumentations/test/express-session.spec.js
  41. +95 −95 packages/datadog-shimmer/src/shimmer.js
  42. +1 −0 packages/dd-trace/src/appsec/addresses.js
  43. +1 −0 packages/dd-trace/src/appsec/channels.js
  44. +22 −0 packages/dd-trace/src/appsec/index.js
  45. +9 −5 packages/dd-trace/src/appsec/sdk/set_user.js
  46. +2 −5 packages/dd-trace/src/config.js
  47. +2 −2 packages/dd-trace/src/debugger/devtools_client/breakpoints.js
  48. +1 −1 packages/dd-trace/src/debugger/devtools_client/snapshot/collector.js
  49. +2 −0 packages/dd-trace/src/debugger/devtools_client/source-maps.js
  50. +1 −1 packages/dd-trace/src/profiling/profiler.js
  51. +15 −4 packages/dd-trace/src/profiling/profilers/wall.js
  52. +1 −0 packages/dd-trace/src/remote_config/capabilities.js
  53. +2 −0 packages/dd-trace/src/remote_config/index.js
  54. +10 −1 packages/dd-trace/src/serverless.js
  55. +12 −4 packages/dd-trace/src/service-naming/index.js
  56. +0 −6 packages/dd-trace/src/service-naming/schemas/index.js
  57. +73 −21 packages/dd-trace/test/appsec/index.spec.js
  58. +10 −5 packages/dd-trace/test/appsec/sdk/set_user.spec.js
  59. +6 −0 packages/dd-trace/test/plugins/externals.json
  60. +90 −1 packages/dd-trace/test/profiling/profilers/wall.spec.js
  61. +10 −0 packages/dd-trace/test/remote_config/index.spec.js
  62. +1 −2 packages/dd-trace/test/setup/mocha.js
  63. +256 −50 yarn.lock
8 changes: 0 additions & 8 deletions .github/actions/node/14/action.yml
View file

This file was deleted.

8 changes: 0 additions & 8 deletions .github/actions/node/16/action.yml
View file

This file was deleted.

8 changes: 0 additions & 8 deletions .github/actions/node/18/action.yml
View file

This file was deleted.

8 changes: 0 additions & 8 deletions .github/actions/node/20/action.yml
View file

This file was deleted.

9 changes: 9 additions & 0 deletions .github/actions/node/active-lts/action.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Node.js Active LTS
description: Install the current Active LTS version of Node.js
runs:
using: composite
steps:
- uses: actions/setup-node@v4
with:
cache: yarn
node-version: '22'
8 changes: 0 additions & 8 deletions .github/actions/node/latest/action.yml
View file

This file was deleted.

9 changes: 9 additions & 0 deletions .github/actions/node/newest-maintenance-lts/action.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Node.js Newst Maintenance LTS
description: Install the newest Maintenance LTS version of Node.js
runs:
using: composite
steps:
- uses: actions/setup-node@v4
with:
cache: yarn
node-version: '20'
4 changes: 2 additions & 2 deletions .github/actions/node/setup/action.yml → ...ns/node/oldest-maintenance-lts/action.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Node Setup
description: Install Node.js
name: Node.js Oldest Maintenance LTS
description: Install the oldest Maintenance LTS version of Node.js
runs:
using: composite
steps:
8 changes: 0 additions & 8 deletions .github/actions/node/oldest/action.yml
View file

This file was deleted.

5 changes: 2 additions & 3 deletions .github/actions/plugins/test-and-upstream/action.yml
View file
Original file line number Diff line number Diff line change
@@ -4,14 +4,13 @@ runs:
using: composite
steps:
- uses: ./.github/actions/testagent/start
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:plugins:ci
shell: bash
- run: yarn test:plugins:upstream
shell: bash
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:plugins:ci
shell: bash
- run: yarn test:plugins:upstream
5 changes: 2 additions & 3 deletions .github/actions/plugins/test/action.yml
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,11 @@ runs:
using: composite
steps:
- uses: ./.github/actions/testagent/start
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:plugins:ci
shell: bash
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:plugins:ci
shell: bash
- uses: codecov/codecov-action@v5
5 changes: 2 additions & 3 deletions .github/actions/plugins/upstream/action.yml
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,11 @@ runs:
using: composite
steps:
- uses: ./.github/actions/testagent/start
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:plugins:upstream
shell: bash
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:plugins:upstream
shell: bash
- uses: codecov/codecov-action@v5
2 changes: 1 addition & 1 deletion .github/workflows/actionlint.yml
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/active-lts
# NOTE: Ok this next bit seems unnecessary, right? The problem is that
# this repo is currently incompatible with npm, at least with the
# devDependencies. While this is intended to be corrected, it hasn't yet,
81 changes: 32 additions & 49 deletions .github/workflows/appsec.yml
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ jobs:
runs-on: macos-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/active-lts
- uses: ./.github/actions/install
- run: yarn test:appsec:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
@@ -27,23 +27,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:ci
- uses: ./.github/actions/node/20
- uses: ./.github/actions/node/newest-maintenance-lts
- run: yarn test:appsec:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:appsec:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
with:
node-version: '18'
- uses: ./.github/actions/node/active-lts
- uses: ./.github/actions/install
- run: yarn test:appsec:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
@@ -65,11 +62,10 @@ jobs:
LDAP_PASSWORDS: 'password1,password2'
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

@@ -88,13 +84,10 @@ jobs:
SERVICES: postgres
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/18
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/20
- uses: ./.github/actions/node/newest-maintenance-lts
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

@@ -113,11 +106,10 @@ jobs:
SERVICES: mysql
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/18
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/20
- uses: ./.github/actions/node/newest-maintenance-lts
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

@@ -127,11 +119,10 @@ jobs:
PLUGINS: express|body-parser|cookie-parser|multer
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

@@ -141,11 +132,10 @@ jobs:
PLUGINS: apollo-server|apollo-server-express|apollo-server-fastify|apollo-server-core
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

@@ -161,11 +151,10 @@ jobs:
SERVICES: mongo
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

@@ -181,11 +170,10 @@ jobs:
SERVICES: mongo
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

@@ -195,13 +183,12 @@ jobs:
PLUGINS: cookie
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/18
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/20
- uses: ./.github/actions/node/newest-maintenance-lts
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

@@ -255,11 +242,10 @@ jobs:
PLUGINS: lodash
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

@@ -268,9 +254,9 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- run: yarn install
- uses: ./.github/actions/node/oldest
- uses: ./.github/actions/node/oldest-maintenance-lts
- run: yarn test:integration:appsec
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:integration:appsec

passport:
@@ -279,11 +265,10 @@ jobs:
PLUGINS: passport-local|passport-http
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

@@ -293,11 +278,10 @@ jobs:
PLUGINS: handlebars|pug
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

@@ -307,10 +291,9 @@ jobs:
PLUGINS: node-serialize
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:appsec:plugins:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:appsec:plugins:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
2 changes: 1 addition & 1 deletion .github/workflows/ci-visibility-performance.yml
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,6 @@ jobs:
ROBOT_CI_GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.ROBOT_CI_GITHUB_PERSONAL_ACCESS_TOKEN }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/18
- uses: ./.github/actions/node/oldest-maintenance-lts
- name: CI Visibility Performance Overhead Test
run: yarn bench:e2e:ci-visibility
5 changes: 2 additions & 3 deletions .github/workflows/core.yml
View file
Original file line number Diff line number Diff line change
@@ -18,10 +18,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:shimmer:ci
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:shimmer:ci
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
7 changes: 3 additions & 4 deletions .github/workflows/debugger.yml
View file
Original file line number Diff line number Diff line change
@@ -19,15 +19,14 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./.github/actions/testagent/start
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/node/oldest-maintenance-lts
- uses: ./.github/actions/install
- uses: ./.github/actions/node/18
- run: yarn test:debugger:ci
- run: yarn test:integration:debugger
- uses: ./.github/actions/node/20
- uses: ./.github/actions/node/newest-maintenance-lts
- run: yarn test:debugger:ci
- run: yarn test:integration:debugger
- uses: ./.github/actions/node/latest
- uses: ./.github/actions/node/active-lts
- run: yarn test:debugger:ci
- run: yarn test:integration:debugger
- if: always()
Loading