Merge remote-tracking branch 'upstream/main' into feature/run-on-windows

* upstream/main:
  test: bump threshold to avoid spurious failure for possibly slow CI (#3225)
  test: workaround spurious test failures in http2 tests with node v8 (#3226)

test/context-propagation-only.test.js

@@ -191,7 +191,7 @@ tape.test('contextPropagationOnly', function (suite) {
       // stacktrace collection when contextPropagationOnly=true. It isn't a
       // perfect way to test that.
       const durationMs = duration[0] / 1e3 + duration[1] / 1e6
-      const THRESHOLD_MS = 5 // Is this long enough for slow CI?
+      const THRESHOLD_MS = 10 // Is this long enough for slow CI?
       t.ok(durationMs < THRESHOLD_MS, `captureError is fast (<${THRESHOLD_MS}ms): ${durationMs}ms`)
 
       t.equal(server.events.length, 0, 'no events sent to APM server intake')

test/instrumentation/modules/http2.test.js

@@ -27,6 +27,11 @@ var mockClient = require('../../_mock_http_client')
 var findObjInArray = require('../../_utils').findObjInArray
 const constants = require('../../../lib/constants')
 
+if (semver.satisfies(process.version, '8.x')) {
+  console.log('# SKIP http2 testing on node v8.x is crashy in CI')
+  process.exit()
+}
+
 var isSecure = [false, true]
 isSecure.forEach(secure => {
   var method = secure ? 'createSecureServer' : 'createServer'