newrelic 7.0.0 → 7.1.1

package/NEWS.md

@@ -1,3 +1,33 @@
+### v7.1.1 (2021-02-01)
+
+* Upgrade @grpc/grpc-js to v1.2.5 to fix non-propagation of internal http2 errors
+  Now allows minor and patch auto-updates.
+
+* Added workflow for publishing to npm when a v* tag is pushed to the repo.
+
+* Fixes resolveMx test by using example.com for a valid exchange.
+
+### 7.1.0 (2021-01-05):
+
+* Fixed SQL traces being generated with invalid ID.
+* Fixed log message for minimum supported Node.js version.
+* Added Fastify v3 support.
+* Fixed empty log message for Infinite Tracing connections.
+* Upgraded grpc version.
+* Fixed bug that prevented users from changing Infinite Tracing queue size.
+
+### 7.0.2 (2020-12-01):
+
+* Fixed a bug where the `http.statusCode` attribute was not being captured for an async invoked lambda.
+* Fixed typos in code comments, documentation, and debugging logger messages.
+  Thank you @TysonAndre for the contribution.
+
+### 7.0.1 (2020-11-17):
+
+* Fixed a bug where spans queued up during backpressure situations would be improperly formatted and ultimately dropped when sent to an Infinite Tracing trace observer.
+* Updated @grpc/grpc-js to version v1.2.0.
+* Updated tap to clear up npm audit issues around lodash sub-dependency.
+
 ### 7.0.0 (2020-11-09):
 
 * Added official parity support for Node 14
@@ -330,7 +360,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
   object from API#getLinkingMetadata().
 
   This issue would cause the `@newrelic/winston-enricher` module to crash when
-  attempting to inject log metatdata.
+  attempting to inject log metadata.
 
 * Reduced logging level of raw `x-queue-start` or `x-request-start` header values
   to avoid logging very large values at default logging levels.
@@ -3282,7 +3312,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
 
 * Fixed a bug where custom events weren't being sent.
 
-  In a refactor of our data collection cycle, we omited the custom
+  In a refactor of our data collection cycle, we omitted the custom
   events from the list of commands, this is now fixed.
 
 * Fixed a very rare bug where the custom event pool could be set to 10
@@ -3506,7 +3536,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
   ended when the view ended.
 
 * Added a configuration option to completely disable logging. `logger.enabled`
-  defaults to true, if set to false it wont try to create the log file.
+  defaults to true, if set to false it won't try to create the log file.
 
 ### v1.16.2 (2015-02-13):
 
@@ -4277,7 +4307,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
   too many times. Thanks to José F. Romaniello for confirming the fix.
 * Changed how requests handled by Express and Restify routes are named. This
   change is being rolled out both in this module and on the New Relic website,
-  so there is a chance you will see the same route (or very similiar routes)
+  so there is a chance you will see the same route (or very similar routes)
   show up twice in aggregated metrics.
 * Dropped the default apdex tolerating value from 500 milliseconds to 100
   milliseconds. This means that transactions slower than 400 milliseconds will
@@ -4514,7 +4544,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
   crash.
 * Some metric normalization rules were not being interpreted correctly, leading
   to malformed normalized metric names.
-* Metric normalization rules that specifed that matching metrics were to be
+* Metric normalization rules that specified that matching metrics were to be
   ignored were not being enforced.
 
 ### v0.9.12-91 / beta-12 (2012-12-28):

package/ROADMAP_Node.md

@@ -15,7 +15,7 @@ This roadmap project is broken down into the following sections:
 - **Next**:
     - This section contains work planned within the next three months. These features may still be deprioritized and moved to Future.
 - **Future**:
-    - This section is for ideas for future work that is alined with the product vision and possible opportunities for community contribution. It contains a list of features that anyone can implement. No guarantees can be provided on if or when these features will be completed.
+    - This section is for ideas for future work that is aligned with the product vision and possible opportunities for community contribution. It contains a list of features that anyone can implement. No guarantees can be provided on if or when these features will be completed.
      
 
 **The roadmap project is found [here](https://github.com/orgs/newrelic/projects/11)**

package/THIRD_PARTY_NOTICES.md

@@ -35,6 +35,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 * [@newrelic/proxy](#newrelicproxy)
 * [@newrelic/test-utilities](#newrelictest-utilities)
+* [@octokit/rest](#octokitrest)
 * [JSV](#JSV)
 * [architect](#architect)
 * [benchmark](#benchmark)
@@ -68,15 +69,12 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [through](#through)
 * [when](#when)
 
-**[additional-licenses](#additional-licenses)**
-
-* [symantec](#symantec)
 
 ## dependencies
 
 ### @grpc/grpc-js
 
-This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.1.7](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.1.7)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.1.7/LICENSE):
+This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.2.5](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.2.5)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.2.5/LICENSE):
 
 ```
                                  Apache License
@@ -1755,23 +1753,41 @@ This product includes source derived from [@newrelic/test-utilities](https://git
 
 ```
 
-### JSV
+### @octokit/rest
 
-This product includes source derived from [JSV](https://github.com/garycourt/JSV) ([v4.0.2](https://github.com/garycourt/JSV/tree/v4.0.2)), distributed under the [FreeBSD License](https://github.com/garycourt/JSV/tree/v4.0.2#license):
+This product includes source derived from [@octokit/rest](https://github.com/octokit/rest.js) ([v18.0.15](https://github.com/octokit/rest.js/tree/v18.0.15)), distributed under the [MIT License](https://github.com/octokit/rest.js/blob/v18.0.15/LICENSE):
 
 ```
-Copyright 2010 Gary Court. All rights reserved.
+The MIT License
+
+Copyright (c) 2012 Cloud9 IDE, Inc. (Mike de Boer)
+Copyright (c) 2017-2018 Octokit contributors
+
+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.
 
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
+```
 
-   1. Redistributions of source code must retain the above copyright notice, this list of
-      conditions and the following disclaimer.
+### JSV
 
-   2. Redistributions in binary form must reproduce the above copyright notice, this list
-      of conditions and the following disclaimer in the documentation and/or other materials
-      provided with the distribution.
+This product includes source derived from [JSV](https://github.com/garycourt/JSV) ([v4.0.2](https://github.com/garycourt/JSV/tree/v4.0.2)), distributed under the [FreeBSD License](https://github.com/garycourt/JSV/tree/v4.0.2#license):
 
+```
 THIS SOFTWARE IS PROVIDED BY GARY COURT ``AS IS'' AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GARY COURT OR
@@ -2888,7 +2904,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ### tap
 
-This product includes source derived from [tap](https://github.com/tapjs/node-tap) ([v14.10.7](https://github.com/tapjs/node-tap/tree/v14.10.7)), distributed under the [ISC License](https://github.com/tapjs/node-tap/blob/v14.10.7/LICENSE):
+This product includes source derived from [tap](https://github.com/tapjs/node-tap) ([v14.10.8](https://github.com/tapjs/node-tap/tree/v14.10.8)), distributed under the [ISC License](https://github.com/tapjs/node-tap/blob/v14.10.8/LICENSE):
 
 ```
 The ISC License
@@ -3000,6 +3016,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ```
 
+
 ## additional-licenses
 
 ### symantec

package/bin/generate-release-notes.js

@@ -0,0 +1,96 @@
+'use strict'
+
+const fs = require('fs')
+const github = require('./github')
+
+const FILE_NAME = 'NEWS.md'
+const PROPOSED_NOTES_HEADER = 'Proposed Release Notes'
+const NEXT_VERSION_HEADER = '### vNext (TBD):'
+
+async function generateReleaseNotes() {
+  try {
+    const latestRelease = await github.getLatestRelease()
+    console.log(`The latest release is: ${latestRelease.name} published: ${latestRelease.published_at}`)
+    console.log(`Tag: ${latestRelease.tag_name}, Target: ${latestRelease.target_commitish}`)
+
+    const tag = await github.getTagByName(latestRelease.tag_name)
+    console.log('The tag commit sha is: ', tag.commit.sha)
+
+    const commit = await github.getCommit(tag.commit.sha)
+    const commitDate = commit.commit.committer.date
+
+    console.log(`Finding merged pull requests since: ${commitDate}`)
+
+    const mergedPullRequests = await github.getMergedPullRequestsSince(commitDate)
+    console.log(`Found ${mergedPullRequests.length}`)
+
+    const releaseNoteData = mergedPullRequests.map((pr) => {
+      const parts = pr.body.split(/(?:^|\n)##\s*/g)
+      const {1: proposedReleaseNotes} = parts
+
+      const titleRemoved = proposedReleaseNotes.replace(PROPOSED_NOTES_HEADER, '')
+      return {
+        notes: titleRemoved,
+        url: pr.html_url
+      }
+    })
+
+    const finalData = releaseNoteData.reduce((result, currentValue) => {
+      result.notes += '\n\n' + currentValue.notes.trim()
+      result.links += `\n\n* PR: ${currentValue.url}\n`
+      return result
+    }, {
+      notes: '',
+      links: ''
+    })
+
+    console.log('Final data: ', JSON.stringify(finalData))
+
+    await updateReleaseNotes(FILE_NAME, finalData.notes)
+
+    console.log('*** [SUCCESS] ***')
+  } catch(err) {
+    console.log('! [FAILURE] !')
+    console.error(err)
+  }
+}
+
+function updateReleaseNotes(file, newNotes) {
+  const promise = new Promise((resolve, reject) => {
+    fs.readFile(file, 'utf8', function (err, data) {
+      if (err) {
+        return reject(err)
+      }
+
+      if (data.startsWith(NEXT_VERSION_HEADER)) {
+        const errMessage = [
+          `${file} already contains '${NEXT_VERSION_HEADER}'`,
+          'Delete existing vNext release notes (if desired) and run again'
+        ].join('\n')
+
+        return reject(new Error(errMessage))
+      }
+
+      const newContent = [
+        NEXT_VERSION_HEADER,
+        newNotes,
+        '\n\n',
+        data
+      ].join('')
+
+      fs.writeFile(file, newContent, 'utf8', function (err) {
+        if (err) {
+          return reject(err)
+        }
+
+        console.log(`Added new release notes to ${file} under the ${NEXT_VERSION_HEADER}`)
+
+        resolve()
+      })
+    })
+  })
+
+  return promise
+}
+
+generateReleaseNotes()

package/bin/github.js

@@ -0,0 +1,106 @@
+'use strict'
+
+const { Octokit } = require("@octokit/rest")
+
+const repoOwner = 'newrelic'
+const repository = 'node-newrelic'
+
+if (!process.env.GITHUB_TOKEN) {
+  console.log('GITHUB_TOKEN recommended to be set in ENV')
+}
+
+const octokit = new Octokit({
+  auth: process.env.GITHUB_TOKEN,
+})
+
+async function getLatestRelease() {
+  const result = await octokit.repos.getLatestRelease({
+    owner: repoOwner,
+    repo: repository
+  })
+
+  return result.data
+}
+
+async function getTagByName(name) {
+  const perPage = 100
+
+  let pageNum = 1
+
+  let result = null
+  do {
+    result = await octokit.repos.listTags({
+      owner: repoOwner,
+      repo: repository,
+      per_page: perPage,
+      page: pageNum
+    })
+
+    const found = result.data.find((tag) => {
+      return tag.name === name
+    })
+
+    if (found) {
+      return found
+    }
+
+    pageNum++
+  } while (result.data.length === perPage) // there *might* be more data
+
+  return null
+}
+
+async function getCommit(sha) {
+  const result = await octokit.repos.getCommit({
+    owner: repoOwner,
+    repo: repository,
+    ref: sha
+  })
+
+  return result.data
+}
+
+async function getMergedPullRequestsSince(date) {
+  const perPage = 50
+
+  const comparisonDate = new Date(date)
+
+  let pageNum = 1
+  const mergedPullRequests = []
+  let result = null
+  let hadData = false
+
+  do {
+    result = await octokit.pulls.list({
+      owner: repoOwner,
+      repo: repository,
+      state: 'closed',
+      sort: 'updated',
+      direction: 'desc',
+      per_page: perPage,
+      page: pageNum
+    })
+
+    const mergedPrs = result.data.filter((pr) => {
+      return pr.merged_at && new Date(pr.merged_at) > comparisonDate
+    })
+
+    mergedPullRequests.push(...mergedPrs)
+    // Since we are going by 'updated' on query but merged on filter,
+    // there's a chance some boundaries are off. While in super extreme
+    // cases we could still miss some it is unlikely given we are grabbing
+    // large pages.
+    hadData = mergedPrs.length > 0
+
+    pageNum++
+  } while (result.data.length === perPage && hadData) // might be more in next batch
+
+  return mergedPullRequests
+}
+
+module.exports = {
+  getLatestRelease,
+  getTagByName,
+  getCommit,
+  getMergedPullRequestsSince
+}

package/bin/update-changelog-version.js

@@ -0,0 +1,66 @@
+'use strict'
+
+/**
+ * Executed as a part of the "version" step of npm version.
+ * Updates the placeholder release note header with the incremented version
+ * from running npm version
+ */
+
+const fs = require('fs')
+const packageInfo = require('../package.json')
+
+const FILE_NAME = 'NEWS.md'
+const NEXT_VERSION_HEADER = '### vNext (TBD):'
+
+const SUCCESS_MSG = '*** [SUCCESS] ***'
+const FAIL_MSG = '! [FAILURE] !'
+
+updateChangelogVersion()
+
+async function updateChangelogVersion() {
+  try {
+    await updateHeader(FILE_NAME)
+
+    console.log(SUCCESS_MSG)
+  } catch (err) {
+    console.log(FAIL_MSG)
+    console.error(err)
+  }
+}
+
+function updateHeader(file) {
+  const promise = new Promise((resolve, reject) => {
+    fs.readFile(file, 'utf8', (err, data) => {
+      if (err) {
+        return reject(err)
+      }
+
+      // toISOString() will always return UTC time
+      const todayFormatted = new Date().toISOString().split('T')[0]
+      const version = `v${packageInfo.version}`
+      const newChangelogHeader = `### ${version} (${todayFormatted})`
+
+      console.log('Updating vNext header to: ', newChangelogHeader)
+
+      if (!data.startsWith(NEXT_VERSION_HEADER)) {
+        const err = new Error(`Failed to find next version header in form: '${NEXT_VERSION_HEADER}'`)
+        return reject(err)
+      }
+
+      const modified = data.replace(
+        NEXT_VERSION_HEADER,
+        newChangelogHeader
+      )
+
+      fs.writeFile(file, modified, 'utf8', (err) => {
+        if (err) {
+          return reject (err)
+        }
+
+        console.log(SUCCESS_MSG)
+      })
+    })
+  })
+
+  return promise
+}

package/index.js

@@ -51,13 +51,13 @@ function initialize() {
     // TODO: Update this check when Node v10 is deprecated.
     if (psemver.satisfies('<10.0.0')) {
       message = 'New Relic for Node.js requires a version of Node equal to or\n' +
-                'greater than 8.0.0. Not starting!'
+                'greater than 10.0.0. Not starting!'
 
       logger.error(message)
       throw new Error(message)
 
       // TODO: Update this check when Node v16 support is added
-    } else if (!psemver.satisfies(pkgJSON.engines.node) || psemver.satisfies('>=15.0.0')) { 
+    } else if (!psemver.satisfies(pkgJSON.engines.node) || psemver.satisfies('>=15.0.0')) {
       logger.warn(
         'New Relic for Node.js %s has not been tested on Node.js %s. Please ' +
         'update the agent or downgrade your version of Node.js',

package/lib/collector/api.js

@@ -511,12 +511,12 @@ CollectorAPI.prototype._sendData = function _sendData(method, data, callback) {
     if (response.agentRun === AGENT_RUN_BEHAVIOR.SHUTDOWN) {
       // TODO: for now, shut handled in _handleResponseCode for consistency
       // either find way to safely change while side-by-side or move
-      // once side-by-side gone. Currently, stop is called twice on teh old code path
+      // once side-by-side gone. Currently, stop is called twice on the old code path
 
       // TODO: almost seems better to let aggregator finish (cb) then shutdown?
 
       // this._agent.stop((err) => {
-      //   // TODO: agent stop requires a callback. if we don't care to do anythig here
+      //   // TODO: agent stop requires a callback. if we don't care to do anything here
       //   // do we loosen that requirement or perhaps have a different "shutdown"
       //   // method? Does seem like you'd want to log a shutdown error
       //   // but don't really care about that *here*

package/lib/collector/http-agents.js

@@ -42,7 +42,7 @@ exports.keepAliveAgent = function keepAliveAgent(config) {
  * NPM package with configuration suitable for working via
  * the configured newrelic-agent's proxy configuration.
  *
- * Include keep-alive configuration, but ultimatly its up
+ * Include keep-alive configuration, but ultimately its up
  * to the proxy server as to how its connection is made
  * with New Relic's servers.
  */

package/lib/collector/remote-method.js

@@ -190,7 +190,7 @@ RemoteMethod.prototype._safeRequest = function _safeRequest(options) {
     throw new Error('Maximum payload size exceeded')
   }
 
-  // If trace level is not explicity enabled check to see if the audit log is
+  // If trace level is not explicitly enabled check to see if the audit log is
   // enabled.
   if (logConfig != null && logConfig.level !== 'trace' && auditLog.enabled) {
     // If the filter property is empty, then always log the event otherwise

package/lib/config/attribute-filter.js

@@ -145,7 +145,7 @@ AttributeFilter.prototype._filter = function _filter(scope, destinations, key) {
   var globalInclude = null
   var globalExclude = null
 
-  // Iterate over each desination and see if the rules apply.
+  // Iterate over each destination and see if the rules apply.
   for (var i = 0; i < scope.length; ++i) {
     var dest = scope[i]
     var destId = dest.id

package/lib/config/default.js

@@ -231,7 +231,7 @@ exports.config = () => ({
     enabled: false,
 
     /**
-     * Specify which methods are logged. Used in conjuction with the audit_log flag
+     * Specify which methods are logged. Used in conjunction with the audit_log flag
      * If audit_log is enabled and this property is empty, all methods will be logged
      * Otherwise, if the audit log is enabled, only the methods specified
      * in the filter will be logged
@@ -340,7 +340,7 @@ exports.config = () => ({
     detect_aws: true,
     /**
      * This flag dictates whether the agent attempts to detect if the
-     * the process is running on Pivotal Cloud Foundary.
+     * the process is running on Pivotal Cloud Foundry.
      *
      * @env NEW_RELIC_UTILIZATION_DETECT_PCF
      */
@@ -846,7 +846,7 @@ exports.config = () => ({
     enabled: false,
 
     /**
-     * Exludes New Relic format distributed tracing header (`newrelic`) on
+     * Excludes New Relic format distributed tracing header (`newrelic`) on
      * outbound requests when set to `true`. By default (when false)
      * both W3C TraceContext (`traceparent`, `tracecontext`) and
      * New Relic formats will be sent.

package/lib/config/env.js

@@ -157,7 +157,9 @@ const ENV_MAPPING = {
       host: 'NEW_RELIC_INFINITE_TRACING_TRACE_OBSERVER_HOST',
       port: 'NEW_RELIC_INFINITE_TRACING_TRACE_OBSERVER_PORT'
     },
-    queue_size: 'NEW_RELIC_INFINITE_TRACING_QUEUE_SIZE'
+    span_events: {
+      queue_size: 'NEW_RELIC_INFINITE_TRACING_SPAN_EVENTS_QUEUE_SIZE'
+    }
   }
 }
 

package/lib/config/index.js

@@ -1460,7 +1460,7 @@ Config.prototype.applyLasp = function applyLasp(agent, policies) {
       var localVal = settingBlock[valueName]
 
       // Indexes into "allowed values" based on "enabled" setting
-      // to retreive proper mapping.
+      // to retrieve proper mapping.
       var policyValues = localMapping.allowedValues
       var policyValue = policyValues[policy.enabled ? 1 : 0]
 
@@ -1602,7 +1602,7 @@ Config.prototype.getAggregatorConfig = function getAggregatorConfig(method) {
  *   5. If this module is installed as a dependency, the directory above the
  *      node_modules folder in which newrelic is installed.
  *
- * For configration via environment (useful on Joyent, Azure, Heroku, or
+ * For configuration via environment (useful on Joyent, Azure, Heroku, or
  * other PaaS offerings), set NEW_RELIC_NO_CONFIG_FILE to something truthy
  * and read README.md for details on what configuration variables are
  * necessary, as well as a complete enumeration of the other available

package/lib/db/parse-sql.js

@@ -22,7 +22,7 @@ var OPERATIONS = [
 ]
 var COMMENT_PATTERN = /\/\\*.*?\\*\//
 
-// This must be called syncronously after the initial db call for backtraces to
+// This must be called synchronously after the initial db call for backtraces to
 // work correctly
 
 module.exports = function parseSql(type, sql) {

package/lib/db/query-parsers/sql.js

@@ -24,7 +24,7 @@ var OPERATIONS = [
 ]
 var COMMENT_PATTERN = /\/\\*.*?\\*\//g
 
-// This must be called syncronously after the initial db call for backtraces to
+// This must be called synchronously after the initial db call for backtraces to
 // work correctly
 
 module.exports = function parseSql(sql) {

package/lib/db/slow-query.js

@@ -22,9 +22,8 @@ function SlowQuery(segment, type, query, trace) {
 }
 
 function normalizedHash(value) {
-  // We leverage the last 16 hex digits of which would mostly fit in a long and
-  // rely on parseInt to drop bits that do not fit in a JS number
-  return parseInt(crypto.createHash('sha1').update(value).digest('hex').slice(-16), 16)
+  // We leverage the last 15 hex digits which will fit in a signed long
+  return parseInt(crypto.createHash('sha1').update(value).digest('hex').slice(-15), 16)
 }
 
 function formatTrace(trace) {

package/lib/grpc/connection.js

@@ -38,7 +38,7 @@ class GrpcConnection extends EventEmitter {
   /**
    * GrpcConnection constructor
    *
-   * Standard property setting/initilization, and sets an initial
+   * Standard property setting/initialization, and sets an initial
    * connection state of disconnected
    *
    * @param {Object} traceObserverConfig config item config.infinite_tracing.trace_observer
@@ -290,7 +290,7 @@ class GrpcConnection extends EventEmitter {
   _generateCredentials(grpcApi) {
     let certBuffer = null
 
-    // Current settable value for testing. If allowed to be overriden via
+    // Current settable value for testing. If allowed to be overridden via
     // configuration, this should be removed in place of setting
     // this._rootCerts from config via normal configuration precedence.
     const envTestCerts = process.env.NEWRELIC_GRPCCONNECTION_CA

package/lib/instrumentation/core/http.js

@@ -177,7 +177,7 @@ function wrapEmitWithTransaction(agent, emit, isHTTPS) {
               'http.statusCode',
               responseCode
             )
-              
+
             segment.addSpanAttribute('http.statusCode', responseCode)
           }
         }
@@ -267,7 +267,7 @@ function wrapResponseEnd(agent, proto) {
         return end.apply(this, arguments)
       }
 
-      // If an error happend, add it to the aggregator.
+      // If an error happened, add it to the aggregator.
       if (txInfo.error) {
         if (!txInfo.errorHandled || urltils.isError(agent.config, this.statusCode)) {
           agent.errors.add(txInfo.transaction, txInfo.error)
@@ -291,7 +291,7 @@ function wrapResponseEnd(agent, proto) {
   })
 }
 
-// CAT this wont be used unless CAT is enabled, see below where we actually do
+// CAT this won't be used unless CAT is enabled, see below where we actually do
 // the shimmer stuff if you'd like to verify.
 function wrapWriteHead(agent, writeHead) {
   return function wrappedWriteHead() {

package/lib/instrumentation/fastify/spec-builders.js

@@ -59,7 +59,7 @@ function buildMiddlewareSpecForRouteHandler(shim, path) {
      * then this method is required/useful again.
      *
      * The isFinal param determines whether or not a path is appended for
-     * this particuar piece of middleware. (i.e. if this is the final handler
+     * this particular piece of middleware. (i.e. if this is the final handler
      * that is actually handling the request, the path is actually left on)
      */
     next: function wrapNext(shim, fn, fnName, args, bindSegment) {

package/lib/instrumentation/fastify.js

@@ -1,4 +1,5 @@
 'use strict'
+const semver = require('semver')
 const {
   buildMiddlewareSpecForRouteHandler,
   buildMiddlewareSpecForMiddlewareFunction
@@ -37,6 +38,12 @@ const setupRouteHandler = (shim, fastify) => {
 }
 
 const setupMiddlewareHandlers = (shim, fastify) => {
+  // Don't wrap use() in fastify v3+
+  const fastifyVersion = shim.require('./package.json').version
+  if (semver.satisfies(fastifyVersion, '>=3.0.0')) {
+    return
+  }
+
   shim.wrap(fastify, 'use', function wrapFastifyUse(shim, fn) {
     return function wrappedFastifyUser() {
       const args = shim.argsToArray.apply(shim, arguments)

package/lib/parse-proc-cpuinfo.js

@@ -22,7 +22,7 @@ function parseProcCPUInfo(data) {
     packages: null
   }
 
-  // seperate the processors
+  // separate the processors
   var splitData = data.split('\n')
     .map(function formatAttribute(attr) {
       return attr.split(':')

package/lib/proxy/grpc.js

@@ -8,7 +8,7 @@ class ProxyGrpc {
   constructor(grpcLibrary = '@grpc/grpc-js') {
     this.library = require(grpcLibrary)
 
-    // add methods or objets from base grpc class that we need as needed
+    // add methods or objects from base grpc class that we need as needed
     this.credentials = this.library.credentials
     this.Metadata = this.library.Metadata
     this.loadPackageDefinition = this.library.loadPackageDefinition

package/lib/serverless/aws-lambda.js

@@ -129,7 +129,6 @@ class AwsLambda {
       const segmentRecorder = isApiGatewayLambdaProxy ? recordWeb : recordBackground
       const segment = shim.createSegment(functionName, segmentRecorder)
       transaction.baseSegment = segment
-      
       // resultProcessor is used to execute additional logic based on the
       // payload supplied to the callback.
       let resultProcessor
@@ -180,7 +179,6 @@ class AwsLambda {
       shim.agent.setLambdaArn(context.invokedFunctionArn)
 
       shim.agent.setLambdaFunctionVersion(context.functionVersion)
-      
       segment.addSpanAttributes(awsAttributes)
 
       segment.start()
@@ -194,7 +192,7 @@ class AwsLambda {
         throw err
       }
       if (shim.isPromise(res)) {
-        res = lambdaInterceptPromise(res, txnEnder)
+        res = lambdaInterceptPromise(res, resultProcessor, txnEnder)
       }
       return res
     }
@@ -202,8 +200,11 @@ class AwsLambda {
     // In order to capture error events
     // we need to store the error in uncaughtException
     // otherwise the transaction will end before they are captured
-    function lambdaInterceptPromise(prom, cb) {
+    function lambdaInterceptPromise(prom, resultProcessor, cb) {
       return prom.then(function onThen(arg) {
+        if (resultProcessor) {
+          resultProcessor(arg)
+        }
         cb()
         return arg
       }, function onCatch(err) {
@@ -397,7 +398,10 @@ function setWebResponse(transaction, response) {
       responseCode
     )
 
-    const segment = transaction.agent.tracer.getSegment()
+    // We are adding http.statusCode to base segment as
+    // we found in testing async invoked lambdas, the
+    // active segement is not available at this point.
+    const segment = transaction.baseSegment
 
     segment.addSpanAttribute('http.statusCode', responseCode)
   }

package/lib/shim/promise-shim.js

@@ -46,7 +46,7 @@ class PromiseShim extends Shim {
   }
 
   /**
-   * Sets the class used to indentify promises from the wrapped promise library.
+   * Sets the class used to identify promises from the wrapped promise library.
    *
    * @param {function} clss - The promise library's class.
    */

package/lib/shim/shim.js

@@ -308,7 +308,7 @@ Shim.prototype.__NR_unwrap = unwrapAll
  *
  * @description
  *  The syntax for declarative instrumentation. It can be used interlaced with
- *  custom, hand-written instrumentation for one-off or hard to simplifiy
+ *  custom, hand-written instrumentation for one-off or hard to simplify
  *  instrumentation logic.
  *
  * @property {Spec|WrapFunction} $return
@@ -1949,10 +1949,10 @@ function bindPromise(promise, segment) {
  * Copies the given parameters onto the segment, respecting the current agent
  * configuration.
  *
- * @memberof Shim.protoype
+ * @memberof Shim.prototype
  *
  * @param {TraceSegment}  segment     - The segment to copy the parameters onto.
- * @param {object}        parameters  - The paramters to copy.
+ * @param {object}        parameters  - The parameters to copy.
  */
 function copySegmentParameters(segment, parameters) {
   for (var key in parameters) {

package/lib/shim/transaction-shim.js

@@ -184,7 +184,7 @@ function bindCreateTransaction(nodule, property, spec) {
  *
  * - `pushTransactionName(pathSegment)`
  *
- * Transactions are named for the middlware that sends the reponse. Some web
+ * Transactions are named for the middlware that sends the response. Some web
  * frameworks are capable of mounting middlware in complex routing stacks. In
  * order to maintain the correct name, transactions keep a stack of mount points
  * for each middlware/router/app/whatever. The instrumentation should push on

package/lib/shim/webframework-shim.js

@@ -331,7 +331,7 @@ function setFramework(framework) {
 }
 
 /**
- * Sets the URI path to be used for naming the transaction currenty in scope.
+ * Sets the URI path to be used for naming the transaction currently in scope.
  *
  * @memberof WebFrameworkShim.prototype
  *

package/lib/shimmer.js

@@ -381,7 +381,7 @@ var shimmer = module.exports = {
      * Forces file name resolve for modules not in our cache when
      * their parent has already been loaded/cached by Node.
      * Provides a fall-back for unexpected cases that may occur.
-     * Also provides flexibilty for testing now that node 11+ caches these.
+     * Also provides flexibility for testing now that node 11+ caches these.
      * @param {*} request
      * @param {*} parent
      * @param {*} isMain

package/lib/spans/create-span-event-aggregator.js

@@ -16,7 +16,7 @@ function createSpanEventAggregator(config, collector, metrics) {
     // TODO: ideally this validation and configuration clearing would happen
     // in the config. Since we don't currently have a way to generate
     // support metrics in the config, keeping this related logic together here.
-    // If logic happened prior, could merely check for existance of trace_observer.host.
+    // If logic happened prior, could merely check for existence of trace_observer.host.
     shouldCreateStreaming = validateInfiniteTracing(config.infinite_tracing.trace_observer)
 
     if (!shouldCreateStreaming) {

package/lib/spans/span-streamer.js

@@ -128,7 +128,7 @@ class SpanStreamer {
     // to clear the queue
     while (this.spans.length > 0 && this._writable) {
       const nextObject = this.spans.shift()
-      this.send(nextObject)
+      this.send(nextObject.toStreamingFormat())
     }
 
     logger.trace(

package/lib/spans/streaming-span-event-aggregator.js

@@ -58,7 +58,7 @@ class StreamingSpanEventAggregator extends Aggregator {
     // Only log once started. This will get invoked on initial harvest
     // prior to start which we'll just ignore.
     if (this.started) {
-      logger.warnOnce(SEND_WARNING)
+      logger.warnOnce('SEND_WARNING', SEND_WARNING)
     }
 
     this.emit(`finished ${this.method} data send.`)

package/lib/timer.js

@@ -112,7 +112,7 @@ Timer.prototype.hasEnd = function hasEnd() {
 }
 
 /*
- * Sets duration and stops the timer, since the passed-in duration will take precendence
+ * Sets duration and stops the timer, since the passed-in duration will take precedence
  * over the measured duration.
  * @param {number} duration The duration the timer should report.
  */

package/lib/transaction/dt-payload.js

@@ -12,7 +12,7 @@ const DT_VERSION_MINOR = 1
 
 module.exports = class DistributedTracePayload {
   /**
-   * The class reponsible for producing distributed trace payloads.
+   * The class responsible for producing distributed trace payloads.
    * Created by calling {@link TransactionHandle#_createDistributedTracePayload}.
    *
    * @constructor

package/lib/transaction/index.js

@@ -509,7 +509,7 @@ Transaction.prototype._markAsWeb = function _markAsWeb(rawURL) {
  * Sets the transaction's name and determines if it will be ignored.
  *
  * @param {string} [name]
- *  Optional. The partial name to use for the finalized transaction. If ommitted
+ *  Optional. The partial name to use for the finalized transaction. If omitted
  *  the current partial name is used.
  */
 Transaction.prototype.finalizeName = function finalizeName(name) {
@@ -813,7 +813,7 @@ Transaction.prototype.hasOnlyExpectedErrors = function hasOnlyExpectedErrors() {
 
   for (let i = 0;i < this.exceptions.length;i++) {
     const exception = this.exceptions[i]
-    // this expection is neither expected nor ignored
+    // this exception is neither expected nor ignored
     const isUnexpected = !(
       errorHelper.isExpectedException(
         this,

package/lib/transaction/tracecontext.js

@@ -27,7 +27,7 @@ const FLAGS = {
 }
 
 /**
- * The class reponsible for accepting, validating, and producing w3c tracecontext headers.
+ * The class responsible for accepting, validating, and producing w3c tracecontext headers.
  */
 class TraceContext {
   /**
@@ -255,7 +255,7 @@ class TraceContext {
       return traceContextData
     }
 
-    // Keep the raw, non-NewRelic tracestate string stored so that we can propogate it
+    // Keep the raw, non-NewRelic tracestate string stored so that we can propagate it
     this._traceStateRaw = parsedState.newTraceState
 
     // These need to be kept to be added to root span events as an attribute

package/lib/util/byte-limit.js

@@ -55,7 +55,7 @@ function truncate(val, limit) {
 
   // Continue the binary search till:
   // 1) The string is the desired length (i.e. cmpVal = 0) OR
-  // 2) The desired string must split a character to acheive the desired byte length
+  // 2) The desired string must split a character to achieve the desired byte length
   //    In this case, we should cut the character that would be split.
   //    (i.e. delta > 1 character OR the string is larger than the limit)
   var substr

package/lib/utilization/common.js

@@ -81,7 +81,7 @@ exports.request = function request(opts, agent, cb) {
         return cb(new Error('Request for metadata failed.'))
       } else if (!data) {
         logger.debug('Got no response data?')
-        return cb(new Error('No reponse data received.'))
+        return cb(new Error('No response data received.'))
       }
 
       cb(null, data.toString('utf8'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "7.0.0",
+  "version": "7.1.1",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -136,13 +136,15 @@
     "unit": "rm -f newrelic_agent.log && time tap --test-regex='(\\/|^test\\/unit\\/.*\\.test\\.js)$' --timeout=180 --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"
+    "update-changelog-version": "node ./bin/update-changelog-version",
+    "versioned": "npm run prepare-test && time ./bin/run-versioned-tests.sh",
+    "version": "npm run update-changelog-version && git add ./NEWS.md"
   },
   "bin": {
     "newrelic-naming-rules": "./bin/test-naming-rules.js"
   },
   "dependencies": {
-    "@grpc/grpc-js": "1.1.7",
+    "@grpc/grpc-js": "^1.2.5",
     "@grpc/proto-loader": "^0.5.5",
     "@newrelic/aws-sdk": "^3.0.0",
     "@newrelic/koa": "^5.0.0",
@@ -161,6 +163,7 @@
   "devDependencies": {
     "@newrelic/proxy": "^2.0.0",
     "@newrelic/test-utilities": "^5.0.0",
+    "@octokit/rest": "^18.0.15",
     "JSV": "~4.0.2",
     "architect": "*",
     "benchmark": "^2.1.4",
@@ -187,7 +190,7 @@
     "rimraf": "^2.6.3",
     "should": "*",
     "sinon": "^4.5.0",
-    "tap": "^14.10.7",
+    "tap": "^14.10.8",
     "temp": "^0.8.1",
     "through": "^2.3.6",
     "when": "*"

package/stub_api.js

@@ -61,7 +61,7 @@ function setLambdaHandler(callback) {
 }
 
 function startSegment(name, record, handler, callback) {
-  logger.debug('Not calling `startSegment` becuase New Relic is disabled.')
+  logger.debug('Not calling `startSegment` because New Relic is disabled.')
   if (typeof handler === 'function') {
     return handler(callback)
   }

package/third_party_manifest.json

@@ -1,18 +1,18 @@
 {
-  "lastUpdated": "Mon Nov 09 2020 13:48:47 GMT-0800 (Pacific Standard Time)",
+  "lastUpdated": "Mon Feb 01 2021 09:58:16 GMT-0800 (Pacific Standard Time)",
   "projectName": "New Relic Node Agent",
   "projectUrl": "https://github.com/newrelic/node-newrelic",
   "includeDev": true,
   "dependencies": {
-    "@grpc/grpc-js@1.1.7": {
+    "@grpc/grpc-js@1.2.5": {
       "name": "@grpc/grpc-js",
-      "version": "1.1.7",
-      "range": "1.1.7",
+      "version": "1.2.5",
+      "range": "^1.2.5",
       "licenses": "Apache-2.0",
       "repoUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
-      "versionedRepoUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.1.7",
+      "versionedRepoUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.2.5",
       "licenseFile": "node_modules/@grpc/grpc-js/LICENSE",
-      "licenseUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.1.7/LICENSE",
+      "licenseUrl": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.2.5/LICENSE",
       "licenseTextSource": "file",
       "publisher": "Google Inc."
     },
@@ -184,6 +184,17 @@
       "publisher": "New Relic Node.js agent team",
       "email": "nodejs@newrelic.com"
     },
+    "@octokit/rest@18.0.15": {
+      "name": "@octokit/rest",
+      "version": "18.0.15",
+      "range": "^18.0.15",
+      "licenses": "MIT",
+      "repoUrl": "https://github.com/octokit/rest.js",
+      "versionedRepoUrl": "https://github.com/octokit/rest.js/tree/v18.0.15",
+      "licenseFile": "node_modules/@octokit/rest/LICENSE",
+      "licenseUrl": "https://github.com/octokit/rest.js/blob/v18.0.15/LICENSE",
+      "licenseTextSource": "file"
+    },
     "JSV@4.0.2": {
       "name": "JSV",
       "version": "4.0.2",
@@ -552,15 +563,15 @@
       "licenseTextSource": "file",
       "publisher": "Christian Johansen"
     },
-    "tap@14.10.7": {
+    "tap@14.10.8": {
       "name": "tap",
-      "version": "14.10.7",
-      "range": "^14.10.7",
+      "version": "14.10.8",
+      "range": "^14.10.8",
       "licenses": "ISC",
       "repoUrl": "https://github.com/tapjs/node-tap",
-      "versionedRepoUrl": "https://github.com/tapjs/node-tap/tree/v14.10.7",
+      "versionedRepoUrl": "https://github.com/tapjs/node-tap/tree/v14.10.8",
       "licenseFile": "node_modules/tap/LICENSE",
-      "licenseUrl": "https://github.com/tapjs/node-tap/blob/v14.10.7/LICENSE",
+      "licenseUrl": "https://github.com/tapjs/node-tap/blob/v14.10.8/LICENSE",
       "licenseTextSource": "file",
       "publisher": "Isaac Z. Schlueter",
       "email": "i@izs.me",