test: load helpers directly instead of using globals (#5962)

* test: load helpers directly instead of using globals

As drive-by also import a couple of Node.js modules with the
explicit `node:` prefix. That makes it clear it is a Node.js module
that is loaded.

The benefit over loading the helpers directly is that it allows to
read the API in an IDE and to jump to the code directly.

* test: make peer service test robuster

The test could have failed with two done calls. This is now resolved
by stricter checking if the called method is a promise or a callback
based one.
Those calls are awaited before finishing the test.

Author: BridgeAR

eslint.config.mjs

@@ -196,9 +196,6 @@ export default [
         expect: 'readonly',
         proxyquire: 'readonly',
         withVersions: 'readonly',
-        withPeerService: 'readonly',
-        withNamingSchema: 'readonly',
-        withExports: 'readonly'
       }
     },
     rules: {

packages/datadog-plugin-aerospike/test/index.spec.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { withNamingSchema, withPeerService, withVersions } = require('../../dd-trace/test/setup/mocha')
 const agent = require('../../dd-trace/test/plugins/agent')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
 const { expectedSchema, rawExpectedSchema } = require('./naming')
@@ -53,10 +54,11 @@ describe('Plugin', () => {
           withPeerService(
             () => tracer,
             'aerospike',
-            () => aerospike.connect(config).then(client => {
-              return client.put(key, { i: 123 })
-                .then(() => client.close(false))
-            }),
+            async () => {
+              const client = await aerospike.connect(config)
+              await client.put(key, { i: 123 })
+              return client.close(false)
+            },
             'test',
             'aerospike.namespace'
           )
@@ -284,10 +286,11 @@ describe('Plugin', () => {
               })
           })
           withNamingSchema(
-            () => aerospike.connect(config).then(client => {
-              return client.put(key, { i: 123 })
-                .then(() => client.close(false))
-            }),
+            async () => {
+              const client = await aerospike.connect(config)
+              await client.put(key, { i: 123 })
+              return client.close(false)
+            },
             rawExpectedSchema.command
           )
         })
@@ -318,10 +321,11 @@ describe('Plugin', () => {
         })
 
         withNamingSchema(
-          () => aerospike.connect(config).then(client => {
-            return client.put(key, { i: 123 })
-              .then(() => client.close(false))
-          }),
+          async () => {
+            const client = await aerospike.connect(config)
+            await client.put(key, { i: 123 })
+            return client.close(false)
+          },
           {
             v0: {
               opName: 'aerospike.command',

packages/datadog-plugin-amqp10/test/index.spec.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { withNamingSchema, withPeerService, withVersions } = require('../../dd-trace/test/setup/mocha')
 const agent = require('../../dd-trace/test/plugins/agent')
 const { ERROR_MESSAGE, ERROR_STACK, ERROR_TYPE } = require('../../dd-trace/src/constants')
 
@@ -64,7 +65,10 @@ describe('Plugin', () => {
           withPeerService(
             () => tracer,
             'amqp10',
-            () => sender.send({ key: 'value' }),
+            (done) => {
+              sender.send({ key: 'value' })
+              done()
+            },
             'localhost',
             'out.host'
           )

packages/datadog-plugin-amqplib/test/index.spec.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { withNamingSchema, withPeerService, withVersions } = require('../../dd-trace/test/setup/mocha')
 const agent = require('../../dd-trace/test/plugins/agent')
 const { ERROR_MESSAGE, ERROR_STACK, ERROR_TYPE } = require('../../dd-trace/src/constants')
 const id = require('../../dd-trace/src/id')
@@ -60,7 +61,7 @@ describe('Plugin', () => {
             withPeerService(
               () => tracer,
               'amqplib',
-              () => channel.assertQueue(queue, {}, () => {}),
+              (done) => channel.assertQueue(queue, {}, done),
               'localhost',
               'out.host'
             )
@@ -138,7 +139,7 @@ describe('Plugin', () => {
             withPeerService(
               () => tracer,
               'amqplib',
-              () => channel.assertQueue(queue, {}, () => {}),
+              (done) => channel.assertQueue(queue, {}, done),
               'localhost',
               'out.host'
             )

packages/datadog-plugin-apollo/test/index.spec.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const { expect } = require('chai')
+const { withNamingSchema, withVersions } = require('../../dd-trace/test/setup/mocha')
 const agent = require('../../dd-trace/test/plugins/agent.js')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants.js')
 const { expectedSchema, rawExpectedSchema } = require('./naming.js')
@@ -443,14 +444,12 @@ describe('Plugin', () => {
         })
 
         withNamingSchema(
-          () => {
+          async () => {
             const operationName = 'MyQuery'
             const source = `query ${operationName} { hello(name: "world") }`
             const variableValues = { who: 'world' }
-            gateway()
-              .then(({ executor }) => {
-                return execute(executor, source, variableValues, operationName).then(() => {})
-              })
+            const { executor } = await gateway()
+            return execute(executor, source, variableValues, operationName)
           },
           rawExpectedSchema.server,
           {

packages/datadog-plugin-aws-sdk/test/kinesis.spec.js

@@ -2,6 +2,7 @@
 'use strict'
 
 const sinon = require('sinon')
+const { withNamingSchema, withVersions } = require('../../dd-trace/test/setup/mocha')
 const agent = require('../../dd-trace/test/plugins/agent')
 const { setup } = require('./spec_helpers')
 const helpers = require('./kinesis_helpers')

packages/datadog-plugin-aws-sdk/test/lambda.spec.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const JSZip = require('jszip')
+const { withNamingSchema, withVersions } = require('../../dd-trace/test/setup/mocha')
 const agent = require('../../dd-trace/test/plugins/agent')
 const { setup } = require('./spec_helpers')
 const { rawExpectedSchema } = require('./lambda-naming')

packages/datadog-plugin-aws-sdk/test/s3.spec.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { withNamingSchema, withPeerService, withVersions } = require('../../dd-trace/test/setup/mocha')
 const agent = require('../../dd-trace/test/plugins/agent')
 const { setup } = require('./spec_helpers')
 const axios = require('axios')
@@ -62,7 +63,7 @@ describe('Plugin', () => {
             Bucket: bucketName,
             Key: 'test-key',
             Body: 'test body'
-          }, (err) => err && done(err)),
+          }, done),
           bucketName, 'bucketname')
 
         withNamingSchema(

packages/datadog-plugin-aws-sdk/test/sns.spec.js

@@ -3,6 +3,7 @@
 
 const sinon = require('sinon')
 const semver = require('semver')
+const { withNamingSchema, withPeerService, withVersions } = require('../../dd-trace/test/setup/mocha')
 const agent = require('../../dd-trace/test/plugins/agent')
 const { setup } = require('./spec_helpers')
 const { rawExpectedSchema } = require('./sns-naming')
@@ -354,7 +355,7 @@ describe('Sns', function () {
         (done) => sns.publish({
           TopicArn,
           Message: 'message 1'
-        }, (err) => err && done()),
+        }, done),
         'TestTopic', 'topicname')
 
       withNamingSchema(

packages/datadog-plugin-aws-sdk/test/sqs.spec.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const sinon = require('sinon')
+const { withNamingSchema, withPeerService, withVersions } = require('../../dd-trace/test/setup/mocha')
 const agent = require('../../dd-trace/test/plugins/agent')
 const { setup } = require('./spec_helpers')
 const semver = require('semver')
@@ -73,7 +74,7 @@ describe('Plugin', () => {
           (done) => sqs.sendMessage({
             MessageBody: 'test body',
             QueueUrl
-          }, (err) => err && done(err)),
+          }, done),
           'SQS_QUEUE_NAME',
           'queuename'
         )