From 759edcb66f9388f05b9c7571218869cd7c88418e Mon Sep 17 00:00:00 2001
From: Crystal Magloire <crys.magloire@gmail.com>
Date: Thu, 24 Oct 2024 09:43:36 -0400
Subject: [PATCH] changing plugin yml with matrices

---
 .github/workflows/plugins.yml                 | 28 ++++++++
 .../src/helpers/versions.json                 | 68 +++++++++----------
 2 files changed, 61 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/plugins.yml b/.github/workflows/plugins.yml
index 83b729bd1ad..b30f9c05327 100644
--- a/.github/workflows/plugins.yml
+++ b/.github/workflows/plugins.yml
@@ -445,6 +445,34 @@ jobs:
         uses: ./.github/actions/testagent/logs
       - uses: codecov/codecov-action@v3
 
+  elasticsearch:
+    needs: 
+      - versions
+    strategy:
+      matrix: ${{fromJson(needs.versions.outputs.matrices).matrices.elasticsearch}}
+    runs-on: ubuntu-latest
+    services:
+      elasticsearch:
+        image: elasticsearch:7.17.22
+        env:
+          discovery.type: single-node
+        ports:
+          - 9200:9200
+    env:
+      PLUGINS: elasticsearch
+      SERVICES: elasticsearch
+      PACKAGE_VERSION_RANGE: ${{ matrix.range }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/testagent/start
+      - uses: ./.github/actions/node/setup
+      - uses: ./.github/actions/install
+      - uses: ./.github/actions/node/latest
+      - run: yarn test:plugins:ci
+      - if: always()
+        uses: ./.github/actions/testagent/logs
+      - uses: codecov/codecov-action@v3
+
   express:
     needs: 
       - versions
diff --git a/packages/datadog-instrumentations/src/helpers/versions.json b/packages/datadog-instrumentations/src/helpers/versions.json
index 39fd0b9dbae..a36ab380e95 100644
--- a/packages/datadog-instrumentations/src/helpers/versions.json
+++ b/packages/datadog-instrumentations/src/helpers/versions.json
@@ -9,14 +9,12 @@
           "2.4.2 - 2.6.12",
           "3.0.0 - 3.2.7",
           "3.0.7 - 3.2.7",
-          "4.0.0 - 4.4.2" 
+          "4.0.0 - 4.4.3"
         ],
         "18": [
-          "4.4.1 - 4.4.2"
+          "4.4.1 - 4.4.3"
         ],
-        "strict": [
-
-        ]
+        "strict": []
       }
     },
     "aerospike": {
@@ -26,14 +24,14 @@
       "node-versions": {
         "16": [
           "4.0.0 - 4.0.5"
-
         ],
         "18": [
-          "5.2.0 - 5.7.0"
+          "5.2.0 - 5.12.1"
         ],
         "20": [
-          "5.12.1"
-        ]}
+          "5.12.1 - 5.12.1"
+        ]
+      }
     },
     "amqp10": {
       "plugin-name": "amqp10",
@@ -53,7 +51,7 @@
       "min-version": "0.1.0",
       "range": [
         "0.1.0 - 0.54.1",
-        "2.0.0 - 2.9.1"
+        "2.0.0 - 2.9.3"
       ]
     },
     "@aws-sdk/smithy-client": {
@@ -109,13 +107,13 @@
     "cookie-parser": {
       "min-version": "1.0.0",
       "range": [
-        "1.0.0 - 1.4.6"
+        "1.0.0 - 1.4.7"
       ]
     },
     "cookie": {
       "min-version": "0.0.0",
       "range": [
-        "0.0.0 - 0.6.0"
+        "0.0.0 - 0.7.2"
       ]
     },
     "@cucumber/cucumber": {
@@ -146,7 +144,7 @@
         "10.0.0 - 10.11.0",
         "11.0.0 - 11.2.0",
         "12.0.0 - 12.17.4",
-        "13.0.0 - 13.14.2"
+        "13.0.0 - 13.15.0"
       ]
     },
     "@elastic/elasticsearch": {
@@ -156,7 +154,7 @@
         "5.6.16 - 5.6.22",
         "6.7.0 - 6.8.8",
         "7.0.0 - 7.17.14",
-        "8.0.0 - 8.14.1"
+        "8.0.0 - 8.15.1"
       ]
     },
     "elasticsearch": {
@@ -182,7 +180,7 @@
       "plugin-name": "express",
       "min-version": "4.0.0",
       "range": [
-        "4.0.0 - 4.21.0"
+        "4.0.0 - 4.21.1"
       ]
     },
     "fastify": {
@@ -207,7 +205,7 @@
         "6.0.0 - 6.4.0",
         "7.0.0 - 7.7.0",
         "8.0.0 - 8.2.2",
-        "9.0.0 - 9.0.1"
+        "9.0.0 - 9.1.0"
       ]
     },
     "generic-pool": {
@@ -225,14 +223,14 @@
         "1.2.0 - 1.7.3",
         "2.0.0 - 2.19.4",
         "3.0.0 - 3.7.5",
-        "4.0.0 - 4.7.2"
+        "4.0.0 - 4.8.0"
       ]
     },
     "@graphql-tools/executor": {
       "min-version": "0.0.14",
       "range": [
         "0.0.14 - 0.0.20",
-        "1.0.0 - 1.3.1"
+        "1.0.0 - 1.3.2"
       ]
     },
     "graphql": {
@@ -249,7 +247,7 @@
       "plugin-name": "grpc",
       "min-version": "1.0.3",
       "range": [
-        "1.0.3 - 1.11.3"
+        "1.0.3 - 1.12.2"
       ]
     },
     "@hapi/hapi": {
@@ -410,7 +408,7 @@
         "3.3.0 - 3.7.4",
         "4.0.0 - 4.17.2",
         "5.0.0 - 5.9.2",
-        "6.0.0 - 6.9.0"
+        "6.0.0 - 6.10.0"
       ]
     },
     "mongoose": {
@@ -421,7 +419,7 @@
         "5.0.0 - 5.13.22",
         "6.0.0 - 6.13.3",
         "7.0.0 - 7.8.2",
-        "8.0.0 - 8.6.3"
+        "8.0.0 - 8.7.2"
       ]
     },
     "mquery": {
@@ -460,7 +458,7 @@
         "11.0.0 - 11.1.4",
         "12.0.0 - 12.3.4",
         "13.0.0 - 13.5.7",
-        "14.0.0 - 14.2.13"
+        "14.0.0 - 14.2.16"
       ]
     },
     "openai": {
@@ -468,7 +466,7 @@
       "min-version": "3.0.0",
       "range": [
         "3.0.0 - 3.3.0",
-        "4.0.0 - 4.64.0"
+        "4.0.0 - 4.68.2"
       ]
     },
     "@opensearch-project/opensearch": {
@@ -530,7 +528,7 @@
         "6.0.0 - 6.14.0",
         "7.0.0 - 7.11.0",
         "8.0.0 - 8.21.0",
-        "9.0.0 - 9.4.0"
+        "9.0.0 - 9.5.0"
       ]
     },
     "pino-pretty": {
@@ -546,21 +544,21 @@
         "8.0.0 - 8.1.0",
         "9.0.0 - 9.4.1",
         "10.0.0 - 10.3.1",
-        "11.0.0 - 11.2.2"
+        "11.0.0 - 11.3.0"
       ]
     },
     "@playwright/test": {
       "min-version": "0.0.0",
       "range": [
         "0.0.0 - 0.1111.0",
-        "1.12.0 - 1.47.2"
+        "1.12.0 - 1.48.1"
       ]
     },
     "playwright": {
       "min-version": "0.0.0",
       "range": [
         "0.0.0 - 0.18.0",
-        "1.0.0 - 1.47.2"
+        "1.0.0 - 1.48.1"
       ]
     },
     "promise-js": {
@@ -663,13 +661,13 @@
     "sequelize": {
       "min-version": "0.0.0",
       "range": [
-        "0.0.0 - 0.4.3",
+        "0.0.0 - 0.2.6",
         "1.0.0 - 1.7.11",
         "2.0.0 - 2.1.3",
         "3.0.0 - 3.35.1",
         "4.0.0 - 4.44.4",
         "5.1.0 - 5.22.5",
-        "6.1.0 - 6.37.3"
+        "6.1.0 - 6.37.4"
       ]
     },
     "sharedb": {
@@ -680,7 +678,7 @@
         "2.0.0 - 2.2.6",
         "3.0.0 - 3.3.2",
         "4.0.0 - 4.1.5",
-        "5.0.0 - 5.0.4"
+        "5.0.0 - 5.1.0"
       ]
     },
     "tedious": {
@@ -717,7 +715,7 @@
         "3.0.0 - 3.3.6",
         "4.0.0 - 4.16.0",
         "5.0.0 - 5.28.4",
-        "6.0.0 - 6.19.8"
+        "6.0.0 - 6.20.1"
       ]
     },
     "vitest": {
@@ -725,7 +723,7 @@
       "range": [
         "0.0.0 - 0.34.6",
         "1.0.0 - 1.6.0",
-        "2.0.0 - 2.1.1"
+        "2.0.0 - 2.1.3"
       ]
     },
     "@vitest/runner": {
@@ -733,7 +731,7 @@
       "range": [
         "0.28.0 - 0.34.7",
         "1.0.0 - 1.6.0",
-        "2.0.0 - 2.1.1"
+        "2.0.0 - 2.1.3"
       ]
     },
     "when": {
@@ -749,8 +747,8 @@
       "range": [
         "1.0.0 - 1.1.2",
         "2.0.0 - 2.4.7",
-        "3.0.0 - 3.14.2"
+        "3.0.0 - 3.15.0"
       ]
     }
   }
-}
+}
\ No newline at end of file