newrelic 8.16.0 → 9.0.0

package/lib/instrumentation/pg.js

@@ -5,8 +5,6 @@
 
 'use strict'
 
-const semver = require('semver')
-
 function getQuery(shim, original, name, args) {
   const config = args[0]
   let statement
@@ -22,12 +20,10 @@ function getQuery(shim, original, name, args) {
 }
 
 module.exports = function initialize(agent, pgsql, moduleName, shim) {
-  const pgVersion = shim.require('./package.json').version
-
   shim.setDatastore(shim.POSTGRES)
+
   // allows for native wrapping to not happen if not necessary
   // when env var is true
-
   if (process.env.NODE_PG_FORCE_NATIVE) {
     return instrumentPGNative(pgsql)
   }
@@ -36,7 +32,7 @@ module.exports = function initialize(agent, pgsql, moduleName, shim) {
     // As of pg v7.0.0, Client.query returns a Promise from an async call.
     // pg supports event based Client.query when a Query object is passed in,
     // and works similarly in pg version <7.0.0
-    if (semver.satisfies(pgVersion, '>=7.0.0') && typeof queryArgs[0] === 'string') {
+    if (typeof queryArgs[0] === 'string') {
       return {
         callback: shim.LAST,
         query: getQuery,
@@ -58,18 +54,7 @@ module.exports = function initialize(agent, pgsql, moduleName, shim) {
   // wrapping for native
   function instrumentPGNative(pg) {
     shim.wrapReturn(pg, 'Client', clientFactoryWrapper)
-    shim.wrapReturn(pg.pools, 'Client', clientFactoryWrapper)
-
-    // In pg v5 the Client class used by pg-pool is the same Client
-    // class as pg.Client.  Since querying through the Pool class just
-    // defers to Client.query in this case we should skip instrumenting
-    // the Client class on Pool.
-    // Note: pg v5 was the only version to have both the Pool
-    // constructor and pg.pools so we can check against pg.pools to only
-    // instrument pg.Pool on v6 and later.
-    if (!pg.pools) {
-      shim.wrapClass(pg, 'Pool', { post: poolPostConstructor, es6: true })
-    }
+    shim.wrapClass(pg, 'Pool', { post: poolPostConstructor, es6: true })
   }
 
   function poolPostConstructor(shim) {

package/lib/instrumentations.js

@@ -21,7 +21,6 @@ module.exports = function instrumentations() {
     'generic-pool': { type: MODULE_TYPE.GENERIC },
     '@grpc/grpc-js': { module: './instrumentation/grpc-js' },
     '@hapi/hapi': { type: MODULE_TYPE.WEB_FRAMEWORK },
-    'hapi': { type: MODULE_TYPE.WEB_FRAMEWORK },
     'ioredis': { type: MODULE_TYPE.DATASTORE },
     'koa': { module: '@newrelic/koa' },
     'memcached': { type: MODULE_TYPE.DATASTORE },
@@ -36,7 +35,6 @@ module.exports = function instrumentations() {
     'restify': { type: MODULE_TYPE.WEB_FRAMEWORK },
     'superagent': { module: '@newrelic/superagent' },
     'undici': { type: MODULE_TYPE.TRANSACTION },
-    'oracle': { type: null },
     'vision': { type: MODULE_TYPE.WEB_FRAMEWORK },
     'when': { type: null },
     'winston': { type: MODULE_TYPE.GENERIC }

package/lib/metrics/names.js

@@ -147,13 +147,6 @@ const CASSANDRA = {
   ALL: DB.PREFIX + 'Cassandra/' + ALL
 }
 
-const ORACLE = {
-  PREFIX: 'Oracle',
-  STATEMENT: DB.STATEMENT + '/Oracle/',
-  OPERATION: DB.OPERATION + '/Oracle/',
-  INSTANCE: DB.INSTANCE + '/Oracle/'
-}
-
 const EXPRESS = {
   PREFIX: 'Expressjs/',
   MIDDLEWARE: MIDDLEWARE.PREFIX + 'Expressjs/',
@@ -329,7 +322,6 @@ module.exports = {
   MYSQL: MYSQL,
   NODEJS: NODEJS,
   NORMALIZED: 'NormalizedUri',
-  ORACLE: ORACLE,
   OTHER_TRANSACTION: OTHER_TRANSACTION,
   POSTGRES: POSTGRES,
   QUEUETIME: 'WebFrontend/QueueTime',

package/lib/util/application-logging.js

@@ -16,7 +16,7 @@ const { LOGGING } = require('../metrics/names')
  * @returns {string}
  */
 utils.truncate = function truncate(str) {
-  if (str.length > OUTPUT_LENGTH) {
+  if (typeof str === 'string' && str.length > OUTPUT_LENGTH) {
     return str.substring(0, MAX_LENGTH) + '...'
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "8.16.0",
+  "version": "9.0.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -108,6 +108,11 @@
       "name": "Diana Thayer",
       "email": "dthayer@newrelic.com",
       "web": "https://newrelic.com"
+    },
+    {
+      "name": "Jordi Gutiérrez Hermoso",
+      "email": "jgutierrezhermoso@newrelic.com",
+      "web": "https://newrelic.com"
     }
   ],
   "description": "New Relic agent",
@@ -121,7 +126,7 @@
   ],
   "homepage": "https://github.com/newrelic/node-newrelic",
   "engines": {
-    "node": ">=12.0.0",
+    "node": ">=14",
     "npm": ">=6.0.0"
   },
   "directories": {
@@ -129,11 +134,10 @@
   },
   "scripts": {
     "bench": "node ./bin/run-bench.js",
-    "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 test/integration/**/**/*.tap.js --timeout=180 --no-coverage --reporter classic",
-    "prepare-test": "npm run ca-gen && npm run ssl && npm run docker-env",
+    "prepare-test": "npm run ssl && npm run docker-env",
     "lint": "eslint ./*.js lib test bin examples",
     "lint:fix": "eslint --fix, ./*.js lib test bin examples",
     "public-docs": "jsdoc -c ./jsdoc-conf.json --tutorials examples/shim api.js lib/shim/ lib/transaction/handle.js && cp examples/shim/*.png out/",
@@ -161,9 +165,9 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.5.5",
     "@grpc/proto-loader": "^0.6.13",
-    "@newrelic/aws-sdk": "^4.1.1",
-    "@newrelic/koa": "^6.1.1",
-    "@newrelic/superagent": "^5.1.0",
+    "@newrelic/aws-sdk": "^5.0.0",
+    "@newrelic/koa": "^7.0.0",
+    "@newrelic/superagent": "^6.0.0",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "async": "^3.2.3",
     "concat-stream": "^2.0.0",
@@ -174,13 +178,13 @@
     "winston-transport": "^4.5.0"
   },
   "optionalDependencies": {
-    "@newrelic/native-metrics": "^8.0.0"
+    "@newrelic/native-metrics": "^9.0.0"
   },
   "devDependencies": {
     "@newrelic/eslint-config": "^0.0.3",
     "@newrelic/newrelic-oss-cli": "^0.1.2",
     "@newrelic/proxy": "^2.0.0",
-    "@newrelic/test-utilities": "^6.5.5",
+    "@newrelic/test-utilities": "^7.0.0",
     "@octokit/rest": "^18.0.15",
     "@slack/bolt": "^3.7.0",
     "ajv": "^6.12.6",