v5.76.1 proposal

.github/dependabot.yml

@@ -42,6 +42,15 @@ updates:
       - javascript
       - semver-patch
     ignore:
+      # Internal dependencies that we update manually
+      - dependency-name: "@datadog/libdatadog"
+      - dependency-name: "@datadog/native-appsec"
+      - dependency-name: "@datadog/native-iast-taint-tracking"
+      - dependency-name: "@datadog/native-metrics"
+      - dependency-name: "@datadog/pprof"
+      - dependency-name: "@datadog/sketches-js"
+      - dependency-name: "@datadog/wasm-js-rewriter"
+
       - dependency-name: "@types/node"
         # Update the types manually with new Node.js version support
         update-types: ["version-update:semver-major"]
@@ -65,6 +74,9 @@ updates:
       - dependency-name: "@opentelemetry/core"
         # 2.0.0 onwards only supports Node.js 18.19.0 and above
         update-types: ["version-update:semver-major"]
+      - dependency-name: "@opentelemetry/resources"
+        # 2.0.0 onwards only supports Node.js 18.19.0 and above
+        update-types: ["version-update:semver-major"]
       - dependency-name: "tap"
         # Contain breaking changes that are incompatible with our test usage
         update-types: ["version-update:semver-major"]
@@ -83,15 +95,6 @@ updates:
         update-types:
           - "minor"
           - "patch"
-        exclude-patterns:
-          # Add entries that we should update manually.
-          - "@datadog/libdatadog"
-          - "@datadog/native-appsec"
-          - "@datadog/native-iast-taint-tracking"
-          - "@datadog/native-metrics"
-          - "@datadog/pprof"
-          - "@datadog/sketches-js"
-          - "@datadog/wasm-js-rewriter"
   - package-ecosystem: "npm"
     directories:
       - "/packages/dd-trace/test/plugins/versions"

LICENSE-3rdparty.csv

@@ -11,7 +11,7 @@ require,@opentelemetry/api,Apache license 2.0,Copyright OpenTelemetry Authors
 require,@opentelemetry/api-logs,Apache license 2.0,Copyright OpenTelemetry Authors
 require,@opentelemetry/core,Apache license 2.0,Copyright OpenTelemetry Authors
 require,@opentelemetry/resources,Apache license 2.0,Copyright OpenTelemetry Authors
-require,@isaacs/ttlcache,ISC,Copyright (c) 2022-2023 - Isaac Z. Schlueter and Contributors
+require,@isaacs/ttlcache,Blue Oak,Copyright 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

integration-tests/cucumber/cucumber.spec.js

@@ -1841,11 +1841,19 @@ versions.forEach(version => {
                 './node_modules/.bin/cucumber-js ci-visibility/features-di/test-hit-breakpoint.feature --retry 1',
                 {
                   cwd,
-                  env: envVars,
+                  env: {
+                    ...envVars,
+                    DD_TRACE_DEBUG: '1',
+                    DD_TRACE_LOG_LEVEL: 'warn',
+                  },
                   stdio: 'pipe'
                 }
               )
 
+              // TODO: remove once we figure out flakiness
+              childProcess.stdout.pipe(process.stdout)
+              childProcess.stderr.pipe(process.stderr)
+
               childProcess.on('exit', () => {
                 Promise.all([eventsPromise, logsPromise]).then(() => {
                   assert.equal(snapshotIdByTest, snapshotIdByLog)

integration-tests/cypress/cypress.spec.js

@@ -518,10 +518,11 @@ moduleTypes.forEach(({
     context('intelligent test runner', () => {
       it('can report git metadata', async () => {
         const searchCommitsRequestPromise = receiver.payloadReceived(
-          ({ url }) => url.endsWith('/api/v2/git/repository/search_commits')
+          ({ url }) => url.endsWith('/api/v2/git/repository/search_commits'),
+          25000
         )
         const packfileRequestPromise = receiver
-          .payloadReceived(({ url }) => url.endsWith('/api/v2/git/repository/packfile'))
+          .payloadReceived(({ url }) => url.endsWith('/api/v2/git/repository/packfile'), 25000)
 
         const {
           NODE_OPTIONS, // NODE_OPTIONS dd-trace config does not work with cypress
@@ -541,6 +542,10 @@ moduleTypes.forEach(({
           }
         )
 
+        // TODO: remove this once we have figured out flakiness
+        childProcess.stdout.pipe(process.stdout)
+        childProcess.stderr.pipe(process.stderr)
+
         const [, searchCommitRequest, packfileRequest] = await Promise.all([
           once(childProcess, 'exit'),
           searchCommitsRequestPromise,
@@ -629,13 +634,13 @@ moduleTypes.forEach(({
           }, 25000)
 
         const coverageRequestPromise = receiver
-          .payloadReceived(({ url }) => url.endsWith('/api/v2/citestcov'))
+          .payloadReceived(({ url }) => url.endsWith('/api/v2/citestcov'), 25000)
           .then(coverageRequest => {
             assert.propertyVal(coverageRequest.headers, 'dd-api-key', '1')
           })
 
         const skippableRequestPromise = receiver
-          .payloadReceived(({ url }) => url.endsWith('/api/v2/ci/tests/skippable'))
+          .payloadReceived(({ url }) => url.endsWith('/api/v2/ci/tests/skippable'), 25000)
           .then(skippableRequest => {
             assert.propertyVal(skippableRequest.headers, 'dd-api-key', '1')
           })
@@ -658,6 +663,10 @@ moduleTypes.forEach(({
           }
         )
 
+        // TODO: remove this once we have figured out flakiness
+        childProcess.stdout.pipe(process.stdout)
+        childProcess.stderr.pipe(process.stderr)
+
         await Promise.all([
           once(childProcess, 'exit'),
           eventsPromise,
@@ -683,7 +692,7 @@ moduleTypes.forEach(({
 
         receiver.assertPayloadReceived(() => {
           hasRequestedSkippable = true
-        }, ({ url }) => url.endsWith('/api/v2/ci/tests/skippable')).catch(() => {})
+        }, ({ url }) => url.endsWith('/api/v2/ci/tests/skippable'), 25000).catch(() => {})
 
         const receiverPromise = receiver
           .gatherPayloadsMaxTimeout(({ url }) => url.endsWith('/api/v2/citestcycle'), (payloads) => {
@@ -713,6 +722,10 @@ moduleTypes.forEach(({
           }
         )
 
+        // TODO: remove this once we have figured out flakiness
+        childProcess.stdout.pipe(process.stdout)
+        childProcess.stderr.pipe(process.stderr)
+
         await Promise.all([
           once(childProcess, 'exit'),
           receiverPromise
@@ -788,6 +801,10 @@ moduleTypes.forEach(({
           }
         )
 
+        // TODO: remove this once we have figured out flakiness
+        childProcess.stdout.pipe(process.stdout)
+        childProcess.stderr.pipe(process.stderr)
+
         await Promise.all([
           once(childProcess, 'exit'),
           receiverPromise
@@ -857,6 +874,10 @@ moduleTypes.forEach(({
           }
         )
 
+        // TODO: remove this once we have figured out flakiness
+        childProcess.stdout.pipe(process.stdout)
+        childProcess.stderr.pipe(process.stderr)
+
         await Promise.all([
           once(childProcess, 'exit'),
           receiverPromise
@@ -884,10 +905,10 @@ moduleTypes.forEach(({
             assert.propertyVal(testModule.meta, TEST_CODE_COVERAGE_ENABLED, 'true')
             assert.propertyVal(testModule.meta, TEST_ITR_SKIPPING_ENABLED, 'true')
             assert.propertyVal(testModule.metrics, TEST_ITR_SKIPPING_COUNT, 0)
-          }, 25000)
+          }, 30000)
 
         const skippableRequestPromise = receiver
-          .payloadReceived(({ url }) => url.endsWith('/api/v2/ci/tests/skippable'))
+          .payloadReceived(({ url }) => url.endsWith('/api/v2/ci/tests/skippable'), 30000)
           .then(skippableRequest => {
             assert.propertyVal(skippableRequest.headers, 'dd-api-key', '1')
           })
@@ -910,6 +931,10 @@ moduleTypes.forEach(({
           }
         )
 
+        // TODO: remove this once we have figured out flakiness
+        childProcess.stdout.pipe(process.stdout)
+        childProcess.stderr.pipe(process.stderr)
+
         await Promise.all([
           once(childProcess, 'exit'),
           eventsPromise,
@@ -1003,6 +1028,10 @@ moduleTypes.forEach(({
           }
         )
 
+        // TODO: remove this once we have figured out flakiness
+        childProcess.stdout.pipe(process.stdout)
+        childProcess.stderr.pipe(process.stderr)
+
         await Promise.all([
           once(childProcess, 'exit'),
           eventsPromise
@@ -1434,10 +1463,6 @@ moduleTypes.forEach(({
           }
         )
 
-        // TODO: remove this once we have figured out flakiness
-        childProcess.stdout.pipe(process.stdout)
-        childProcess.stderr.pipe(process.stderr)
-
         await Promise.all([
           once(childProcess, 'exit'),
           receiverPromise
@@ -1500,10 +1525,6 @@ moduleTypes.forEach(({
           }
         )
 
-        // TODO: remove this once we have figured out flakiness
-        childProcess.stdout.pipe(process.stdout)
-        childProcess.stderr.pipe(process.stderr)
-
         await Promise.all([
           once(childProcess, 'exit'),
           receiverPromise,
@@ -1592,6 +1613,10 @@ moduleTypes.forEach(({
           }
         )
 
+        // TODO: remove this once we have figured out flakiness
+        childProcess.stdout.pipe(process.stdout)
+        childProcess.stderr.pipe(process.stderr)
+
         await Promise.all([
           once(childProcess, 'exit'),
           receiverPromise
@@ -2053,6 +2078,10 @@ moduleTypes.forEach(({
             }
           )
 
+          // TODO: remove this once we have figured out flakiness
+          childProcess.stdout.pipe(process.stdout)
+          childProcess.stderr.pipe(process.stderr)
+
           const [[exitCode]] = await Promise.all([
             once(childProcess, 'exit'),
             testAssertionsPromise