Merge branch 'master' into juan-fernandez/fix-test-suite-duration

Author: juan-fernandez

.github/workflows/apm-integrations.yml

@@ -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

.github/workflows/nightly-dispatch.yml renamed to .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:

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?) => {},

index.d.ts

@@ -1698,12 +1698,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.

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/vitest/vitest.spec.js

@@ -53,6 +53,7 @@ const {
   DD_CAPABILITIES_IMPACTED_TESTS
 } = require('../../packages/dd-trace/src/plugins/util/test')
 const { DD_HOST_CPU_COUNT } = require('../../packages/dd-trace/src/plugins/util/env')
+const { NODE_MAJOR } = require('../../version')
 
 const NUM_RETRIES_EFD = 3
 
@@ -399,7 +400,10 @@ versions.forEach((version) => {
     })
 
     // total code coverage only works for >=2.0.0
-    if (version === 'latest') {
+    // v4 dropped support for Node 18. Every test but this once passes, so we'll leave them
+    // for now. The breaking change is in https://github.com/vitest-dev/vitest/commit/9a0bf2254
+    // shipped in https://github.com/vitest-dev/vitest/releases/tag/v4.0.0-beta.12
+    if (version === 'latest' && NODE_MAJOR >= 20) {
       const coverageProviders = ['v8', 'istanbul']
 
       coverageProviders.forEach((coverageProvider) => {