newrelic 8.15.0 → 8.16.0

package/NEWS.md

@@ -1,3 +1,11 @@
+### v8.16.0 (2022-07-21)
+
+* Automatic application log forwarding is now enabled by default. This version of the agent will automatically send enriched application logs to New Relic. To learn more about about this feature, see the [APM logs in context documentation](https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/get-started-logs-context/). For additional configuration options, see the [Node.js logs in context documentation](https://docs.newrelic.com/docs/logs/logs-context/configure-logs-context-nodejs). To learn about how to toggle log ingestion on or off by account, see our documentation to [disable automatic logging](https://docs.newrelic.com/docs/logs/logs-context/disable-automatic-logging) via the UI or API.
+
+* Added a support statement to our release notes
+
+* Added node 18 to CI workflows.
+
 ### v8.15.0 (2022-07-07)
 
 * Added instrumentation for grpc-js unary, streaming, and bidirectional client calls.

package/THIRD_PARTY_NOTICES.md

@@ -66,7 +66,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [q](#q)
 * [redis](#redis)
 * [request](#request)
-* [restify](#restify)
 * [rimraf](#rimraf)
 * [should](#should)
 * [sinon](#sinon)
@@ -2516,7 +2515,7 @@ https://creativecommons.org/licenses/by-sa/4.0/
 
 ### got
 
-This product includes source derived from [got](https://github.com/sindresorhus/got) ([v8.3.2](https://github.com/sindresorhus/got/tree/v8.3.2)), distributed under the [MIT License](https://github.com/sindresorhus/got/blob/v8.3.2/license):
+This product includes source derived from [got](https://github.com/sindresorhus/got) ([v11.8.5](https://github.com/sindresorhus/got/tree/v11.8.5)), distributed under the [MIT License](https://github.com/sindresorhus/got/blob/v11.8.5/license):
 
 ```
 MIT License
@@ -3208,33 +3207,6 @@ If the Work includes a "NOTICE" text file as part of its distribution, then any
 END OF TERMS AND CONDITIONS
 ```
 
-### restify
-
-This product includes source derived from [restify](https://github.com/restify/node-restify) ([v8.5.1](https://github.com/restify/node-restify/tree/v8.5.1)), distributed under the [MIT License](https://github.com/restify/node-restify/blob/v8.5.1/LICENSE):
-
-```
-Copyright (c) 2011 Mark Cavage, All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE
-
-```
-
 ### rimraf
 
 This product includes source derived from [rimraf](https://github.com/isaacs/rimraf) ([v2.7.1](https://github.com/isaacs/rimraf/tree/v2.7.1)), distributed under the [ISC License](https://github.com/isaacs/rimraf/blob/v2.7.1/LICENSE):

package/lib/config/default.js

@@ -950,7 +950,7 @@ exports.config = () => ({
        *
        * @env NEW_RELIC_APPLICATION_LOGGING_FORWARDING_ENABLED
        */
-      enabled: false,
+      enabled: true,
       /**
        * Number of log records to send per minute to New Relic.
        *

package/lib/instrumentation/mongodb/common.js

@@ -127,13 +127,22 @@ common.makeBulkDescFunc = function makeBulkDescFunc(shim) {
  *
  * @param {Shim} shim
  * @param {Instrumentation} instrumenter instance of mongo APM class
+ * @param {object} [options={}] provide command names to skip updating host/port as they are unrelated to the active query.  This is only in v3 because after every command is runs `endSessions` which runs on the admin database
  */
-common.captureAttributesOnStarted = function captureAttributesOnStarted(shim, instrumenter) {
+common.captureAttributesOnStarted = function captureAttributesOnStarted(
+  shim,
+  instrumenter,
+  options = { skipCommands: [] }
+) {
   instrumenter.on('started', function onMongoEventStarted(evnt) {
+    if (options.skipCommands.includes(evnt.commandName)) {
+      return
+    }
     // This assumes that this `started` event is fired _after_ our wrapper
     // starts and creates the segment. We perform a check of the segment name
     // out of an excess of caution.
     const connId = evnt.connectionId
+
     if (connId) {
       // used in v3 when connection is a cluster pool
       if (typeof connId === 'number') {
@@ -165,7 +174,7 @@ common.captureAttributesOnStarted = function captureAttributesOnStarted(shim, in
  * @param {object} client mongo client instance
  */
 function setHostPort(shim, connStr, db, client) {
-  const parts = connStr.split(':')
+  const parts = common.parseAddress(connStr)
   // in v3 when running with a cluster of socket connections
   // the address is `undefined:undefined`. we will instead attempt
   // to get connection details from the client symbol NR_ATTRS
@@ -189,7 +198,7 @@ function setHostPort(shim, connStr, db, client) {
 
 /**
  * Get the database_name, host, port_path_or_id
- * for the query segment. v4 refactored where the toplogy is stored.
+ * for the query segment. v4 refactored where the topology is stored.
  * You can now get the details via the client obj that's deeply nested
  * See: https://github.com/mongodb/node-mongodb-native/pull/2594/files#diff-1d214e57ddda9095d296e5700ebce701333bfefcf417e234c584d14091b2f50dR168
  *
@@ -202,8 +211,8 @@ function getInstanceAttributeParameters(shim, obj) {
     const databaseName =
       (obj.s.db && obj.s.db.databaseName) || (obj.s.namespace && obj.s.namespace.db) || null
     const topology = obj.s.topology
-    if (topology.s && topology.s.options) {
-      return doCapture(topology.s.options, databaseName)
+    if (topology) {
+      return doCapture(topology, databaseName)
     }
   } else if (
     obj.s &&
@@ -241,13 +250,13 @@ function getInstanceAttributeParameters(shim, obj) {
 
   function doCapture(conf, database) {
     // in older versions of 3.x the host/port
-    // lived directly on the topology.s.options
+    // lived directly on the topology
     let host = conf.host
     let port = conf.port
 
     // servers is an array but we will always pull the first for consistency
-    if (conf.servers && conf.servers.length) {
-      ;[{ host, port }] = conf.servers
+    if (conf.s && conf.s.options && conf.s.options.servers && conf.s.options.servers.length) {
+      ;[{ host, port }] = conf.s.options.servers
     }
 
     // host is a domain socket. set host as localhost and use the domain
@@ -264,3 +273,16 @@ function getInstanceAttributeParameters(shim, obj) {
     }
   }
 }
+
+/**
+ * Parses mongo address that accounts for IPv6
+ *
+ * @param {string} address mongo address string
+ * @returns {Array} host/port of address string
+ */
+common.parseAddress = function parseAddress(address) {
+  const lastColon = address.lastIndexOf(':')
+  const host = address.slice(0, lastColon)
+  const port = address.slice(lastColon + 1)
+  return [host, port]
+}

package/lib/instrumentation/mongodb/v3-mongo.js

@@ -18,7 +18,7 @@ const {
  * parser used to grab the collection and operation
  * on every mongo operation
  *
- * @param {Object} operation
+ * @param {object} operation
  */
 function queryParser(operation) {
   let collection = this.collectionName || 'unknown'
@@ -40,7 +40,7 @@ function queryParser(operation) {
  * is a cluster of domain sockets
  *
  * @param {Shim} shim
- * @param {Object} mongodb resolved package
+ * @param {object} mongodb resolved package
  */
 function instrumentClient(shim, mongodb) {
   shim.recordOperation(mongodb.MongoClient, 'connect', function wrappedConnect(shim, _, __, args) {
@@ -61,13 +61,16 @@ function instrumentClient(shim, mongodb) {
  * add necessary attributes to segments
  *
  * @param {Shim} shim
- * @param {Object} mongodb resolved package
+ * @param {object} mongodb resolved package
  */
 module.exports = function instrument(shim, mongodb) {
   shim.setParser(queryParser)
   instrumentClient(shim, mongodb)
   const instrumenter = mongodb.instrument(Object.create(null), () => {})
-  captureAttributesOnStarted(shim, instrumenter)
+  // in v3 of mongo endSessions fires after every command and it updates the active segment
+  // attributes with the admin database name which stomps on the database name where the original
+  // command runs on
+  captureAttributesOnStarted(shim, instrumenter, { skipCommands: ['endSessions'] })
   instrumentCursor(shim, mongodb.Cursor)
   instrumentCursor(shim, shim.require('./lib/aggregation_cursor'))
   instrumentCursor(shim, shim.require('./lib/command_cursor'))

package/lib/instrumentation/mongodb/v4-mongo.js

@@ -5,13 +5,13 @@
 
 'use strict'
 
-const { instrumentCollection, instrumentCursor, instrumentDb } = require('./common')
+const { instrumentCollection, instrumentCursor, instrumentDb, parseAddress } = require('./common')
 
 /**
  * parser used to grab the collection and operation
  * from a running query
  *
- * @param {Object} operation
+ * @param {object} operation
  */
 function queryParser(operation) {
   let collection = this.collectionName || 'unknown'
@@ -34,7 +34,7 @@ function queryParser(operation) {
  */
 function cmdStartedHandler(shim, evnt) {
   if (evnt.connectionId) {
-    let [host, port] = evnt.address.split(':')
+    let [host, port] = parseAddress(evnt.address)
 
     // connection via socket get port from 1st host
     // socketPath property
@@ -45,7 +45,7 @@ function cmdStartedHandler(shim, evnt) {
       if (hosts && hosts.length && hosts[0].socketPath) {
         port = hosts[0].socketPath
       }
-    } else if (host === '127.0.0.1') {
+    } else if (['127.0.0.1', '::1'].includes(host)) {
       host = 'localhost'
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "8.15.0",
+  "version": "8.16.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -213,7 +213,6 @@
     "q": "*",
     "redis": "^1.0.0",
     "request": "^2.88.0",
-    "restify": "^8.4.0",
     "rimraf": "^2.6.3",
     "should": "*",
     "sinon": "^4.5.0",