newrelic 8.0.0 → 8.1.0

package/lib/instrumentation/pg.js

@@ -5,6 +5,8 @@
 
 'use strict'
 
+const semver = require('semver')
+
 function getQuery(shim, original, name, args) {
   var config = args[0]
   var statement
@@ -20,6 +22,8 @@ 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
@@ -28,6 +32,30 @@ module.exports = function initialize(agent, pgsql, moduleName, shim) {
     return instrumentPGNative(pgsql)
   }
 
+  function wrapJSClientQuery(shim, _, __, queryArgs) {
+    // 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') {
+      return {
+        callback: shim.LAST,
+        query: getQuery,
+        promise: true,
+        parameters: getInstanceParameters(shim, this),
+        internal: false
+      }
+    }
+
+    return {
+      callback: shim.LAST,
+      query: getQuery,
+      stream: 'row',
+      parameters: getInstanceParameters(shim, this),
+      internal: false
+    }
+  }
+
   // wrapping for native
   function instrumentPGNative(pg) {
     shim.wrapReturn(pg, 'Client', clientFactoryWrapper)
@@ -56,13 +84,11 @@ module.exports = function initialize(agent, pgsql, moduleName, shim) {
   }
 
   function clientPostConstructor(shim) {
-    shim.recordQuery(this, 'query', {
-      callback: shim.LAST,
-      query: getQuery,
-      stream: 'row',
-      parameters: getInstanceParameters(shim, this),
-      internal: false
-    })
+    shim.recordQuery(
+      this,
+      'query',
+      wrapJSClientQuery
+    )
 
     shim.record(this, 'connect', function pgConnectNamer() {
       return {
@@ -93,18 +119,11 @@ module.exports = function initialize(agent, pgsql, moduleName, shim) {
   shim.recordQuery(
     pgsql && pgsql.Client && pgsql.Client.prototype,
     'query',
-    function wrapJSClientQuery(shim) {
-      return {
-        callback: shim.LAST,
-        query: getQuery,
-        stream: 'row',
-        parameters: getInstanceParameters(shim, this),
-        internal: false
-      }
-    }
+    wrapJSClientQuery
   )
 }
 
+
 function getInstanceParameters(shim, client) {
   return {
     host: client.host || null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -98,6 +98,11 @@
       "name": "Nick Tzaperas",
       "email": "ntzaperas@newrelic.com",
       "web": "https://newrelic.com"
+    },
+    {
+      "name": "Bob Evans",
+      "email": "revans@newrelic.com",
+      "web": "https://newrelic.com"
     }
   ],
   "description": "New Relic agent",
@@ -109,7 +114,7 @@
     "debugging",
     "profiling"
   ],
-  "homepage": "http://github.com/newrelic/node-newrelic",
+  "homepage": "https://github.com/newrelic/node-newrelic",
   "engines": {
     "node": ">=12.0.0",
     "npm": ">=6.0.0"
@@ -170,7 +175,8 @@
     "bluebird": "^3.4.7",
     "chai": "^4.1.2",
     "commander": "^7.0.0",
-    "eslint": "^6.8.0",
+    "eslint": "^7.32.0",
+    "eslint-plugin-header": "^3.1.1",
     "express": "*",
     "fastify": "^2.15.3",
     "generic-pool": "^3.6.1",