Bump tap version

package.json

@@ -122,7 +122,7 @@
     "ca-gen": "./bin/update-ca-bundle.sh",
     "docker-env": "./bin/docker-env-vars.sh",
     "docs": "npm ci && jsdoc -c ./jsdoc-conf.json --private -r .",
-    "integration": "npm run prepare-test && npm run sub-install && time tap --no-esm test/integration/**/**/*.tap.js --timeout=180 --no-coverage",
+    "integration": "npm run prepare-test && npm run sub-install && time tap test/integration/**/**/*.tap.js --timeout=180 --no-coverage",
     "prepare-test": "npm run ca-gen && npm run ssl && npm run docker-env",
     "lint": "eslint ./*.js lib test bin",
     "public-docs": "npm ci && jsdoc -c ./jsdoc-conf.json --tutorials examples/shim api.js lib/shim/ lib/transaction/handle.js && cp examples/shim/*.png out/",
@@ -145,9 +145,9 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.2.11",
     "@grpc/proto-loader": "^0.5.6",
-    "@newrelic/aws-sdk": "^3.1.0",
-    "@newrelic/koa": "^5.0.0",
-    "@newrelic/superagent": "^4.0.0",
+    "@newrelic/aws-sdk": "^4.0.1",
+    "@newrelic/koa": "^6.0.1",
+    "@newrelic/superagent": "^5.0.1",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "async": "^3.2.0",
     "concat-stream": "^2.0.0",
@@ -157,11 +157,11 @@
     "semver": "^5.3.0"
   },
   "optionalDependencies": {
-    "@newrelic/native-metrics": "^6.0.0"
+    "@newrelic/native-metrics": "^7.0.1"
   },
   "devDependencies": {
     "@newrelic/proxy": "^2.0.0",
-    "@newrelic/test-utilities": "^5.1.0",
+    "@newrelic/test-utilities": "^6.0.0",
     "@octokit/rest": "^18.0.15",
     "JSV": "~4.0.2",
     "architect": "*",
@@ -192,7 +192,7 @@
     "rimraf": "^2.6.3",
     "should": "*",
     "sinon": "^4.5.0",
-    "tap": "^14.10.8",
+    "tap": "^15.0.9",
     "temp": "^0.8.1",
     "through": "^2.3.6",
     "when": "*"

test/integration/agent/serverless-harvest.tap.js

@@ -10,6 +10,7 @@ const helper = require('../../lib/agent_helper')
 const tap = require('tap')
 const sinon = require('sinon')
 const API = require('../../../api')
+const util = require('util')
 
 const DESTS = require('../../../lib/config/attribute-filter').DESTINATIONS
 const TEST_ARN = 'test:arn'
@@ -25,7 +26,7 @@ tap.test('Serverless mode harvest', (t) => {
 
   process.env.AWS_EXECUTION_ENV = TEST_EX_ENV
 
-  t.beforeEach((done) => {
+  t.beforeEach(async() => {
     logSpy = sinon.spy(fs, 'writeSync')
     agent = helper.instrumentMockedAgent({
       serverless_mode: {
@@ -37,15 +38,16 @@ tap.test('Serverless mode harvest', (t) => {
     agent.setLambdaArn(TEST_ARN)
     agent.setLambdaFunctionVersion(TEST_FUNC_VERSION)
 
-    agent.start(done)
+    const agentStart = util.promisify(agent.start).bind(agent)
+    await agentStart()
   })
 
-  t.afterEach((done) => {
+  t.afterEach(async() => {
     logSpy && logSpy.restore()
     helper.unloadAgent(agent)
-    agent.stop((err) => {
-      done(err)
-    })
+
+    const agentStop = util.promisify(agent.stop).bind(agent)
+    await agentStop()
   })
 
   t.test('simple harvest', (t) => {

test/integration/api/custom-attribute-span-propogation.tap.js

@@ -19,19 +19,17 @@ tap.test('#addAttribute', (t) => {
   let agent = null
   let api = null
 
-  t.beforeEach((done) => {
+  t.beforeEach(() => {
     agent = helper.loadMockedAgent({
       distributed_tracing: {
         enabled: true
       }
     })
     api = new API(agent)
-    done()
   })
 
-  t.afterEach((done) => {
+  t.afterEach(() => {
     helper.unloadAgent(agent)
-    done()
   })
 
   t.test('should add attribute to current span', (t) => {
@@ -102,19 +100,17 @@ tap.test('#addCustomSpanAttribute', (t) => {
   let agent = null
   let api = null
 
-  t.beforeEach((done) => {
+  t.beforeEach(() => {
     agent = helper.loadMockedAgent({
       distributed_tracing: {
         enabled: true
       }
     })
     api = new API(agent)
-    done()
   })
 
-  t.afterEach((done) => {
+  t.afterEach(() => {
     helper.unloadAgent(agent)
-    done()
   })
 
   t.test('should not add attribute to transaction', (t) => {

test/integration/collector-remote-method.tap.js

@@ -43,7 +43,7 @@ tap.test('DataSender (callback style) talking to fake collector', (t) => {
       return t.end()
     }
 
-    t.tearDown(() => {
+    t.teardown(() => {
       server.close()
     })
 
@@ -125,7 +125,7 @@ tap.test('remote method to preconnect', (t) => {
       startedCallback(err, this)
     })
 
-    t.tearDown(() => {
+    t.teardown(() => {
       server.close()
     })
 

test/integration/config/attribute-cat.tap.js

@@ -34,7 +34,7 @@ tap.test('Attribute include/exclude configurations', function(t) {
   t.plan(tests.length)
 
   var agent = helper.loadMockedAgent()
-  t.tearDown(function() {
+  t.teardown(function() {
     helper.unloadAgent(agent)
   })
 

test/integration/core/async_hooks-new-promise.js

@@ -143,7 +143,7 @@ test("the agent's async hook", function(t) {
         }
       }, 10)
 
-      t.tearDown(() => {
+      t.teardown(() => {
         clearInterval(intervalId)
       })
 
@@ -180,7 +180,7 @@ test("the agent's async hook", function(t) {
       }
     }, 10)
 
-    t.tearDown(() => {
+    t.teardown(() => {
       clearInterval(intervalId)
     })
 
@@ -221,7 +221,7 @@ test("the agent's async hook", function(t) {
       }
     }, 10)
 
-    t.tearDown(() => {
+    t.teardown(() => {
       clearInterval(intervalId)
     })
 
@@ -286,7 +286,7 @@ test("the agent's async hook", function(t) {
       }
     }, 10)
 
-    t.tearDown(() => {
+    t.teardown(() => {
       clearInterval(intervalId)
     })
 
@@ -381,7 +381,7 @@ test("the agent's async hook", function(t) {
       }
     }, 10)
 
-    t.tearDown(() => {
+    t.teardown(() => {
       clearInterval(intervalId)
     })
 
@@ -582,7 +582,7 @@ function setupAgent(t) {
   const agent = helper.instrumentMockedAgent({
     feature_flag: {await_support: true}
   })
-  t.tearDown(function() {
+  t.teardown(function() {
     helper.unloadAgent(agent)
   })
 

test/integration/core/async_hooks.js

@@ -132,7 +132,7 @@ test("the agent's async hook", function(t) {
       }
     }, 10)
 
-    t.tearDown(() => {
+    t.teardown(() => {
       clearInterval(intervalId)
     })
 
@@ -160,7 +160,7 @@ test("the agent's async hook", function(t) {
       }
     }, 10)
 
-    t.tearDown(() => {
+    t.teardown(() => {
       clearInterval(intervalId)
     })
 
@@ -244,7 +244,7 @@ test("the agent's async hook", function(t) {
       }
     }, 10)
 
-    t.tearDown(() => {
+    t.teardown(() => {
       clearInterval(intervalId)
     })
 
@@ -419,7 +419,7 @@ function setupAgent(t) {
   var agent = helper.instrumentMockedAgent({
     feature_flag: {await_support: true}
   })
-  t.tearDown(function() {
+  t.teardown(function() {
     helper.unloadAgent(agent)
   })
 

test/integration/core/child_process.tap.js

@@ -307,7 +307,7 @@ test('should not break removeAllListeners', (t) => {
 
 function setupAgent(t) {
   var agent = helper.instrumentMockedAgent()
-  t.tearDown(function() {
+  t.teardown(function() {
     helper.unloadAgent(agent)
   })
 

test/integration/core/crypto.tap.js

@@ -126,7 +126,7 @@ test('scryptSync', (t) => {
 
 function setupAgent(t) {
   var agent = helper.instrumentMockedAgent()
-  t.tearDown(function() {
+  t.teardown(function() {
     helper.unloadAgent(agent)
   })
 

test/integration/core/dns.tap.js

@@ -142,7 +142,7 @@ test('reverse', function(t) {
 
 function setupAgent(t) {
   var agent = helper.instrumentMockedAgent()
-  t.tearDown(function() {
+  t.teardown(function() {
     helper.unloadAgent(agent)
   })
 

test/integration/core/fs.tap.js

@@ -38,7 +38,7 @@ function test(title, options, callback) {
   }
   options.timeout = 15000 // Allow for a slow file system.
   tapTest(title, options, function(t) {
-    t.tearDown(function() {
+    t.teardown(function() {
       if (++done === tasks) {
         process.umask(mask)
       }
@@ -938,8 +938,8 @@ test('watchFile', function(t) {
 })
 
 function setupAgent(t) {
-  const agent = helper.instrumentMockedAgent()
-  t.tearDown(function() {
+  var agent = helper.instrumentMockedAgent()
+  t.teardown(function() {
     helper.unloadAgent(agent)
   })
 

test/integration/core/inspector.tap.js

@@ -37,7 +37,7 @@ test('inspector', function(t) {
 
 function setupAgent(t) {
   var agent = helper.instrumentMockedAgent()
-  t.tearDown(function() {
+  t.teardown(function() {
     helper.unloadAgent(agent)
   })
 

test/integration/core/net.tap.js

@@ -86,7 +86,7 @@ test('connect', function connectTest(t) {
     })
   })
 
-  t.tearDown(function() {
+  t.teardown(function() {
     server.close()
   })
 
@@ -250,7 +250,7 @@ test('createServer and connect', function createServerTest(t) {
 
 function setupAgent(t) {
   var agent = helper.instrumentMockedAgent()
-  t.tearDown(function tearDown() {
+  t.teardown(function tearDown() {
     helper.unloadAgent(agent)
   })
   return agent

test/integration/core/promises.js

@@ -15,9 +15,8 @@ var testTransactionState = require(genericTestDir + 'transaction-state')
 
 module.exports = function runTests(flags) {
   var RealPromise = global.Promise
-  tap.afterEach(function(done) {
+  tap.afterEach(() => {
     Promise = global.Promise = RealPromise
-    done()
   })
 
   tap.test('transaction state', function(t) {
@@ -1056,7 +1055,7 @@ module.exports = function runTests(flags) {
     }
 
     var agent = helper.loadTestAgent(t, {feature_flag: flags})
-    t.tearDown(function() {
+    t.teardown(function() {
       global.Promise = OriginalPromise
     })
 
@@ -1078,7 +1077,7 @@ module.exports = function runTests(flags) {
     util.inherits(WrappedPromise, Promise)
     global.Promise = WrappedPromise
 
-    t.tearDown(function() {
+    t.teardown(function() {
       global.Promise = OriginalPromise
     })
 

test/integration/core/timers.tap.js

@@ -246,7 +246,7 @@ tap.test('clearTimeout', function testNextTick(t) {
 
 function setupAgent(t) {
   var agent = helper.instrumentMockedAgent()
-  t.tearDown(function tearDown() {
+  t.teardown(function tearDown() {
     helper.unloadAgent(agent)
   })