newrelic 6.3.0 → 6.5.0

package/lib/util/get.js

@@ -0,0 +1,16 @@
+'use strict'
+
+// A simplified implementation of lodash.get
+// see: https://www.npmjs.com/package/lodash.get
+function get(obj, keys, defaultVal) {
+  keys = Array.isArray(keys) ? keys : keys.replace(/(\[(\d)\])/g, '.$2').split('.')
+  obj = obj[keys[0]]
+
+  if (obj && keys.length > 1) {
+    return get(obj, keys.slice(1), defaultVal)
+  }
+
+  return obj === undefined ? defaultVal : obj
+}
+
+module.exports = get

package/lib/util/hashes.js

@@ -1,6 +1,6 @@
 'use strict'
 
-var crypto = require('crypto')
+const crypto = require('crypto')
 
 function encode(bytes, keyBytes) {
   for (var i = 0; i < bytes.length; i++) {
@@ -52,11 +52,60 @@ function getHash(appName, txName) {
   return buf.slice(buf.length - 4, buf.length).readUInt32BE(0)
 }
 
-function makeId() {
-  // 1e17 should always result in a whole number, but just in case we floor it
-  // so we don't end up with decimals. Then we make it hex because other agents
-  // use a hex based transaction id.
-  return Math.floor((Math.random() * 1e17)).toString(16)
+const rand = Math.random
+
+const max32 = Math.pow(2, 32) - 1
+function randInt32() {
+  return Math.floor(rand() * max32)
+}
+
+function int32ToByteArray(int32) {
+  // we want to represent the input as a 4-bytes array
+  let byteArray = new Uint8Array(4)
+
+  for (let i = 0; i < byteArray.length; i++) {
+    let byte = int32 & 0xff
+    byteArray[i] = byte
+    int32 = (int32 - byte) / 256
+  }
+
+  return byteArray
+}
+
+// Lookup table for converting byte values to hex
+const byteToHex = []
+for (let i = 0; i < 256; ++i) {
+  byteToHex[i] = (i + 0x100).toString(16).substr(1)
+}
+
+function makeId(length = 16) {
+  // length is number of hex characters, which multiplied by 4 is the number of
+  // bits, then divided by 8 is number of bytes. Or just divide by 2
+  const numBytes = Math.ceil(length / 2)
+  let randBytes = new Uint8Array(numBytes)
+
+  // Generate random bytes one 32-bit integer at a time
+  const numInts = Math.ceil(numBytes / 4) // 32 bit integers are 4 bytes
+  for (let i = 0; i < numInts; i++) {
+    const int = randInt32()
+    const bytes = int32ToByteArray(int)
+    for (let j = 0; j < 4; j++) {
+      // This could "overflow" since we're iterating over the number of ints, which could
+      // be more data than needed. But out-of-bound index assignment on typed arrays are
+      // discarded
+      randBytes[(i * 4) + j] = bytes[j]
+    }
+  }
+
+  // Convert the byte array to a hex string
+  let id = ''
+  for (let i = 0; i < randBytes.length; i++) {
+    id += byteToHex[randBytes[i]]
+  }
+
+  // For odd number lengths, we may get an extra character since byteToHex returns two
+  // characters, so trim to the desired length.
+  return id.substring(0, length)
 }
 
 exports.obfuscateNameUsingKey = obfuscateNameUsingKey

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "6.3.0",
+  "version": "6.5.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "SEE LICENSE IN LICENSE",
   "contributors": [
@@ -96,7 +96,7 @@
   ],
   "homepage": "http://github.com/newrelic/node-newrelic",
   "engines": {
-    "node": ">=8.0.0 <13.0.0",
+    "node": ">=8.0.0",
     "npm": ">=3.0.0"
   },
   "directories": {
@@ -113,13 +113,12 @@
     "lint": "eslint ./*.js lib test",
     "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/",
     "publish-docs": "./bin/publish-docs.sh",
-    "security": "npm audit",
     "services": "./bin/docker-services.sh",
     "smoke": "npm run clean && ./bin/smoke.sh",
     "ssl": "./bin/ssl.sh",
     "sub-install": "node test/bin/install_sub_deps",
     "test": "npm run integration && npm run unit",
-    "unit": "rm -f newrelic_agent.log && mocha -r nock -c test/unit --recursive --exit",
+    "unit": "rm -f newrelic_agent.log && time tap --test-regex='(\\/|^test\\/unit\\/.*\\.test\\.js)$' --timeout=120 --no-coverage",
     "update-cross-agent-tests": "./bin/update-cats.sh",
     "versioned-tests": "./bin/run-versioned-tests.sh",
     "versioned": "npm run prepare-test && time ./bin/run-versioned-tests.sh"
@@ -128,15 +127,15 @@
     "newrelic-naming-rules": "./bin/test-naming-rules.js"
   },
   "dependencies": {
-    "@newrelic/aws-sdk": "^1.1.1",
+    "@newrelic/aws-sdk": "^1.1.2",
     "@newrelic/koa": "^3.0.0",
-    "@newrelic/superagent": "^2.0.0",
+    "@newrelic/superagent": "^2.0.1",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "async": "^2.1.4",
     "concat-stream": "^2.0.0",
     "escodegen": "^1.11.1",
     "esprima": "^4.0.1",
-    "https-proxy-agent": "^3.0.0",
+    "https-proxy-agent": "^4.0.0",
     "json-stringify-safe": "^5.0.0",
     "readable-stream": "^3.1.1",
     "semver": "^5.3.0"
@@ -152,7 +151,7 @@
     "benchmark": "^2.1.4",
     "bluebird": "^3.4.7",
     "chai": "^4.1.2",
-    "eslint": "^5.13.0",
+    "eslint": "^6.8.0",
     "express": "*",
     "generic-pool": "^3.6.1",
     "glob": "^7.1.2",
@@ -161,10 +160,9 @@
     "lodash": "^4.17.14",
     "memcached": ">=0.2.8",
     "minami": "^1.1.1",
-    "mocha": "^6.2.1",
     "mongodb": "^3.3.3",
     "mysql": "*",
-    "nock": "9.1.9",
+    "nock": "11.8.0",
     "proxyquire": "^1.8.0",
     "q": "*",
     "redis": "^1.0.0",

package/stub_api.js

@@ -36,6 +36,7 @@ Stub.prototype.getTransaction = getTransaction
 Stub.prototype.getBrowserTimingHeader = getBrowserTimingHeader
 Stub.prototype.shutdown = shutdown
 Stub.prototype.setLambdaHandler = setLambdaHandler
+Stub.prototype.getLinkingMetadata = getLinkingMetadata
 Stub.prototype.getTraceMetadata = getTraceMetadata
 
 // This code gets injected into HTML templates
@@ -62,6 +63,10 @@ function startSegment(name, record, handler, callback) {
   return null
 }
 
+function getLinkingMetadata() {
+  return {}
+}
+
 function getTraceMetadata() {
   return {
     traceId: '',