Reinstated flushInterval for prisma and azure ESM tests

Author: pabloerhard

integration-tests/helpers/fake-agent.js

@@ -123,7 +123,7 @@ module.exports = class FakeAgent extends EventEmitter {
   // where multiple payloads are generated, and only one is expected to have the proper span (ie next.request),
   // but it't not guaranteed to be the last one (so, expectedMessageCount would not be helpful).
   // It can still fail if it takes longer than `timeout` duration or if none pass the assertions (timeout still called)
-  assertMessageReceived (fn, timeout, expectedMessageCount = 1, resolveAtFirstSuccess = 1) {
+  assertMessageReceived (fn, timeout, expectedMessageCount = 1, resolveAtFirstSuccess = true) {
     timeout = timeout || 30000
     let resultResolve
     let resultReject

packages/datadog-plugin-azure-event-hubs/test/integration-test/client.spec.js

@@ -9,6 +9,8 @@ const {
 const { withVersions } = require('../../../dd-trace/test/setup/mocha')
 const { assert, expect } = require('chai')
 
+const spawnEnv = { DD_TRACE_FLUSH_INTERVAL: '2000' }
+
 describe('esm', () => {
   let agent
   let proc
@@ -42,7 +44,7 @@ describe('esm', () => {
         assert.strictEqual(checkSpansForServiceName(payload, 'azure.eventhubs.send'), true)
       })
 
-      proc = await spawnPluginIntegrationTestProc(sandbox.folder, 'server.mjs', agent.port)
+      proc = await spawnPluginIntegrationTestProc(sandbox.folder, 'server.mjs', agent.port, spawnEnv)
       await res
     }).timeout(20000)
 
@@ -86,15 +88,15 @@ describe('esm', () => {
         assert.strictEqual(parseLinks(payload[4][0]).length, 2)
       })
 
-      proc = await spawnPluginIntegrationTestProc(sandbox.folder, 'server.mjs', agent.port)
+      proc = await spawnPluginIntegrationTestProc(sandbox.folder, 'server.mjs', agent.port, spawnEnv)
       await res
     }).timeout(60000)
 
     it('does not add span links when they are disabled', async () => {
       const res = agent.assertMessageReceived(({ headers, payload }) => {
         expect(payload[2][0]).to.not.have.property('_dd.span_links')
       })
-      const envVar = { DD_TRACE_AZURE_EVENTHUBS_BATCH_LINKS_ENABLED: false }
+      const envVar = { DD_TRACE_AZURE_EVENTHUBS_BATCH_LINKS_ENABLED: false, DD_TRACE_FLUSH_INTERVAL: '2000' }
       proc = await spawnPluginIntegrationTestProc(sandbox.folder, 'server.mjs', agent.port, undefined, envVar)
       await res
     }).timeout(60000)

packages/datadog-plugin-azure-service-bus/test/integration-test/client.spec.js

@@ -8,6 +8,8 @@ const {
 const { withVersions } = require('../../../dd-trace/test/setup/mocha')
 const { assert } = require('chai')
 
+const spawnEnv = { DD_TRACE_FLUSH_INTERVAL: '2000' }
+
 describe('esm', () => {
   let agent
   let proc
@@ -40,7 +42,7 @@ describe('esm', () => {
         assert.isArray(payload)
       })
 
-      proc = await spawnPluginIntegrationTestProc(sandbox.folder, 'server.mjs', agent.port)
+      proc = await spawnPluginIntegrationTestProc(sandbox.folder, 'server.mjs', agent.port, spawnEnv)
 
       await res
     }).timeout(20000)
@@ -151,7 +153,7 @@ describe('esm', () => {
         assert.strictEqual(parseLinks(payload[22][0]).length, 2)
       })
 
-      proc = await spawnPluginIntegrationTestProc(sandbox.folder, 'server.mjs', agent.port)
+      proc = await spawnPluginIntegrationTestProc(sandbox.folder, 'server.mjs', agent.port, spawnEnv)
 
       await res
     }).timeout(60000)

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

@@ -72,7 +72,9 @@ describe('esm', () => {
       // TODO: Integrate the assertions into the spawn command by adding a
       // callback. It should end the process when the assertions are met. That
       // way we can remove the Promise.all and the procPromise.then().
-      const procPromise = spawnPluginIntegrationTestProc(sandbox.folder, 'server.mjs', agent.port)
+      const procPromise = spawnPluginIntegrationTestProc(sandbox.folder, 'server.mjs', agent.port, {
+        DD_TRACE_FLUSH_INTERVAL: '2000'
+      })
 
       await Promise.all([
         procPromise.then((res) => {