Merge branch 'master' into ishabi/fastify-iast

Author: IlyasShabi

.github/actions/install/action.yml

@@ -18,7 +18,8 @@ runs:
       shell: bash
       if: inputs.cache == 'true' && steps.yarn-cache.outputs.cache-hit == 'true'
       # Retry in case of server error from registry.
-    - run: yarn install --frozen-lockfile --ignore-engines || yarn install --frozen-lockfile --ignore-engines
+      # Wait 60 seconds to give the registry server time to heal.
+    - run: yarn install --frozen-lockfile --ignore-engines || sleep 60 && yarn install --frozen-lockfile --ignore-engines
       shell: bash
     - run: tar -cf node_modules.tar node_modules
       shell: bash

.github/dependabot.yml

@@ -31,6 +31,12 @@ updates:
       - dependency-name: "jest-docblock"
         # 30.0.0 onwards only supports Node.js 18.14.x and above
         update-types: ["version-update:semver-major"]
+        # The path-to-regexp version has to be the same as used in express v4.
+        # Consider vendoring it instead.
+      - dependency-name: "path-to-regexp"
+      - dependency-name: "lru-cache"
+        # 11.0.0 onwards only supports Node.js 20 and above
+        update-types: ["version-update:semver-major"]
     groups:
       dev-minor-and-patch-dependencies:
         dependency-type: "development"

.github/workflows/apm-integrations.yml

@@ -482,6 +482,9 @@ jobs:
       - uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
 
   kafkajs:
+    strategy:
+      matrix:
+        node-version: ['oldest', 'latest']
     runs-on: ubuntu-latest
     services:
       kafka:
@@ -506,7 +509,17 @@ jobs:
       SERVICES: kafka
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: ./.github/actions/plugins/test
+      - uses: ./.github/actions/testagent/start
+      - uses: ./.github/actions/node
+        with:
+          version: ${{ matrix.node-version }}
+      - uses: ./.github/actions/install
+      - run: yarn test:plugins:ci
+      - if: always()
+        uses: ./.github/actions/testagent/logs
+        with:
+          suffix: plugins-${{ github.job }}-${{ matrix.node-version }}
+      - uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
 
   koa:
     runs-on: ubuntu-latest

.github/workflows/platform.yml

@@ -296,6 +296,7 @@ jobs:
           version: ${{ matrix.version }}
       - uses: ./.github/actions/install
       - run: yarn add --ignore-scripts mocha@10 # Use older mocha to support old Node.js versions
+      - run: yarn add --ignore-scripts express@4 # Use older express to support old Node.js versions
       - run: node node_modules/.bin/mocha --colors --timeout 30000 integration-tests/init.spec.js
 
   integration-guardrails-unsupported:

CONTRIBUTING.md

@@ -89,6 +89,28 @@ To install dependencies once you have Node and yarn installed, run this in the p
 $ yarn
 ```
 
+## Adding a Plugin
+
+To create a new plugin for a third-party package, follow these steps:
+
+1. `mkdir -p packages/datadog-plugin-<pluginname>/src`
+2. Copy an `index.js` file from another plugin to use as a starting point: `cp packages/datadog-plugin-kafkajs/src/index.js packages/datadog-plugin-<pluginname>/src`
+3. Edit index.js as appropriate for your new plugin
+4. `mkdir -p packages/datadog-plugin-<pluginname>/test`
+5. Create an packages/datadog-plugin-<pluginname>/test/index.spec.js file and add the necessary tests. See other plugin tests for inspiration to file structure.
+6. Edit index.spec.js as appropriate for your new plugin
+7. Add entries to the following files for your new plugin:
+  - `packages/dd-trace/src/plugins/index.js`
+  - `index.d.ts`
+  - `docs/test.ts`
+  - `docs/API.md`
+  - `.github/workflows/apm-integrations.yml`
+
+### Adding a Plugin Test to CI
+
+The plugin tests run on pull requests in Github Actions. Each plugin test suite has its own Github job, so adding a new suite to CI
+requires adding a new job to the Github Actions config. The file containing these configs is `.github/workflows/apm-integrations.yml`.
+You can copypaste and modify an existing plugin job configuration in this file to create a new job config.
 
 ## Testing
 

LICENSE-3rdparty.csv

@@ -68,6 +68,7 @@ dev,sinon,BSD-3-Clause,Copyright 2010-2017 Christian Johansen
 dev,sinon-chai,WTFPL and BSD-2-Clause,Copyright 2004 Sam Hocevar 2012–2017 Domenic Denicola
 dev,tap,ISC,Copyright 2011-2022 Isaac Z. Schlueter and Contributors
 dev,tiktoken,MIT,Copyright (c) 2022 OpenAI, Shantanu Jain
+dev,workerpool,Apache license 2.0,Copyright (C) 2014-2024 Jos de Jong wjosdejong@gmail.com
 dev,yaml,ISC,Copyright Eemeli Aro <eemeli@gmail.com>
 dev,yarn-deduplicate,Apache license 2.0,Copyright [yyyy] [name of copyright owner]
 file,aws-lambda-nodejs-runtime-interface-client,Apache 2.0,Copyright 2019 Amazon.com Inc. or its affiliates. All Rights Reserved.

benchmark/sirun/appsec-iast/insecure-bank.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const http = require('http')
 const app = require('/opt/insecure-bank-js/app') // eslint-disable-line import/no-absolute-path
 

benchmark/sirun/appsec/insecure-bank.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const http = require('http')
 const app = require('/opt/insecure-bank-js/app') // eslint-disable-line import/no-absolute-path
 

benchmark/sirun/encoding/index.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const {
   ENCODER_VERSION
 } = process.env

benchmark/sirun/gc.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const { createHistogram, PerformanceObserver } = require('perf_hooks')
 if (createHistogram) {
   const StatsD = require('./statsd')