chore(tests): added ESM test for light-my-request (#7433)

pabloerhard · web-flow · commit da07fea5f8b7 · 2026-02-04T21:57:34.000+01:00
diff --git a/.github/workflows/apm-integrations.yml b/.github/workflows/apm-integrations.yml
@@ -154,6 +154,16 @@ jobs:
         with:
           dd_api_key: ${{ secrets.DD_API_KEY }}
 
+  body-parser:
+    runs-on: ubuntu-latest
+    env:
+      PLUGINS: body-parser
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: ./.github/actions/plugins/upstream
+        with:
+          dd_api_key: ${{ secrets.DD_API_KEY }}
+
   bullmq:
     runs-on: ubuntu-latest
     services:
@@ -672,7 +682,7 @@ jobs:
           dd_api_key: ${{ secrets.DD_API_KEY }}
 
   ldapjs:
-    runs-on: 'ubuntu-latest'
+    runs-on: ubuntu-latest
     env:
       PLUGINS: ldapjs
     steps:
@@ -681,6 +691,16 @@ jobs:
         with:
           dd_api_key: ${{ secrets.DD_API_KEY }}
 
+  light-my-request:
+    runs-on: ubuntu-latest
+    env:
+      PLUGINS: 'light-my-request'
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: ./.github/actions/plugins/test
+        with:
+          dd_api_key: ${{ secrets.DD_API_KEY }}
+
   limitd-client:
     runs-on: ubuntu-latest
     services:
@@ -702,7 +722,7 @@ jobs:
           dd_api_key: ${{ secrets.DD_API_KEY }}
 
   lodash:
-    runs-on: 'ubuntu-latest'
+    runs-on: ubuntu-latest
     env:
       PLUGINS: lodash
     steps:
@@ -1057,6 +1077,16 @@ jobs:
           api_key: ${{ secrets.DD_API_KEY }}
           service: dd-trace-js-tests
 
+  passport-http:
+    runs-on: ubuntu-latest
+    env:
+      PLUGINS: passport-http
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: ./.github/actions/plugins/test
+        with:
+          dd_api_key: ${{ secrets.DD_API_KEY }}
+
   postgres:
     runs-on: ubuntu-latest
     services:
diff --git a/packages/datadog-plugin-light-my-request/test/integration-test/client.spec.js b/packages/datadog-plugin-light-my-request/test/integration-test/client.spec.js
@@ -0,0 +1,48 @@
+'use strict'
+
+const assert = require('node:assert/strict')
+const {
+  FakeAgent,
+  sandboxCwd,
+  useSandbox,
+  checkSpansForServiceName,
+  spawnPluginIntegrationTestProcAndExpectExit,
+  varySandbox,
+} = require('../../../../integration-tests/helpers')
+const { withVersions } = require('../../../dd-trace/test/setup/mocha')
+
+describe('esm', () => {
+  let agent
+  let proc
+  let variants
+
+  withVersions('light-my-request', 'light-my-request', version => {
+    useSandbox([`'light-my-request@${version}'`], false, [
+      './packages/datadog-plugin-light-my-request/test/integration-test/*'])
+
+    beforeEach(async () => {
+      agent = await new FakeAgent().start()
+    })
+
+    before(async function () {
+      variants = varySandbox('server.mjs', 'inject', undefined, 'light-my-request')
+    })
+
+    afterEach(async () => {
+      proc && proc.kill()
+      await agent.stop()
+    })
+
+    for (const variant of varySandbox.VARIANTS) {
+      it(`is instrumented ${variant}`, async () => {
+        agent.assertMessageReceived(({ headers, payload }) => {
+          assert.strictEqual(headers.host, `127.0.0.1:${agent.port}`)
+          assert.ok(Array.isArray(payload))
+          assert.strictEqual(checkSpansForServiceName(payload, 'mariadb.query'), true)
+        })
+
+        proc = await spawnPluginIntegrationTestProcAndExpectExit(sandboxCwd(), variants[variant], agent.port)
+      }).timeout(20000)
+    }
+  })
+})
diff --git a/packages/datadog-plugin-light-my-request/test/integration-test/server.mjs b/packages/datadog-plugin-light-my-request/test/integration-test/server.mjs
@@ -0,0 +1,26 @@
+import 'dd-trace/init.js'
+import inject from 'light-my-request'
+import dc from 'dc-polyfill'
+
+const startServerCh = dc.channel('apm:http:server:request:start')
+
+let counter = 0
+startServerCh.subscribe(() => {
+  counter += 1
+})
+
+const dispatch = function (req, res) {
+  const reply = JSON.stringify({ counter })
+  res.writeHead(200, {
+    'Content-Type': 'application/json',
+    'Content-Length': reply.length,
+  })
+  res.end(reply)
+}
+
+inject(dispatch, { method: 'GET', url: '/' }, (err, res) => {
+  if (err) {
+    process.exit(1)
+  }
+  process.exit(0)
+})
diff --git a/packages/datadog-plugin-passport-http/test/integration-test/client.spec.js b/packages/datadog-plugin-passport-http/test/integration-test/client.spec.js
@@ -15,7 +15,7 @@ withVersions('passport-http', 'passport-http', version => {
       ['./packages/datadog-plugin-passport-http/test/integration-test/*'])
 
     before(function () {
-      variants = varySandbox('server.mjs', 'passport-http, BasicStrategy')
+      variants = varySandbox('server.mjs', 'passportHttp', 'BasicStrategy', 'passport-http')
     })
 
     beforeEach(async () => {
diff --git a/packages/datadog-plugin-passport-http/test/integration-test/server.mjs b/packages/datadog-plugin-passport-http/test/integration-test/server.mjs
@@ -1,7 +1,7 @@
 import 'dd-trace/init.js'
 import express from 'express'
 import passport from 'passport'
-import { BasicStrategy } from 'passport-http'
+import passportHttp from 'passport-http'
 import dc from 'dc-polyfill'
 
 const passportVerifyChannel = dc.channel('datadog:passport:verify:finish')
@@ -26,7 +26,7 @@ app.use((req, res, next) => {
   next()
 })
 
-passport.use('basic', new BasicStrategy({
+passport.use('basic', new passportHttp.BasicStrategy({
   usernameField: 'username',
   passwordField: 'password',
   passReqToCallback: false,
diff --git a/packages/dd-trace/test/plugins/plugin-structure.spec.js b/packages/dd-trace/test/plugins/plugin-structure.spec.js
@@ -38,6 +38,7 @@ const missingPlugins = [
   'datadog-plugin-vm', // vm does not produce spans
   'datadog-plugin-sequelize', // sequelize does not produce spans
   'datadog-plugin-body-parser', // body-parser does not produce spans
+  'datadog-plugin-light-my-request', // light-my-request does not produce spans
 ]
 
 // instrumentations that do not have a hook, but are still instrumented

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ const missingPlugins = [`
`38`	`38`	`'datadog-plugin-vm', // vm does not produce spans`
`39`	`39`	`'datadog-plugin-sequelize', // sequelize does not produce spans`
`40`	`40`	`'datadog-plugin-body-parser', // body-parser does not produce spans`
	`41`	`+ 'datadog-plugin-light-my-request', // light-my-request does not produce spans`
`41`	`42`	`]`
`42`	`43`
`43`	`44`	`// instrumentations that do not have a hook, but are still instrumented`