feat: added support for mongoose v8 (#1083)

refs 158386 [ci all-tests]
instana · Mar 21, 2024 · 3996301 · 3996301
1 parent 1a2b67d
commit 3996301
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 45 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -173,9 +173,10 @@
     "mongodb": "^6.1.0",
     "mongodb-v4": "npm:mongodb@^4.16.0",
     "mongodb-v5": "npm:mongodb@^5.4.0",
-    "mongoose": "^7.1.0",
-    "mongoose-v5": "npm:mongoose@^5.13.17",
-    "mongoose-v6": "npm:mongoose@^6.11.1",
+    "mongoose": "^8.2.2",
+    "mongoose-v5": "npm:mongoose@^5.13.22",
+    "mongoose-v6": "npm:mongoose@^6.12.7",
+    "mongoose-v7": "npm:mongoose@^7.6.10",
     "morgan": "^1.10.0",
     "mssql": "^10.0.1",
     "mssql-v9": "npm:mssql@^9.0.1",

diff --git a/packages/collector/test/tracing/database/mongoose/app.js b/packages/collector/test/tracing/database/mongoose/app.js
@@ -6,8 +6,6 @@
 'use strict';
 
 require('./mockVersion');
-const isLatest = process.env.MONGOOSE_VERSION === 'latest';
-
 require('../../../..')();
 
 const bodyParser = require('body-parser');
@@ -47,7 +45,7 @@ mongoose.model(
 );
 const Person = mongoose.model('Person');
 
-if (isLatest) {
+if (process.env.MONGOOSE_VERSION === 'latest' || process.env.MONGOOSE_VERSION === 'v7') {
   (async () => {
     try {
       await mongoose.connect(connectString);

diff --git a/packages/collector/test/tracing/database/mongoose/app.mjs b/packages/collector/test/tracing/database/mongoose/app.mjs
@@ -5,8 +5,6 @@
 
 'use strict';
 
-const isLatest = process.env.MONGOOSE_VERSION === 'latest';
-
 import bodyParser from 'body-parser';
 import mongoose from 'mongoose';
 import express from 'express';
@@ -45,7 +43,7 @@ mongoose.model(
 );
 const Person = mongoose.model('Person');
 
-if (isLatest) {
+if (process.env.MONGOOSE_VERSION === 'latest' || process.env.MONGOOSE_VERSION === 'v7') {
   (async () => {
     try {
       await mongoose.connect(connectString);

diff --git a/packages/collector/test/tracing/database/mongoose/test.js b/packages/collector/test/tracing/database/mongoose/test.js
@@ -20,12 +20,15 @@ const USE_ATLAS = process.env.USE_ATLAS === 'true';
 
 // v5 uses mongodb v3
 // v6 uses mongodb v4
-// latest (v7) uses mongodb v5
+// v7 uses mongodb v5
+// v8 uses mongodb v6
 
-['latest', 'v6', 'v5'].forEach(version => {
+['latest', 'v7', 'v6', 'v5'].forEach(version => {
   let mochaSuiteFn = supportedVersion(process.versions.node) ? describe : describe.skip;
 
   if (version === 'latest') {
+    mochaSuiteFn = semver.lt(process.versions.node, '16.0.0') ? describe.skip : mochaSuiteFn;
+  } else if (version === 'v7') {
     mochaSuiteFn = semver.lt(process.versions.node, '14.0.0') ? describe.skip : mochaSuiteFn;
   } else if (version === 'v6') {
     mochaSuiteFn = semver.lt(process.versions.node, '12.0.0') ? describe.skip : mochaSuiteFn;