Merge branch 'master' into conti/report-tested-integrations-and-versions

DataDog · Oct 12, 2023 · f9bfe1b · f9bfe1b
2 parents 614a096 + c452005
commit f9bfe1b
Show file tree

Hide file tree

Showing 79 changed files with 3,991 additions and 248 deletions.
diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml
@@ -80,7 +80,7 @@ jobs:
           - 5432:5432
     env:
       PG_TEST_NATIVE: 'true'
-      PLUGINS: pg
+      PLUGINS: pg|knex
       SERVICES: postgres
     steps:
       - uses: actions/checkout@v2
@@ -131,6 +131,46 @@ jobs:
       - run: yarn test:appsec:plugins:ci
       - uses: codecov/codecov-action@v2
 
+  mongodb-core:
+    runs-on: ubuntu-latest
+    services:
+      mongodb:
+        image: circleci/mongo
+        ports:
+          - 27017:27017
+    env:
+      PLUGINS: express-mongo-sanitize
+      SERVICES: mongo
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/node/setup
+      - run: yarn install
+      - uses: ./.github/actions/node/oldest
+      - run: yarn test:appsec:plugins:ci
+      - uses: ./.github/actions/node/latest
+      - run: yarn test:appsec:plugins:ci
+      - uses: codecov/codecov-action@v2
+
+  mongoose:
+    runs-on: ubuntu-latest
+    services:
+      mongodb:
+        image: circleci/mongo
+        ports:
+          - 27017:27017
+    env:
+      PLUGINS: mongoose
+      SERVICES: mongo
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/node/setup
+      - run: yarn install
+      - uses: ./.github/actions/node/oldest
+      - run: yarn test:appsec:plugins:ci
+      - uses: ./.github/actions/node/latest
+      - run: yarn test:appsec:plugins:ci
+      - uses: codecov/codecov-action@v2
+
   sourcing:
     runs-on: ubuntu-latest
     env:

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
@@ -670,7 +670,7 @@ jobs:
         ports:
           - 27017:27017
     env:
-      PLUGINS: mongodb-core
+      PLUGINS: mongodb-core|express-mongo-sanitize
       SERVICES: mongo
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/serverless-performance.yml b/.github/workflows/serverless-performance.yml
@@ -22,10 +22,13 @@ jobs:
         with:
           repository: DataDog/datadog-lambda-js
           path: datadog-lambda-js
+      - name: Install node-gyp
+        run: |
+          yarn global add node-gyp
       - name: Update package.json to the current ref
         run: |
           cd datadog-lambda-js
-          yarn add https://github.com/DataDog/dd-trace-js#refs/heads/$GITHUB_HEAD_REF --save-dev
+          yarn add --dev https://github.com/DataDog/dd-trace-js#refs/heads/${GITHUB_HEAD_REF}
       - name: Build the layer
         env:
           NODE_VERSION: ${{ matrix.node-version }}

diff --git a/benchmark/sirun/exporting-pipeline/index.js b/benchmark/sirun/exporting-pipeline/index.js
@@ -45,7 +45,8 @@ function createSpan (parent) {
   }
   const span = {
     context: () => context,
-    tracer: () => ({}),
+    tracer: () => { return { _service: 'exporting-pipeline-sirun' } },
+    setTag: () => {},
     _startTime: 1415926,
     _duration: 100
   }

diff --git a/benchmark/sirun/plugin-graphql/index.js b/benchmark/sirun/plugin-graphql/index.js
@@ -23,7 +23,7 @@ if (Number(process.env.WITH_ASYNC_HOOKS)) {
   require('async_hooks').createHook(hook).enable()
 }
 
-const graphql = require('../../../versions/graphql/node_modules/graphql')
+const graphql = require(`../../../versions/graphql`).get()
 const schema = require('./schema')
 
 const source = `

diff --git a/benchmark/sirun/plugin-graphql/schema.js b/benchmark/sirun/plugin-graphql/schema.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const graphql = require('../../../versions/graphql/node_modules/graphql')
+const graphql = require(`../../../versions/graphql`).get()
 
 const Human = new graphql.GraphQLObjectType({
   name: 'Human',