From fcecd865bf9dec0b79a965d6bf20d7279a7f2ac0 Mon Sep 17 00:00:00 2001
From: Crystal Magloire <crystal.magloire@datadoghq.com>
Date: Thu, 24 Oct 2024 13:20:44 -0400
Subject: [PATCH] Separating Plugin Tests to Their Own CI Run (#4822)

* separating plugin tests to their own run
---
 .github/workflows/plugins.yml                 | 69 ++++++++++++++++++-
 packages/dd-trace/test/plugins/externals.json | 12 ++++
 2 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index dfc032a611..c71ff2a244 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -221,6 +221,14 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/plugins/test
 
+  body-parser:
+    runs-on: ubuntu-latest
+    env:
+      PLUGINS: body-parser
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/plugins/test
+
   bunyan:
     runs-on: ubuntu-latest
     env:
@@ -259,6 +267,14 @@ jobs:
       - run: yarn test:plugins:ci
       - uses: codecov/codecov-action@v2
 
+  cookie-parser:
+    runs-on: ubuntu-latest
+    env:
+      PLUGINS: cookie-parser
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/plugins/test
+
   couchbase:
     strategy:
       matrix:
@@ -366,7 +382,22 @@ jobs:
   express:
     runs-on: ubuntu-latest
     env:
-      PLUGINS: express|body-parser|cookie-parser
+      PLUGINS: express
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/plugins/test
+
+  express-mongo-sanitize:
+    runs-on: ubuntu-latest
+    services:
+      mongodb:
+        image: circleci/mongo
+        ports:
+          - 27017:27017
+    env:
+      PLUGINS: express-mongo-sanitize
+      PACKAGE_NAMES: express-mongo-sanitize
+      SERVICES: mongo
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/plugins/test
@@ -547,6 +578,23 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/plugins/test
+  
+  mariadb:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mariadb:10.4
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+          MYSQL_DATABASE: 'db'
+        ports:
+          - 3306:3306
+    env:
+      PLUGINS: mariadb
+      SERVICES: mariadb
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/plugins/test
 
   memcached:
     runs-on: ubuntu-latest
@@ -641,12 +689,29 @@ jobs:
         ports:
           - 3306:3306
     env:
-      PLUGINS: mysql|mysql2|mariadb # TODO: move mysql2 to its own job
+      PLUGINS: mysql
       SERVICES: mysql
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/plugins/test
 
+  mysql2:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mariadb:10.4
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+          MYSQL_DATABASE: 'db'
+        ports:
+          - 3306:3306
+    env:
+      PLUGINS: mysql2
+      SERVICES: mysql2
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/plugins/test
+
   net:
     runs-on: ubuntu-latest
     env:
diff --git a/packages/dd-trace/test/plugins/externals.json b/packages/dd-trace/test/plugins/externals.json
index e3d3e696a1..0f98a05409 100644
--- a/packages/dd-trace/test/plugins/externals.json
+++ b/packages/dd-trace/test/plugins/externals.json
@@ -47,6 +47,18 @@
       "versions": [">=3"]
     }
   ],
+  "body-parser": [
+    {
+      "name": "express",
+      "versions": ["^4"]
+    }
+  ],
+  "cookie-parser": [
+    {
+      "name": "express",
+      "versions": ["^4"]
+    }
+  ],
   "cypress": [
     {
       "name": "cypress",