chore: add ESM tests for instrumentations missing them

packages/datadog-instrumentations/test/knex.spec.js

@@ -3,6 +3,7 @@
 const { expect } = require('chai')
 const { describe, it, beforeEach, afterEach } = require('mocha')
 
+const agent = require('../../dd-trace/test/plugins/agent')
 const { storage } = require('../../datadog-core')
 const { withVersions } = require('../../dd-trace/test/setup/mocha')
 
@@ -16,27 +17,36 @@ describe('Instrumentation', () => {
   describe('knex', () => {
     withVersions('knex', 'knex', version => {
       describe('without configuration', () => {
+        before(async () => {
+          await agent.load()
+        })
+
         beforeEach(() => {
           knex = require(`../../../versions/knex@${version}`).get()
           client = knex({
-            client: 'pg',
+            client: 'sqlite3',
             connection: {
               filename: ':memory:'
             }
           })
         })
 
         afterEach(() => client.destroy())
+        after(async () => {
+          await agent.close()
+        })
 
-        it('should propagate context', () =>
-          storage('legacy').run(store, () =>
-            client.raw('PRAGMA user_version')
-              .finally(() => {
-                expect(storage('legacy').getStore()).to.equal(store)
-              })
-              .catch(() => {})
+        it('should propagate context', async () => {
+          let isInstrumented = false
+
+          await storage('legacy').run(store, () =>
+            client.raw('PRAGMA user_version').then(() => {
+              isInstrumented = storage('legacy').getStore() === store
+            }).catch(() => {})
           )
-        )
+
+          expect(isInstrumented).to.equal(true)
+        })
       })
     })
   })

packages/datadog-plugin-knex/test/integration-test/client.spec.js

@@ -11,7 +11,7 @@ withVersions('knex', 'knex', version => {
   describe('ESM', () => {
     let variants, proc, agent
 
-    useSandbox([`'knex@${version}'`, 'express'], false,
+    useSandbox([`'knex@${version}'`, 'express', 'sqlite3'], false,
       ['./packages/datadog-plugin-knex/test/integration-test/*'])
 
     before(function () {

packages/datadog-plugin-knex/test/integration-test/server.mjs

@@ -1,22 +1,31 @@
 import 'dd-trace/init.js'
 import express from 'express'
 import knex from 'knex'
-import dc from 'dc-polyfill'
+import { AsyncLocalStorage } from 'async_hooks'
 
-const startRawQueryCh = dc.channel('datadog:knex:raw:start')
 let counter = 0
-startRawQueryCh.subscribe(() => {
-  counter += 1
-})
-
+const asyncStore = new AsyncLocalStorage()
 const app = express()
 
-const db = knex({ client: 'pg' })
+const db = knex({
+  client: 'sqlite3',
+  connection: { filename: ':memory:' }
+})
 
 app.get('/', (req, res) => {
-  db.raw('select 1')
-  res.setHeader('X-Counter', counter)
-  res.end('ok')
+  const store = 'knex-test-store'
+
+  asyncStore.run(store, () => {
+    db.raw('PRAGMA user_version')
+      .then(() => {
+        if (asyncStore.getStore() === store) {
+          counter += 1
+        }
+        res.setHeader('X-Counter', counter)
+        res.end('ok')
+      })
+      .catch(() => {})
+  })
 })
 
 const server = app.listen(0, () => {