newrelic 8.11.0 → 8.12.0

package/NEWS.md

@@ -1,3 +1,25 @@
+### v8.12.0 (2022-05-24)
+
+* Added instrumentation to pino to support application logging use cases: forwarding, local decorating, and metrics.
+
+* Added supportability metrics about the data usage bytes of harvested data to the collector endpoints.
+
+* Added an optional way to avoid wrapping browser agent script with <script> tag when using `api.getBrowserTimingHeader`.  This will ease usage with Component based libraries like React.
+
+  Thanks to @github-dd-nicolas for the contribution. 🎉
+
+* Upgraded `@grpc/proto-loader` to fix a [CVE](https://security.snyk.io/vuln/SNYK-JS-PROTOBUFJS-2441248) with `protobufjs`.
+
+* Upgraded `@newrelic/test-utilities` to resolve a dev-only audit warning.
+
+### v8.11.2 (2022-05-23)
+
+* Fixed winston instrumentation to no longer coerce every log line to be json.
+
+### v8.11.1 (2022-05-13)
+
+* Fixed an issue with winston instrumentation that caused agent to crash when creating a winston logger from an existing instantiated logger.
+
 ### v8.11.0 (2022-05-11)
 
 * Added application logging for Winston in the Node.js agent

package/THIRD_PARTY_NOTICES.md

@@ -19,7 +19,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [@newrelic/aws-sdk](#newrelicaws-sdk)
 * [@newrelic/koa](#newrelickoa)
 * [@newrelic/superagent](#newrelicsuperagent)
-* [@newrelic/winston-enricher](#newrelicwinston-enricher)
 * [@tyriar/fibonacci-heap](#tyriarfibonacci-heap)
 * [async](#async)
 * [concat-stream](#concat-stream)
@@ -296,7 +295,7 @@ This product includes source derived from [@grpc/grpc-js](https://github.com/grp
 
 ### @grpc/proto-loader
 
-This product includes source derived from [@grpc/proto-loader](https://github.com/grpc/grpc-node) ([v0.6.9](https://github.com/grpc/grpc-node/tree/v0.6.9)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/blob/v0.6.9/LICENSE):
+This product includes source derived from [@grpc/proto-loader](https://github.com/grpc/grpc-node) ([v0.6.12](https://github.com/grpc/grpc-node/tree/v0.6.12)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/blob/v0.6.12/LICENSE):
 
 ```
                                  Apache License
@@ -1129,215 +1128,6 @@ This product includes source derived from [@newrelic/superagent](https://github.
 
 ```
 
-### @newrelic/winston-enricher
-
-This product includes source derived from [@newrelic/winston-enricher](https://github.com/newrelic/newrelic-node-log-extensions) ([v3.1.1](https://github.com/newrelic/newrelic-node-log-extensions/tree/v3.1.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/newrelic-node-log-extensions/blob/v3.1.1/LICENSE):
-
-```
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2019 New Relic, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-```
-
 ### @tyriar/fibonacci-heap
 
 This product includes source derived from [@tyriar/fibonacci-heap](https://github.com/gwtw/ts-fibonacci-heap) ([v2.0.9](https://github.com/gwtw/ts-fibonacci-heap/tree/v2.0.9)), distributed under the [MIT License](https://github.com/gwtw/ts-fibonacci-heap/blob/v2.0.9/LICENSE):
@@ -1980,7 +1770,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ### @newrelic/test-utilities
 
-This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v6.5.2](https://github.com/newrelic/node-test-utilities/tree/v6.5.2)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v6.5.2/LICENSE):
+This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v6.5.3](https://github.com/newrelic/node-test-utilities/tree/v6.5.3)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v6.5.3/LICENSE):
 
 ```
                                  Apache License

package/api.js

@@ -27,8 +27,8 @@ const NAMES = require('./lib/metrics/names')
  * CONSTANTS
  *
  */
-const RUM_STUB =
-  "<script type='text/javascript' %s>window.NREUM||(NREUM={});" + 'NREUM.info = %s; %s</script>'
+const RUM_STUB = 'window.NREUM||(NREUM={});NREUM.info = %s;'
+const RUM_STUB_SHELL = `<script type='text/javascript' %s>${RUM_STUB} %s</script>`
 
 // these messages are used in the _gracefail() method below in getBrowserTimingHeader
 const RUM_ISSUES = [
@@ -150,32 +150,7 @@ API.prototype.getLinkingMetadata = function getLinkingMetadata(omitSupportabilit
     metric.incrementCallCount()
   }
 
-  const agent = this.agent
-
-  const segment = agent.tracer.getSegment()
-  const config = agent.config
-
-  const linkingMetadata = {
-    'entity.name': config.applications()[0],
-    'entity.type': 'SERVICE',
-    'hostname': config.getHostnameSafe()
-  }
-
-  if (config.distributed_tracing.enabled && segment) {
-    linkingMetadata['trace.id'] = segment.transaction.traceId
-    const spanId = segment.getSpanId()
-    if (spanId) {
-      linkingMetadata['span.id'] = spanId
-    }
-  } else {
-    logger.debug('getLinkingMetadata with no active transaction')
-  }
-
-  if (config.entity_guid) {
-    linkingMetadata['entity.guid'] = config.entity_guid
-  }
-
-  return linkingMetadata
+  return this.agent.getLinkingMetadata()
 }
 
 /**
@@ -514,19 +489,24 @@ API.prototype.addIgnoringRule = function addIgnoringRule(pattern) {
 }
 
 /**
- * Get the <script>...</script> header necessary for Browser Monitoring
+ * Get the script header necessary for Browser Monitoring
  * This script must be manually injected into your templates, as high as possible
  * in the header, but _after_ any X-UA-COMPATIBLE HTTP-EQUIV meta tags.
  * Otherwise you may hurt IE!
  *
+ * By default this method will return a script wrapped by `<script>` tags, but with
+ * option `hasToRemoveScriptWrapper` it can send back only the script content
+ * without the `<script>` wrapper. Useful for React component based frontend.
+ *
  * This method must be called _during_ a transaction, and must be called every
  * time you want to generate the headers.
  *
  * Do *not* reuse the headers between users, or even between requests.
  *
  * @param {string} [options.nonce] - Nonce to inject into `<script>` header.
+ * @param {boolean} [options.hasToRemoveScriptWrapper] - Used to import agent script without `<script>` tag wrapper.
  * @param options
- * @returns {string} The `<script>` header to be injected.
+ * @returns {string} The script content to be injected in `<head>` or put inside `<script>` tag (depending on options)
  */
 API.prototype.getBrowserTimingHeader = function getBrowserTimingHeader(options) {
   const metric = this.agent.metrics.getOrCreateMetric(
@@ -675,9 +655,10 @@ API.prototype.getBrowserTimingHeader = function getBrowserTimingHeader(options)
 
   // set nonce attribute if passed in options
   const nonce = options && options.nonce ? 'nonce="' + options.nonce + '"' : ''
+  const script = options && options.hasToRemoveScriptWrapper ? RUM_STUB : RUM_STUB_SHELL
 
   // the complete header to be written to the browser
-  const out = util.format(RUM_STUB, nonce, json, jsAgentLoader)
+  const out = util.format(script, nonce, json, jsAgentLoader)
 
   logger.trace('generating RUM header', out)
 

package/lib/agent.js

@@ -923,6 +923,76 @@ Agent.prototype._listenForConfigChanges = function _listenForConfigChanges() {
   })
 }
 
+/**
+ * This method returns an object with the following keys/data:
+ * - `trace.id`: The current trace ID
+ * - `span.id`: The current span ID
+ * - `entity.name`: The application name specified in the connect request as
+ *   app_name. If multiple application names are specified this will only be
+ *   the first name
+ * - `entity.type`: The string "SERVICE"
+ * - `entity.guid`: The entity ID returned in the connect reply as entity_guid
+ * - `hostname`: The hostname as specified in the connect request as
+ *   utilization.full_hostname. If utilization.full_hostname is null or empty,
+ *   this will be the hostname specified in the connect request as host.
+ *
+ * @returns {LinkingMetadata} The linking object with the data above
+ */
+Agent.prototype.getLinkingMetadata = function getLinkingMetadata() {
+  const segment = this.tracer.getSegment()
+  const config = this.config
+
+  const linkingMetadata = {
+    'entity.name': config.applications()[0],
+    'entity.type': 'SERVICE',
+    'hostname': config.getHostnameSafe()
+  }
+
+  if (config.distributed_tracing.enabled && segment) {
+    linkingMetadata['trace.id'] = segment.transaction.traceId
+    const spanId = segment.getSpanId()
+    if (spanId) {
+      linkingMetadata['span.id'] = spanId
+    }
+  } else {
+    logger.debug('getLinkingMetadata with no active transaction')
+  }
+
+  if (config.entity_guid) {
+    linkingMetadata['entity.guid'] = config.entity_guid
+  }
+
+  return linkingMetadata
+}
+
+/**
+ * Formats the NR-LINKING blob that matches the spec
+ *
+ * @returns {string} formatted NR-LINKING string
+ */
+Agent.prototype.getNRLinkingMetadata = function getNRLinkingMetadata() {
+  const metadata = this.getLinkingMetadata()
+  const nrLinkingMeta = [
+    getValue('entity.guid'),
+    getValue('hostname'),
+    getValue('trace.id'),
+    getValue('span.id'),
+    encodeURIComponent(getValue('entity.name'))
+  ]
+
+  return ` NR-LINKING|${nrLinkingMeta.join('|')}|`
+
+  /**
+   * Retries value for a given key but defaults to `` if falsey
+   *
+   * @param {string} key in linking metadata
+   * @returns {string}
+   */
+  function getValue(key) {
+    return metadata[key] || ''
+  }
+}
+
 function generateEventHarvestSupportMetrics(agent, harvestConfig) {
   const harvestLimits = harvestConfig.harvest_limits
 

package/lib/aggregators/log-aggregator.js

@@ -34,8 +34,21 @@ class LogAggregator extends EventAggregator {
       return
     }
 
-    const eventData = events.toArray()
-    return [{ logs: eventData }]
+    const logs = events.toArray()
+
+    /**
+     *  Due to logging library implementation details
+     *  some log lines are already JSON. We must de-serialize
+     *  so it can be serialized in RemoteMethod. I know, this sucks.
+     */
+    const formattedLogs = logs.map((logLine) => {
+      if (typeof logLine === 'string') {
+        return JSON.parse(logLine)
+      }
+
+      return logLine
+    })
+    return [{ logs: formattedLogs }]
   }
 
   add(logLine) {

package/lib/collector/api.js

@@ -68,20 +68,24 @@ function CollectorAPI(agent) {
   /* RemoteMethods can be reused and have little per-object state, so why not
    * save some GC time?
    */
-  this._methods = {
-    preconnect: new RemoteMethod('preconnect', agent.config, initialEndpoint),
-    connect: new RemoteMethod('connect', agent.config, initialEndpoint),
-    settings: new RemoteMethod('agent_settings', agent.config, initialEndpoint),
-    errors: new RemoteMethod('error_data', agent.config, initialEndpoint),
-    metrics: new RemoteMethod('metric_data', agent.config, initialEndpoint),
-    traces: new RemoteMethod('transaction_sample_data', agent.config, initialEndpoint),
-    shutdown: new RemoteMethod('shutdown', agent.config, initialEndpoint),
-    events: new RemoteMethod('analytic_event_data', agent.config, initialEndpoint),
-    customEvents: new RemoteMethod('custom_event_data', agent.config, initialEndpoint),
-    queryData: new RemoteMethod('sql_trace_data', agent.config, initialEndpoint),
-    errorEvents: new RemoteMethod('error_event_data', agent.config, initialEndpoint),
-    spanEvents: new RemoteMethod('span_event_data', agent.config, initialEndpoint),
-    logEvents: new RemoteMethod('log_event_data', agent.config, initialEndpoint)
+  this._methods = {}
+  for (const [accessor, name] of [
+    ['preconnect', 'preconnect'],
+    ['connect', 'connect'],
+    ['settings', 'agent_settings'],
+    ['errors', 'error_data'],
+    ['metrics', 'metric_data'],
+    ['traces', 'transaction_sample_data'],
+    ['shutdown', 'shutdown'],
+    ['events', 'analytic_event_data'],
+    ['customEvents', 'custom_event_data'],
+    ['queryData', 'sql_trace_data'],
+    ['errorEvents', 'error_event_data'],
+    ['spanEvents', 'span_event_data'],
+    ['logEvents', 'log_event_data']
+  ]) {
+    const method = new RemoteMethod(name, agent, initialEndpoint)
+    this._methods[accessor] = method
   }
 }
 

package/lib/collector/remote-method.js

@@ -16,6 +16,11 @@ const Sink = require('../util/stream-sink')
 const agents = require('./http-agents')
 const certificates = require('./ssl/certificates')
 const isValidLength = require('../util/byte-limit').isValidLength
+const { DATA_USAGE } = require('../metrics/names')
+
+function getMetricName(name) {
+  return `${DATA_USAGE.PREFIX}/${name}/${DATA_USAGE.SUFFIX}`
+}
 
 /*
  *
@@ -29,13 +34,17 @@ const USER_AGENT_FORMAT = 'NewRelic-NodeAgent/%s (nodejs %s %s-%s)'
 const ENCODING_HEADER = 'CONTENT-ENCODING'
 const DEFAULT_ENCODING = 'identity'
 
-function RemoteMethod(name, config, endpoint) {
+function RemoteMethod(name, agent, endpoint) {
   if (!name) {
     throw new TypeError('Must include name of method to invoke on collector.')
   }
+  if (!agent) {
+    throw new TypeError('Must include an agent instance.')
+  }
 
   this.name = name
-  this._config = config
+  this._config = agent.config
+  this._agent = agent
   this._protocolVersion = 17
 
   this.endpoint = endpoint
@@ -62,6 +71,21 @@ RemoteMethod.prototype.serialize = function serialize(payload, callback) {
   return callback(null, res)
 }
 
+/**
+ * This records the amount of data usage per function call and sends
+ * it to the metrics.
+ *
+ * @param {string} sent        The serialized object we sent
+ * @param {object} received    The raw object we got back as a response
+ */
+RemoteMethod.prototype._reportDataUsage = function reportDataUsage(sent, received) {
+  const payloadByteLength = byteLength(sent)
+  const responseByteLength = received ? byteLength(JSON.stringify(received)) : 0
+  const measurement = [payloadByteLength, responseByteLength, true]
+  this._agent.metrics.measureBytes(DATA_USAGE.COLLECTOR, ...measurement)
+  this._agent.metrics.measureBytes(getMetricName(this.name), ...measurement)
+}
+
 /**
  * The primary operation on RemoteMethod objects. If you're calling anything on
  * RemoteMethod objects aside from invoke (and you're not writing test code),
@@ -88,7 +112,14 @@ RemoteMethod.prototype.invoke = function invoke(payload, nrHeaders, callback) {
       if (err) {
         return callback(err)
       }
-      this._post(serialized, nrHeaders, callback)
+      this._post(
+        serialized,
+        nrHeaders,
+        function onResponse(error, res) {
+          this._reportDataUsage(serialized, res && res.payload)
+          callback(error, res)
+        }.bind(this)
+      )
     }.bind(this)
   )
 }
@@ -251,6 +282,7 @@ RemoteMethod.prototype._safeRequest = function _safeRequest(options) {
  *                                      original callback given to .send).
  * @param {Function} options.onResponse Response handler for this request (created by
  *                                      ._post).
+ * @param options
  */
 RemoteMethod.prototype._request = function _request(options) {
   const requestOptions = {
@@ -375,6 +407,8 @@ RemoteMethod.prototype._headers = function _headers(options) {
  * load on the collector down.
  *
  * FIXME: come up with a better heuristic
+ *
+ * @param data
  */
 RemoteMethod.prototype._shouldCompress = function _shouldCompress(data) {
   return data && byteLength(data) > 65536

package/lib/instrumentation/pino/nr-hooks.js

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const pino = require('./pino')
+
+/**
+ * Need to use nr-hooks style for pino because we're using the onResolved hook
+ * to register instrumentation.
+ */
+module.exports = [
+  {
+    type: 'generic',
+    moduleName: 'pino',
+    onResolved: pino
+  }
+]