v5.75.0 proposal

.github/workflows/apm-integrations.yml

@@ -213,7 +213,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       kafka:
-        image: apache/kafka-native:3.8.0-rc2
+        image: apache/kafka-native:3.9.1
         env:
           KAFKA_PROCESS_ROLES: broker,controller
           KAFKA_NODE_ID: '1'
@@ -384,7 +384,17 @@ jobs:
       - uses: ./.github/actions/install
       - run: yarn test:plugins:ci
 
-  cookie-session:
+  express-mongo-sanitize:
+    runs-on: ubuntu-latest
+    env:
+      PLUGINS: express-mongo-sanitize
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+      - uses: ./.github/actions/plugins/test
+        with:
+          dd_api_key: ${{ secrets.DD_API_KEY }}
+
+  express-session:
     runs-on: ubuntu-latest
     env:
       PLUGINS: express-session
@@ -524,7 +534,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       kafka:
-        image: apache/kafka-native:3.8.0-rc2
+        image: apache/kafka-native:3.9.1
         env:
           KAFKA_PROCESS_ROLES: broker,controller
           KAFKA_NODE_ID: '1'

.github/workflows/appsec.yml

@@ -421,7 +421,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       kafka:
-        image: apache/kafka-native:3.8.0-rc2
+        image: apache/kafka-native:3.9.1
         env:
           KAFKA_PROCESS_ROLES: broker,controller
           KAFKA_NODE_ID: '1'

.github/workflows/nightly-dispatch.yml → .github/workflows/custom-node-version-dispatch.yml

@@ -1,4 +1,4 @@
-name: Nightly Testing
+name: Nightly and custom Node.js builds
 
 on:
   workflow_dispatch:

.github/workflows/serverless.yml

@@ -78,10 +78,11 @@ jobs:
           EXTRA_CORS_EXPOSE_HEADERS: x-amz-request-id,x-amzn-requestid,x-amz-id-2
           AWS_DEFAULT_REGION: us-east-1
           FORCE_NONINTERACTIVE: 'true'
-          LAMBDA_EXECUTOR: local
           START_WEB: '0'
         ports:
           - 4566:4566
+        volumes:
+          - /var/run/docker.sock:/var/run/docker.sock:rw
       # we have two localstacks since upgrading localstack was causing lambda & S3 tests to fail
       # To-Do: Debug localstack / lambda and localstack / S3
       localstack-legacy:

LICENSE-3rdparty.csv

@@ -14,6 +14,7 @@ require,@opentelemetry/resources,Apache license 2.0,Copyright OpenTelemetry Auth
 require,@isaacs/ttlcache,ISC,Copyright (c) 2022-2023 - Isaac Z. Schlueter and Contributors
 require,crypto-randomuuid,MIT,Copyright 2021 Node.js Foundation and contributors
 require,dc-polyfill,MIT,Copyright 2023 Datadog Inc.
+require,escape-string-regexp,MIT,Copyright Sindre Sorhus
 require,ignore,MIT,Copyright 2013 Kael Zhang and contributors
 require,import-in-the-middle,Apache license 2.0,Copyright 2021 Datadog Inc.
 require,istanbul-lib-coverage,BSD-3-Clause,Copyright 2012-2015 Yahoo! Inc.

docker-compose.yml

@@ -154,7 +154,7 @@ services:
       - LAMBDA_EXECUTOR=local
   kafka:
     platform: linux/arm64
-    image: apache/kafka-native:3.8.0-rc2
+    image: apache/kafka-native:3.9.1
     ports:
       - "127.0.0.1:9092:9092"
       - "127.0.0.1:9093:9093"

docs/test.ts

@@ -262,7 +262,6 @@ const elasticsearchOptions: plugins.elasticsearch = {
 
 const awsSdkOptions: plugins.aws_sdk = {
   service: 'test',
-  splitByAwsService: false,
   batchPropagationEnabled: false,
   hooks: {
     request: (span?: Span, response?) => {},
@@ -303,6 +302,7 @@ const openSearchOptions: plugins.opensearch = {
   },
 };
 
+tracer.use('ai', true)
 tracer.use('amqp10');
 tracer.use('amqplib');
 tracer.use('anthropic');

index.d.ts

@@ -181,6 +181,7 @@ interface Tracer extends opentracing.Tracer {
 /** @hidden */
 interface Plugins {
   "aerospike": tracer.plugins.aerospike;
+  "ai": tracer.plugins.ai;
   "amqp10": tracer.plugins.amqp10;
   "amqplib": tracer.plugins.amqplib;
   "anthropic": tracer.plugins.anthropic;
@@ -1642,6 +1643,12 @@ declare namespace tracer {
      */
     interface aerospike extends Instrumentation {}
 
+    /**
+     * This plugin automatically instruments the
+     * [Vercel AI SDK](https://ai-sdk.dev/docs/introduction) module.
+     */
+    interface ai extends Instrumentation {}
+
     /**
      * This plugin automatically instruments the
      * [amqp10](https://github.com/noodlefrenzy/node-amqp10) module.
@@ -1698,12 +1705,6 @@ declare namespace tracer {
      * [aws-sdk](https://github.com/aws/aws-sdk-js) module.
      */
     interface aws_sdk extends Instrumentation {
-      /**
-       * Whether to add a suffix to the service name so that each AWS service has its own service name.
-       * @default true
-       */
-      splitByAwsService?: boolean;
-
       /**
        * Whether to inject all messages during batch AWS SQS, Kinesis, and SNS send operations. Normal
        * behavior is to inject the first message in batch send operations.
@@ -2821,7 +2822,10 @@ declare namespace tracer {
     redactionValuePattern?: string,
 
     /**
-     * Allows to enable security controls.
+     * Allows to enable security controls. This option is not supported when
+     * using ESM.
+     * @deprecated Please use the DD_IAST_SECURITY_CONTROLS_CONFIGURATION
+     * environment variable instead.
      */
     securityControlsConfiguration?: string,
 

integration-tests/ci-visibility/playwright-test-duration/long-suite-test.js

@@ -0,0 +1,10 @@
+'use strict'
+
+const { test, expect } = require('@playwright/test')
+
+test.describe('long suite', () => {
+  test('should be able to run', async () => {
+    await new Promise(resolve => setTimeout(resolve, 5000))
+    expect(true).toBe(true)
+  })
+})

integration-tests/ci-visibility/playwright-test-duration/short-suite-test.js

@@ -0,0 +1,13 @@
+'use strict'
+
+const { test, expect } = require('@playwright/test')
+
+test.describe('short suite', () => {
+  test('should be able to run', async () => {
+    expect(true).toBe(true)
+  })
+
+  test.skip('should skip and not mess up the duration of the test suite', async () => {
+    // TODO
+  })
+})

integration-tests/ci-visibility/playwright-tests-rum/rum-multiple-goto-test.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const { test, expect } = require('@playwright/test')
+
+test.beforeEach(async ({ page }) => {
+  await page.goto(process.env.PW_BASE_URL)
+})
+
+test.describe('playwright', () => {
+  test('should have RUM active', async ({ page }) => {
+    await expect(page.locator('.hello-world')).toHaveText([
+      'Hello World'
+    ])
+    await page.goto(`${process.env.PW_BASE_URL}/another-page`)
+    await expect(page.locator('.hello-world')).toHaveText([
+      'Hello World'
+    ])
+  })
+})

integration-tests/ci-visibility/subproject/cypress-config.json

@@ -4,6 +4,6 @@
   "pluginsFile": "cypress/plugins-old/index.js",
   "supportFile": "cypress/support/e2e.js",
   "integrationFolder": "cypress/e2e",
-  "defaultCommandTimeout": 100,
+  "defaultCommandTimeout": 1000,
   "nodeVersion": "system"
 }

integration-tests/ci-visibility/subproject/cypress.config.js

@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  defaultCommandTimeout: 100,
+  defaultCommandTimeout: 1000,
   e2e: {
     setupNodeEvents (on, config) {
       return require('dd-trace/ci/cypress/plugin')(on, config)

integration-tests/cypress-config.json

@@ -4,6 +4,6 @@
   "pluginsFile": "cypress/plugins-old/index.js",
   "supportFile": "cypress/support/e2e.js",
   "integrationFolder": "cypress/e2e",
-  "defaultCommandTimeout": 100,
+  "defaultCommandTimeout": 1000,
   "nodeVersion": "system"
 }

integration-tests/cypress/cypress.spec.js

@@ -493,7 +493,7 @@ moduleTypes.forEach(({
           .map(file => file.filename)
 
         assert.includeMembers(fileNames, Object.keys(coverageFixture))
-      }, 20000)
+      }, 25000)
 
       childProcess = exec(
         testCommand,
@@ -988,7 +988,7 @@ moduleTypes.forEach(({
               'ci-visibility/subproject/src/index.tsx',
               'ci-visibility/subproject/cypress/e2e/spec.cy.js'
             ])
-          }, 10000)
+          }, 25000)
 
         childProcess = exec(
           command,
@@ -1028,7 +1028,7 @@ moduleTypes.forEach(({
             assert.exists(testEvent.content.test_session_id)
             assert.notEqual(testEvent.content.test_suite_id, testModuleEvent.content.test_module_id)
           })
-        })
+        }, 25000)
 
       childProcess = exec(
         testCommand,
@@ -1173,7 +1173,7 @@ moduleTypes.forEach(({
 
             const testSession = events.find(event => event.type === 'test_session_end').content
             assert.propertyVal(testSession.meta, TEST_EARLY_FLAKE_ENABLED, 'true')
-          })
+          }, 25000)
 
         const {
           NODE_OPTIONS, // NODE_OPTIONS dd-trace config does not work with cypress
@@ -1241,7 +1241,7 @@ moduleTypes.forEach(({
 
             const testSession = events.find(event => event.type === 'test_session_end').content
             assert.notProperty(testSession.meta, TEST_EARLY_FLAKE_ENABLED)
-          })
+          }, 25000)
 
         const specToRun = 'cypress/e2e/spec.cy.js'
         childProcess = exec(
@@ -1298,7 +1298,7 @@ moduleTypes.forEach(({
 
             const testSession = events.find(event => event.type === 'test_session_end').content
             assert.propertyVal(testSession.meta, TEST_EARLY_FLAKE_ENABLED, 'true')
-          })
+          }, 25000)
 
         const specToRun = 'cypress/e2e/skipped-test.js'
 
@@ -1353,7 +1353,7 @@ moduleTypes.forEach(({
 
             const newTests = tests.filter(test => test.meta[TEST_IS_NEW] === 'true')
             assert.equal(newTests.length, 0)
-          })
+          }, 25000)
 
         const specToRun = 'cypress/e2e/spec.cy.js'
 
@@ -1624,7 +1624,7 @@ moduleTypes.forEach(({
               'cypress/e2e/flaky-test-retries.js.flaky test retry always passes'
             ])
             assert.equal(tests.filter(test => test.meta[TEST_RETRY_REASON] === TEST_RETRY_REASON_TYPES.atr).length, 0)
-          })
+          }, 25000)
 
         const {
           NODE_OPTIONS, // NODE_OPTIONS dd-trace config does not work with cypress
@@ -1683,7 +1683,7 @@ moduleTypes.forEach(({
             ])
 
             assert.equal(tests.filter(test => test.meta[TEST_RETRY_REASON] === TEST_RETRY_REASON_TYPES.atr).length, 2)
-          })
+          }, 25000)
 
         const {
           NODE_OPTIONS, // NODE_OPTIONS dd-trace config does not work with cypress
@@ -1795,7 +1795,7 @@ moduleTypes.forEach(({
 
             const testSession = events.find(event => event.type === 'test_session_end').content
             assert.notProperty(testSession.meta, TEST_EARLY_FLAKE_ENABLED)
-          })
+          }, 25000)
 
         const specToRun = 'cypress/e2e/spec.cy.js'
         childProcess = exec(
@@ -1835,7 +1835,7 @@ moduleTypes.forEach(({
             const test = events.find(event => event.type === 'test').content
             assert.equal(test.resource, 'cypress/e2e/multi-origin.js.tests multiple origins')
             assert.equal(test.meta[TEST_STATUS], 'pass')
-          })
+          }, 25000)
 
         secondWebAppServer = http.createServer((req, res) => {
           res.setHeader('Content-Type', 'text/html')
@@ -2011,7 +2011,7 @@ moduleTypes.forEach(({
                   }
                 }
               }
-            })
+            }, 25000)
 
         const runAttemptToFixTest = async ({
           isAttemptToFix,
@@ -2195,7 +2195,7 @@ moduleTypes.forEach(({
                 assert.propertyVal(failedTest.meta, TEST_STATUS, 'fail')
                 assert.notProperty(failedTest.meta, TEST_MANAGEMENT_IS_DISABLED)
               }
-            })
+            }, 25000)
 
         const runDisableTest = async (isDisabling, extraEnvVars = {}) => {
           const testAssertionsPromise = getTestAssertions(isDisabling)
@@ -2294,7 +2294,7 @@ moduleTypes.forEach(({
                 assert.propertyVal(failedTest.meta, TEST_STATUS, 'fail')
                 assert.notProperty(failedTest.meta, TEST_MANAGEMENT_IS_QUARANTINED)
               }
-            })
+            }, 25000)
 
         const runQuarantineTest = async (isQuarantining, extraEnvVars = {}) => {
           const testAssertionsPromise = getTestAssertions(isQuarantining)
@@ -2366,7 +2366,7 @@ moduleTypes.forEach(({
             const tests = events.filter(event => event.type === 'test').map(event => event.content)
             // it is not retried
             assert.equal(tests.length, 1)
-          })
+          }, 25000)
 
         const {
           NODE_OPTIONS,

integration-tests/esbuild/build-and-test-git-tags.js

@@ -27,7 +27,8 @@ esbuild.build({
     'mysql',
     'oracledb',
     'pg-query-stream',
-    'tedious'
+    'tedious',
+    '@yaacovcr/transform'
   ]
 }).then(() => {
   const { status, stdout, stderr } = spawnSync('node', [SCRIPT], {

integration-tests/esbuild/build.esm-hono-output-cjs.mjs

@@ -18,10 +18,6 @@ const external = [
   // required if you use profiling
   '@datadog/pprof',
 
-  // @openfeature/core is a peer dependency of @openfeature/server-sdk
-  // which is used by @datadog/openfeature-node-server
-  '@openfeature/core',
-
   // required if you use Datadog security features
   '@datadog/native-appsec',
   '@datadog/native-iast-taint-tracking',

integration-tests/esbuild/build.esm-hono-output-esm.mjs

@@ -18,10 +18,6 @@ const external = [
   // required if you use profiling
   '@datadog/pprof',
 
-  // @openfeature/core is a peer dependency of @openfeature/server-sdk
-  // which is used by @datadog/openfeature-node-server
-  '@openfeature/core',
-
   // required if you use Datadog security features
   '@datadog/native-appsec',
   '@datadog/native-iast-taint-tracking',

integration-tests/esbuild/build.esm-http-output-cjs.mjs

@@ -18,10 +18,6 @@ const external = [
   // required if you use profiling
   '@datadog/pprof',
 
-  // @openfeature/core is a peer dependency of @openfeature/server-sdk
-  // which is used by @datadog/openfeature-node-server
-  '@openfeature/core',
-
   // required if you use Datadog security features
   '@datadog/native-appsec',
   '@datadog/native-iast-taint-tracking',