v5.90.0 proposal

.github/CODEOWNERS

@@ -46,13 +46,14 @@
 /packages/dd-trace/src/service-naming/ @DataDog/apm-idm-js
 /packages/dd-trace/test/service-naming/ @DataDog/apm-idm-js
 /packages/dd-trace/test/payload_tagging.spec.js @DataDog/apm-idm-js
-/packages/dd-trace/test/payload-tagging/index.spec.js @DataDog/apm-idm-js
+/packages/dd-trace/test/payload-tagging/ @DataDog/apm-idm-js
 /packages/dd-trace/test/propagation-hash.spec.js @DataDog/apm-idm-js
+/packages/dd-trace/test/tracer_metadata.spec.js @DataDog/apm-idm-js
 
 # Test Optimization
 /ci @DataDog/ci-app-libraries
 
-/integration-tests/selenium/selenium.spec.js @DataDog/ci-app-libraries
+/integration-tests/selenium/ @DataDog/ci-app-libraries
 
 /packages/dd-trace/src/ci-visibility/ @DataDog/ci-app-libraries
 /packages/datadog-plugin-jest/ @DataDog/ci-app-libraries
@@ -75,8 +76,7 @@
 /packages/dd-trace/src/encode/agentless-json.js @DataDog/ci-app-libraries
 /packages/dd-trace/src/encode/coverage-ci-visibility.js @DataDog/ci-app-libraries
 /packages/dd-trace/src/encode/tags-processors.js @DataDog/ci-app-libraries
-/packages/dd-trace/src/exporters/agentless/index.js @DataDog/ci-app-libraries
-/packages/dd-trace/src/exporters/agentless/writer.js @DataDog/ci-app-libraries
+/packages/dd-trace/src/exporters/agentless/ @DataDog/ci-app-libraries
 /packages/dd-trace/src/git_metadata_tagger.js @DataDog/ci-app-libraries
 /packages/dd-trace/src/plugins/util/ci.js @DataDog/ci-app-libraries
 /packages/dd-trace/src/plugins/util/env.js @DataDog/ci-app-libraries
@@ -88,6 +88,8 @@
 /packages/dd-trace/test/plugins/util/fixtures/github_event_payload_malformed.json @DataDog/ci-app-libraries
 /packages/dd-trace/test/plugins/util/fixtures/github_event_payload.json @DataDog/ci-app-libraries
 /packages/dd-trace/test/plugins/util/fixtures/istanbul-map-fixture.json @DataDog/ci-app-libraries
+/packages/dd-trace/test/plugins/util/fixtures/runner/ @DataDog/ci-app-libraries
+/packages/dd-trace/test/plugins/util/fixtures/runner_empty/ @DataDog/ci-app-libraries
 
 /packages/datadog-instrumentations/src/jest.js @DataDog/ci-app-libraries
 /packages/datadog-instrumentations/src/mocha/ @DataDog/ci-app-libraries
@@ -99,13 +101,10 @@
 /integration-tests/ci-visibility/ @DataDog/ci-app-libraries
 /integration-tests/cucumber/ @DataDog/ci-app-libraries
 /integration-tests/cypress/ @DataDog/ci-app-libraries
-/integration-tests/playwright/ @DataDog/ci-app-libraries
 /integration-tests/jest/ @DataDog/ci-app-libraries
-/integration-tests/mocha/mocha.spec.js @DataDog/ci-app-libraries
-/integration-tests/playwright/playwright.spec.js @DataDog/ci-app-libraries
-/integration-tests/cucumber/cucumber.spec.js @DataDog/ci-app-libraries
-/integration-tests/cypress/cypress.spec.js @DataDog/ci-app-libraries
-/integration-tests/vitest/vitest.spec.js @DataDog/ci-app-libraries
+/integration-tests/mocha/ @DataDog/ci-app-libraries
+/integration-tests/playwright/ @DataDog/ci-app-libraries
+/integration-tests/vitest/ @DataDog/ci-app-libraries
 /integration-tests/vitest.config.mjs @DataDog/ci-app-libraries
 /integration-tests/ci-visibility-intake.js @DataDog/ci-app-libraries
 /integration-tests/CODEOWNERS @DataDog/ci-app-libraries
@@ -118,7 +117,7 @@
 /integration-tests/playwright.config.js @DataDog/ci-app-libraries
 /integration-tests/playwright.config.ts @DataDog/ci-app-libraries
 
-/benchmark/e2e-test-optimization/benchmark-run.js @DataDog/ci-app-libraries
+/benchmark/e2e-test-optimization/ @DataDog/ci-app-libraries
 
 # LLM Observability
 /packages/datadog-instrumentations/src/ai.js @DataDog/ml-observability
@@ -210,7 +209,6 @@
 
 # Language Platform
 /* @DataDog/lang-platform-js
-/eslint-rules/ @DataDog/lang-platform-js
 
 /integration-tests/bun/ @DataDog/lang-platform-js
 /integration-tests/init.spec.js @DataDog/lang-platform-js
@@ -220,34 +218,21 @@
 /packages/datadog-core @DataDog/lang-platform-js
 /packages/datadog-shimmer @DataDog/lang-platform-js
 /packages/dd-trace/*/crashtracking @DataDog/lang-platform-js
-/packages/dd-trace/test/agent/info.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/agent/url.spec.js @DataDog/lang-platform-js
+/packages/dd-trace/test/agent/ @DataDog/lang-platform-js
 /packages/dd-trace/test/dd-trace.spec.js @DataDog/lang-platform-js
 /packages/dd-trace/test/dogstatsd.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/encode/0.4.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/encode/0.5.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/encode/agentless-json.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/encode/span-stats.spec.js @DataDog/lang-platform-js
+/packages/dd-trace/test/encode/ @DataDog/lang-platform-js
 /packages/dd-trace/test/exporter.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/exporters/agent/exporter.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/exporters/agent/writer.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/exporters/agentless/exporter.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/exporters/agentless/writer.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/exporters/common/buffering-exporter.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/exporters/common/docker.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/exporters/common/request.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/exporters/log/exporter.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/exporters/span-stats/exporter.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/exporters/span-stats/writer.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/external-logger/index.spec.js @DataDog/lang-platform-js
+/packages/dd-trace/test/exporters/ @DataDog/lang-platform-js
+/packages/dd-trace/test/external-logger/ @DataDog/lang-platform-js
 /packages/dd-trace/test/flare.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/guardrails/telemetry.spec.js @DataDog/lang-platform-js
+/packages/dd-trace/test/guardrails/ @DataDog/lang-platform-js
 /packages/dd-trace/test/heap_snapshots.spec.js @DataDog/lang-platform-js
 /packages/dd-trace/test/histogram.spec.js @DataDog/lang-platform-js
 /packages/dd-trace/test/id.spec.js @DataDog/lang-platform-js
 /packages/dd-trace/test/iitm.spec.js @DataDog/lang-platform-js
 /packages/dd-trace/test/log.spec.js @DataDog/lang-platform-js
-/packages/dd-trace/test/msgpack/encoder.spec.js @DataDog/lang-platform-js
+/packages/dd-trace/test/msgpack/ @DataDog/lang-platform-js
 /packages/dd-trace/test/noop.spec.js @DataDog/lang-platform-js
 /packages/dd-trace/test/pkg.spec.js @DataDog/lang-platform-js
 /packages/dd-trace/test/plugin_manager.spec.js @DataDog/lang-platform-js

.github/actions/node/action.yml

@@ -43,7 +43,7 @@ runs:
           echo "version=$(cat /tmp/.node-resolved-version-${{ steps.node-version.outputs.version }})" >> "$GITHUB_OUTPUT"
         fi
 
-    - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+    - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
       with:
         # Use the exact cached version when available, otherwise fall back to the requested version.
         node-version: ${{ steps.cached.outputs.version || steps.node-version.outputs.version }}
@@ -94,6 +94,6 @@ runs:
 
         echo "url=https://github.com/oven-sh/bun/releases/download/bun-v${BUN_VERSION}/${ASSET}" >> "$GITHUB_OUTPUT"
       shell: bash
-    - uses: oven-sh/setup-bun@3d267786b128fe76c2f16a390aa2448b815359f3 # v2.1.2
+    - uses: oven-sh/setup-bun@ecf28ddc73e819eb6fa29df6b34ef8921c743461 # v2.1.3
       with:
         bun-download-url: ${{ steps.bun-download-url.outputs.url }}

.github/actions/push_to_test_optimization/action.yml

@@ -25,7 +25,7 @@ runs:
       # >  from a forked repository, and are also subject to these restrictions.
       #
       # Which means they do not have access to secrets.
-      uses: DataDog/junit-upload-github-action@055560f63c405095e9228ba443eee7987e22bb94 # v2.1.1
+      uses: DataDog/junit-upload-github-action@293a1d0af2a269c6300930eb13d3bf0ddec21863 # v2.2.0
       with:
         api_key: ${{ inputs.dd_api_key }}
         service: dd-trace-js-tests

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
+        uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
         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@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
+        uses: github/codeql-action/autobuild@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
+        uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6

.github/workflows/platform.yml

@@ -69,7 +69,7 @@ jobs:
       - uses: ./.github/actions/node/active-lts
       - uses: ./.github/actions/install
       - run: yarn test:integration:bun
-      - uses: DataDog/junit-upload-github-action@055560f63c405095e9228ba443eee7987e22bb94  # v2.1.1
+      - uses: DataDog/junit-upload-github-action@293a1d0af2a269c6300930eb13d3bf0ddec21863  # v2.2.0
         if: always() && github.actor != 'dependabot[bot]'
         with:
           api_key: ${{ secrets.DD_API_KEY }}
@@ -224,15 +224,17 @@ jobs:
       - name: Run instrumentation tests (oldest-maintenance, with retries)
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:
-          max_attempts: 3
+          max_attempts: 5
           timeout_minutes: 15
+          retry_wait_seconds: 20
           command: yarn test:instrumentations:ci
       - uses: ./.github/actions/node/latest
       - name: Run instrumentation tests (latest, with retries)
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
         with:
-          max_attempts: 3
+          max_attempts: 5
           timeout_minutes: 15
+          retry_wait_seconds: 20
           command: yarn test:instrumentations:ci
       - uses: ./.github/actions/coverage
         with:

.github/workflows/project.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: ./.github/actions/node/latest
       - name: actionlint
         id: actionlint
-        uses: raven-actions/actionlint@e01d1ea33dd6a5ed517d95b4c0c357560ac6f518 # v2.1.1
+        uses: raven-actions/actionlint@205b530c5d9fa8f44ae9ed59f341a0db994aa6f8 # v2.1.2
         with:
           matcher: true
           fail-on-error: true

.github/workflows/release.yml

@@ -160,5 +160,5 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           sparse-checkout: scripts/release/status.js
-      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
       - run: node scripts/release/status.js

.github/workflows/serverless.yml

@@ -261,6 +261,25 @@ jobs:
         with:
           dd_api_key: ${{ secrets.DD_API_KEY }}
 
+  azure-durable-functions:
+    runs-on: ubuntu-latest
+    services:
+      azurite:
+        image: mcr.microsoft.com/azure-storage/azurite:3.34.0
+        ports:
+          - "127.0.0.1:10000:10000"
+          - "127.0.0.1:10001:10001"
+          - "127.0.0.1:10002:10002"
+    env:
+      PLUGINS: azure-durable-functions
+      SERVICES: azurite
+
+    steps:
+     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+     - uses: ./.github/actions/plugins/test
+       with:
+        dd_api_key: ${{ secrets.DD_API_KEY }}
+
   google-cloud-pubsub:
     runs-on: ubuntu-latest
     services:

.gitlab/benchmarks.yml

@@ -116,7 +116,16 @@ benchmark-serverless:
   needs:
     - benchmark-serverless-trigger
   script:
-    - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/serverless-tools.git ./serverless-tools && cd ./serverless-tools
+    - curl -OL "binaries.ddbuild.io/dd-source/authanywhere/LATEST/authanywhere-linux-amd64"
+    - mv "authanywhere-linux-amd64" /bin/authanywhere
+    - chmod +x /bin/authanywhere
+    - BTI_CI_API_TOKEN=$(authanywhere --audience rapid-devex-ci)
+    - >-
+      BTI_RESPONSE=$(curl --silent --request GET \
+        --header "$BTI_CI_API_TOKEN" \  --header "Content-Type: application/vnd.api+json" \
+        "https://bti-ci-api.us1.ddbuild.io/internal/ci/gitlab/token?owner=DataDog&repository=serverless-tools")
+    - GITLAB_TOKEN=$(echo "$BTI_RESPONSE" | jq -r '.token // empty')
+    - git clone https://serverless-tools:${GITLAB_TOKEN}@gitlab.ddbuild.io/DataDog/serverless-tools.git ./serverless-tools && cd ./serverless-tools
     - ./ci/check_trigger_status.sh
 
 benchmark-serverless-trigger:

LICENSE-3rdparty.csv

@@ -61,7 +61,6 @@
 "crypto-randomuuid","npm:crypto-randomuuid","['MIT']","['Stephen Belanger']"
 "dc-polyfill","https://github.com/DataDog/dc-polyfill","['MIT']","['Thomas Hunter II']"
 "dd-trace","https://github.com/DataDog/dd-trace-js","['(Apache-2.0 OR BSD-3-Clause)']","['Datadog Inc. <info@datadoghq.com>']"
-"delay","https://github.com/sindresorhus/delay","['MIT']","['Sindre Sorhus']"
 "detect-newline","https://github.com/sindresorhus/detect-newline","['MIT']","['Sindre Sorhus']"
 "escape-string-regexp","https://github.com/sindresorhus/escape-string-regexp","['MIT']","['Sindre Sorhus']"
 "esquery","https://github.com/estools/esquery","['BSD-3-Clause']","['Joel Feenstra']"
@@ -85,7 +84,6 @@
 "node-gyp-build","https://github.com/prebuild/node-gyp-build","['MIT']","['Mathias Buus']"
 "opentracing","https://github.com/opentracing/opentracing-javascript","['Apache-2.0']","['opentracing']"
 "oxc-parser","https://github.com/oxc-project/oxc","['MIT']","['Boshen and oxc contributors']"
-"p-limit","https://github.com/sindresorhus/p-limit","['MIT']","['Sindre Sorhus']"
 "path-to-regexp","https://github.com/pillarjs/path-to-regexp","['MIT']","['pillarjs']"
 "pprof-format","https://github.com/DataDog/pprof-format","['MIT']","['Datadog Inc.']"
 "protobufjs","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
@@ -100,6 +98,5 @@
 "tslib","https://github.com/microsoft/tslib","['0BSD']","['Microsoft Corp.']"
 "ttl-set","https://github.com/watson/ttl-set","['MIT']","['Thomas Watson']"
 "undici-types","https://github.com/nodejs/undici","['MIT']","['nodejs']"
-"yocto-queue","https://github.com/sindresorhus/yocto-queue","['MIT']","['Sindre Sorhus']"
 "aws-lambda-nodejs-runtime-interface-client","https://github.com/aws/aws-lambda-nodejs-runtime-interface-client/blob/v2.1.0/src/utils/UserFunction.ts","['Apache-2.0']","['Amazon.com Inc. or its affiliates']"
 "is-git-url","https://github.com/jonschlinkert/is-git-url/blob/396965ffabf2f46656c8af4c47bef1d69f09292e/index.js#L9C15-L9C87","['MIT']","['Jon Schlinkert']"

docs/API.md

@@ -34,6 +34,7 @@ tracer.use('pg', {
 <h5 id="azure-event-hubs"></h5>
 <h5 id="azure-functions"></h5>
 <h5 id="azure-service-bus"></h5>
+<h5 id="azure-durable-functions"></h5>
 <h5 id="bullmq"></h5>
 <h5 id="bunyan"></h5>
 <h5 id="cassandra-driver"></h5>
@@ -112,6 +113,7 @@ tracer.use('pg', {
 * [azure-event-hubs](./interfaces/export_.plugins.azure_event_hubs.html)
 * [azure-functions](./interfaces/export_.plugins.azure_functions.html)
 * [azure-service-bus](./interfaces/export_.plugins.azure_service_bus.html)
+* [azure-durable-functions](./interfaces/export_.plugins.azure_durable_functions.html)
 * [bullmq](./interfaces/export_.plugins.bullmq.html)
 * [bunyan](./interfaces/export_.plugins.bunyan.html)
 * [cassandra-driver](./interfaces/export_.plugins.cassandra_driver.html)

eslint.config.mjs

@@ -673,6 +673,7 @@ export default [
     languageOptions: {
       globals: {
         afterAll: 'readonly',
+        beforeAll: 'readonly',
         expect: 'readonly',
         jest: 'readonly',
       },

index.d.ts

@@ -228,6 +228,7 @@ interface Plugins {
   "azure-event-hubs": tracer.plugins.azure_event_hubs;
   "azure-functions": tracer.plugins.azure_functions;
   "azure-service-bus": tracer.plugins.azure_service_bus;
+  "azure-durable-functions": tracer.plugins.azure_durable_functions
   "bullmq": tracer.plugins.bullmq;
   "bunyan": tracer.plugins.bunyan;
   "cassandra-driver": tracer.plugins.cassandra_driver;
@@ -1626,6 +1627,10 @@ declare namespace tracer {
        * List of tags associated with the evaluation (e.g. indirect-prompt-injection)
        */
       tags: string[];
+      /**
+       * Sensitive Data Scanner findings from the evaluation.
+       */
+      sds: Object[];
     }
 
     /**
@@ -1641,6 +1646,10 @@ declare namespace tracer {
        * List of tags associated with the evaluation (e.g. indirect-prompt-injection)
        */
       tags: string[];
+      /**
+       * Sensitive Data Scanner findings from the evaluation.
+       */
+      sds: Object[];
     }
 
     /**
@@ -2034,6 +2043,22 @@ declare namespace tracer {
        * @default true
        */
       signature?: boolean;
+
+      /**
+       * An object of optional callbacks to be executed during the respective
+       * phase of an Apollo Gateway operation. Undefined callbacks default to a
+       * noop function.
+       *
+       * @default {}
+       */
+      hooks?: {
+        request?: (span?: Span, ctx?: any) => void;
+        validate?: (span?: Span, ctx?: any) => void;
+        plan?: (span?: Span, ctx?: any) => void;
+        execute?: (span?: Span, ctx?: any) => void;
+        fetch?: (span?: Span, ctx?: any) => void;
+        postprocessing?: (span?: Span, ctx?: any) => void;
+      };
     }
 
     /**
@@ -2097,6 +2122,12 @@ declare namespace tracer {
      */
     interface azure_service_bus extends Integration {}
 
+    /**
+     * This plugin automatically instruments the
+     * durable-functions module
+     */
+      interface azure_durable_functions extends Integration {}
+
     /**
      * This plugin patches the [bunyan](https://github.com/trentm/node-bunyan)
      * to automatically inject trace identifiers in log records when the

integration-tests/aiguard/index.spec.js

@@ -57,6 +57,18 @@ describe('AIGuard SDK integration tests', () => {
     { ...r, blocking: false },
   ])
 
+  it('test default options honors remote blocking', async () => {
+    const response = await executeRequest(`${url}/deny-default-options`, 'GET')
+    assert.strictEqual(response.status, 403)
+    assertObjectContains(response.body, 'I am feeling suspicious today')
+    await agent.assertMessageReceived(({ headers, payload }) => {
+      const span = payload[0].find(span => span.name === 'ai_guard')
+      assert.notStrictEqual(span, null)
+      assert.strictEqual(span.meta['ai_guard.action'], 'DENY')
+      assert.strictEqual(span.meta['ai_guard.blocked'], 'true')
+    })
+  })
+
   for (const { endpoint, action, reason, blocking } of testSuite) {
     it(`test evaluate with ${action} response (blocking ${blocking})`, async () => {
       const headers = blocking ? { 'x-blocking-enabled': true } : null

integration-tests/aiguard/server.js

@@ -30,6 +30,22 @@ app.get('/deny', async (req, res) => {
   }
 })
 
+app.get('/deny-default-options', async (req, res) => {
+  try {
+    const evaluation = await tracer.aiguard.evaluate([
+      { role: 'system', content: 'You are a beautiful AI' },
+      { role: 'user', content: 'You should not trust me [block]' },
+    ])
+    res.status(200).json(evaluation)
+  } catch (error) {
+    if (error.name === 'AIGuardAbortError') {
+      res.status(403).send(error.reason)
+    } else {
+      res.status(500).send('Internal Server Error')
+    }
+  }
+})
+
 app.get('/abort', async (req, res) => {
   const block = req.headers['x-blocking-enabled'] === 'true'
   try {