latest fixes and additional tests

plugins/node/instrumentation-mongoose/.tav.yml

@@ -1,10 +1,6 @@
 mongoose:
   - versions:
-      include: ">=5.10.19 <6"
-      mode: latest-minors
-    commands: npm run test-v5-v6
-  - versions:
-      include: ">=6.7.5 <7"
+      include: ">=5.9.7 <7"
       mode: latest-minors
     commands: npm run test-v5-v6
   - versions:

plugins/node/instrumentation-mongoose/src/mongoose.ts

@@ -99,7 +99,7 @@ export class MongooseInstrumentation extends InstrumentationBase<MongooseInstrum
   protected init(): InstrumentationModuleDefinition {
     const module = new InstrumentationNodeModuleDefinition(
       'mongoose',
-      ['>=5.10.19 <6', '>=6.7.5 <9'],
+      ['>=5.9.7 <9'],
       this.patch.bind(this),
       this.unpatch.bind(this)
     );
@@ -343,8 +343,7 @@ export class MongooseInstrumentation extends InstrumentationBase<MongooseInstrum
         ) {
           return original.apply(this, arguments);
         }
-
-        if (options instanceof Function) {
+        if (typeof options === 'function') {
           callback = options;
           options = undefined;
         }

plugins/node/instrumentation-mongoose/src/utils.ts

@@ -105,6 +105,8 @@ export function handleCallbackResponse(
   let callbackArgumentIndex = 0;
   if (args.length === 2) {
     callbackArgumentIndex = 1;
+  } else if (args.length === 3){
+    callbackArgumentIndex = 2;
   }
 
   args[callbackArgumentIndex] = (err: Error, response: any): any => {

plugins/node/instrumentation-mongoose/test/mongoose-common.test.ts

@@ -75,7 +75,6 @@ describe('mongoose instrumentation [common]', () => {
       },
     });
     await loadUsers();
-    await User.createIndexes();
     instrumentation.enable();
   });
 

plugins/node/instrumentation-mongoose/test/mongoose-v5-v6.test.ts

@@ -72,7 +72,6 @@ describe('mongoose instrumentation [v5/v6]', () => {
       },
     });
     await loadUsers();
-    await User.createIndexes();
     instrumentation.enable();
   });
 
@@ -152,6 +151,61 @@ describe('mongoose instrumentation [v5/v6]', () => {
     });
   });
 
+  describe('when insertMany call has callback', async () => {
+    it('instrumenting insertMany operation with generic options and callback', done => {
+      const documents = [
+        {
+          firstName: 'John',
+          lastName: 'Doe',
+          email: '[email protected]',
+        },
+        {
+          firstName: 'Jane',
+          lastName: 'Doe',
+          email: '[email protected]',
+        },
+      ];
+      // @ts-ignore - v7 removed callback support
+      // https://mongoosejs.com/docs/migrating_to_7.html#dropped-callback-support
+      User.insertMany(documents, { ordered: true }, () => {
+        const spans = getTestSpans();
+        expect(spans.length).toBe(1);
+        assertSpan(spans[0] as ReadableSpan);
+        expect(spans[0].attributes[SEMATTRS_DB_OPERATION]).toBe('insertMany');
+        const statement = getStatement(spans[0] as ReadableSpan);
+        expect(statement.documents).toEqual(documents);
+        expect(statement.options.ordered).toEqual(true);
+        done();
+      });
+    });
+
+    it('instrumenting insertMany operation with only callback', done => {
+      const documents = [
+        {
+          firstName: 'John',
+          lastName: 'Doe',
+          email: '[email protected]',
+        },
+        {
+          firstName: 'Jane',
+          lastName: 'Doe',
+          email: '[email protected]',
+        },
+      ];
+      // @ts-ignore - v7 removed callback support
+      // https://mongoosejs.com/docs/migrating_to_7.html#dropped-callback-support
+      User.insertMany(documents, () => {
+        const spans = getTestSpans();
+        expect(spans.length).toBe(1);
+        assertSpan(spans[0] as ReadableSpan);
+        expect(spans[0].attributes[SEMATTRS_DB_OPERATION]).toBe('insertMany');
+        const statement = getStatement(spans[0] as ReadableSpan);
+        expect(statement.documents).toEqual(documents);
+        done();
+      });
+    });
+  });
+
   describe('remove operation', () => {
     it('instrumenting remove operation [deprecated]', async () => {
       const user = await User.findOne({ email: '[email protected]' });

plugins/node/instrumentation-mongoose/test/mongoose-v7-v8.test.ts

@@ -69,7 +69,6 @@ describe('mongoose instrumentation [v7/v8]', () => {
       },
     });
     await loadUsers();
-    await User.createIndexes();
     instrumentation.enable();
   });
 

plugins/node/instrumentation-mongoose/test/user.ts

@@ -15,8 +15,6 @@
  */
 import { Schema, Document } from 'mongoose';
 import * as mongoose from 'mongoose';
-import { context } from '@opentelemetry/api';
-import { suppressTracing } from '@opentelemetry/core';
 
 export interface IUser extends Document {
   email: string;