newrelic 10.0.0 → 10.1.0

package/NEWS.md

@@ -1,3 +1,20 @@
+### v10.1.0 (2023-05-04)
+
+* Added batching and compression to infinite tracing.
+   * These options are on by default. 
+   * To restore uncompressed spans set `config.infinite_tracing.compression` to `false`.
+   * To send single spans vs batches set `config.infinite_tracing.batching` to `false`.
+   * The environment variables for these new configurations are: `NEW_RELIC_INFINITE_TRACING_BATCHING` and `NEW_RELIC_INFINITE_TRACING_COMPRESSION`.
+
+* Added support to record Nest.js error stack traces.
+  * Nest.js is officially supported via underlying instrumentation of express or fastify.
+
+* Added job to create a release notes PR in the post-release workflow.
+
+* Removed request library and updated helper to use http/https to make requests in tests.
+
+* Reduced cognitive complexity in lib/serverless/aws-lambda.js
+
 ### v10.0.0 (2023-04-19)
 
 * **BREAKING** - Updated the default of `config.transaction_tracer.record_sql` from `off` to `obfuscated`. This means that sql statements will be captured but obfuscated.

package/THIRD_PARTY_NOTICES.md

@@ -62,7 +62,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [prettier](#prettier)
 * [proxyquire](#proxyquire)
 * [q](#q)
-* [request](#request)
 * [rimraf](#rimraf)
 * [should](#should)
 * [sinon](#sinon)
@@ -9165,68 +9164,6 @@ IN THE SOFTWARE.
 
 ```
 
-### request
-
-This product includes source derived from [request](https://github.com/request/request) ([v2.88.2](https://github.com/request/request/tree/v2.88.2)), distributed under the [Apache-2.0 License](https://github.com/request/request/blob/v2.88.2/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:
-
-You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-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
-
-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
-```
-
 ### 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/collector/serverless.js

@@ -23,10 +23,10 @@ class ServerlessCollector {
    * Constructs a new serverless collector instance with the give agent.
    *
    * @class
-   * @param pipePath
    * @classdesc
    *  A helper class for wrapping modules with segments
    * @param {Agent} agent - The agent this collector will use
+   * @param {string} pipePath path of the named pipe to the Lambda extension, if it's enabled
    */
   constructor(agent, pipePath) {
     this._agent = agent
@@ -45,7 +45,7 @@ class ServerlessCollector {
   /**
    * Sets the ARN to be sent up in the metadata.
    *
-   * @param arn
+   * @param {string} arn Amazon Resource Name of the function
    */
   setLambdaArn(arn) {
     this.metadata.arn = arn
@@ -54,7 +54,7 @@ class ServerlessCollector {
   /**
    * Sets the function_version to be sent up in the metadata.
    *
-   * @param function_version
+   * @param {string} function_version version indicator for Lambda function
    */
   setLambdaFunctionVersion(function_version) {
     this.metadata.function_version = function_version
@@ -84,7 +84,7 @@ class ServerlessCollector {
   /**
    * There is nothing to actually restart for serverless, so we do nothing.
    *
-   * @param cb
+   * @param {Function} cb callback function, if any
    */
   restart(cb) {
     setImmediate(cb, null, CollectorResponse.success(null))
@@ -216,6 +216,7 @@ class ServerlessCollector {
    * Constructs, serializes, and prints the final consolidated payload to stdout.
    *
    * @param {Function} cb The callback to invoke when finished.
+   * @returns {boolean} indicating if callback was defined and successfully executed
    */
   flushPayload(cb) {
     if (!this.enabled) {
@@ -270,7 +271,8 @@ class ServerlessCollector {
   /**
    * Writes payload to pipe
    *
-   * @param payload
+   * @param {string} payload serialized stringified-JSON payload to flush
+   * @returns {boolean} whether or not flush was successful
    */
   flushToPipeSync(payload) {
     try {

package/lib/config/default.js

@@ -1122,6 +1122,14 @@ defaultConfig.definition = () => ({
         formatter: int,
         default: 10000
       }
+    },
+    batching: {
+      formatter: boolean,
+      default: true
+    },
+    compression: {
+      formatter: boolean,
+      default: true
     }
   },
   /**

package/lib/grpc/connection.js

@@ -41,15 +41,17 @@ class GrpcConnection extends EventEmitter {
    * Standard property setting/initialization, and sets an initial
    * connection state of disconnected
    *
-   * @param {object} traceObserverConfig config item config.infinite_tracing.trace_observer
+   * @param {object} infiniteTracingConfig config item config.infinite_tracing
    * @param {MetricAggregator} metrics metric aggregator, for supportability metrics
    * @param {number} [reconnectDelayMs=15000] number of milliseconds to wait before reconnecting
    * for error states that require a reconnect delay.
    */
-  constructor(traceObserverConfig, metrics, reconnectDelayMs) {
+  constructor(infiniteTracingConfig, metrics, reconnectDelayMs = DEFAULT_RECONNECT_DELAY_MS) {
     super()
+    this._compression = infiniteTracingConfig.compression
+    this._method = infiniteTracingConfig.batching ? 'recordSpanBatch' : 'recordSpan'
 
-    this._reconnectDelayMs = reconnectDelayMs || DEFAULT_RECONNECT_DELAY_MS
+    this._reconnectDelayMs = reconnectDelayMs
 
     this._metrics = metrics
     this._setState(connectionStates.disconnected)
@@ -58,6 +60,7 @@ class GrpcConnection extends EventEmitter {
     this._runId = null
     this._requestHeadersMap = null
 
+    const traceObserverConfig = infiniteTracingConfig.trace_observer
     this._endpoint = this.getTraceObserverEndpoint(traceObserverConfig)
 
     this._client = null
@@ -70,18 +73,17 @@ class GrpcConnection extends EventEmitter {
    * Allows setting of connection details _after_ object constructions
    * but before the actual connection.
    *
-   * @param {string} endpoint the GRPC server's endpoint
    * @param {string} licenseKey the agent license key
    * @param {string} runId the current agent run id (also called agent run token)
    * @param {object} requestHeadersMap request headers map received from server connect.
    * @param {string} [rootCerts] string of root (ca) certificates to attach to the connection.
+   * @returns {GrpcConnection} the instance of grpc connection
    */
   setConnectionDetails(licenseKey, runId, requestHeadersMap, rootCerts) {
     this._licenseKey = licenseKey
     this._runId = runId
     this._requestHeadersMap = requestHeadersMap
     this._rootCerts = rootCerts
-
     return this
   }
 
@@ -95,9 +97,8 @@ class GrpcConnection extends EventEmitter {
    * Used to indicate a transition from one connection state to
    * the next.  Also responsible for emitting the connect state event
    *
-   * @param {int} state The connection state (See connectionStates above)
-   * @param {ClientDuplexStreamImpl} state The GRPC stream, when defined
-   * @param stream
+   * @param {number} state The connection state (See connectionStates above)
+   * @param {object} stream duplex stream
    */
   _setState(state, stream = null) {
     this._state = state
@@ -145,10 +146,11 @@ class GrpcConnection extends EventEmitter {
   /**
    * Method returns GRPC metadata for initial connection
    *
-   * @param {string} licenseKey
-   * @param {string} runId
-   * @param requestHeadersMap
-   * @param env
+   * @param {string} licenseKey agent key
+   * @param {string} runId agent run id
+   * @param {object} requestHeadersMap map of request headers to include
+   * @param {object} env process.env
+   * @returns {object} grpc metadata
    */
   _getMetadata(licenseKey, runId, requestHeadersMap, env) {
     const metadata = new grpc.Metadata()
@@ -172,8 +174,8 @@ class GrpcConnection extends EventEmitter {
    * Adds test metadata used to simulate connectivity issues
    * when appropriate env vars are set
    *
-   * @param {Metadata} metadata
-   * @param env
+   * @param {object} metadata metadata to set
+   * @param {object} env process.env
    */
   _setTestMetadata(metadata, env) {
     for (const [key, envVar] of Object.entries(GRPC_TEST_META)) {
@@ -236,7 +238,7 @@ class GrpcConnection extends EventEmitter {
    * Events from the GRPC stream (a ClientDuplexStreamImpl) are the main way
    * we communicate with the GRPC server.
    *
-   * @param {ClientDuplexStreamImpl} stream
+   * @param {object} stream duplex stream
    */
   _setupSpanStreamObservers(stream) {
     // Node streams require all data sent by the server to be read before the end
@@ -263,7 +265,7 @@ class GrpcConnection extends EventEmitter {
         // that the versioned Trace Observer is no longer available. Agents
         // MUST NOT attempt to reconnect in this case
         logger.info(
-          '[UNIMPLEMENTED]: Trace Obserserver is no longer available. Shutting down connection.'
+          '[UNIMPLEMENTED]: Trace Observer is no longer available. Shutting down connection.'
         )
         this._disconnect()
       } else if (grpc.status[grpc.status.OK] === grpcStatusName) {
@@ -297,7 +299,8 @@ class GrpcConnection extends EventEmitter {
   /**
    * Creates the GRPC credentials needed
    *
-   * @param grpcApi
+   * @param {object} grpcApi grpc lib
+   * @returns {object} ssl credentials
    */
   _generateCredentials(grpcApi) {
     let certBuffer = null
@@ -325,15 +328,17 @@ class GrpcConnection extends EventEmitter {
    *
    * Contains the actual logic that connects to the GRPC service.
    * "Connection" can be a somewhat misleading term here.  This method
-   * invokes the "recordSpan" remote proceduce call. Behind the scenes
+   * invokes the either `recordSpan` or `recordSpanBatch` remote procedure call. Behind the scenes
    * this makes an http2 request with the metadata, and then returns
    * a stream for further writing.
+   *
+   * @returns {object} stream duplex stream
    */
   _connectSpans() {
     if (!this._client) {
       // Only create once to avoid potential memory leak.
       // We create here (currently) for consistent error handling.
-      this._client = this._createClient(this._endpoint)
+      this._client = this._createClient()
     }
 
     const metadata = this._getMetadata(
@@ -343,7 +348,7 @@ class GrpcConnection extends EventEmitter {
       process.env
     )
 
-    const stream = this._client.recordSpan(metadata)
+    const stream = this._client[this._method](metadata)
     this._setupSpanStreamObservers(stream)
 
     return stream
@@ -357,9 +362,10 @@ class GrpcConnection extends EventEmitter {
    * the stream is closed and we do not have a handle to the client. Currently
    * impacting grpc-js@1.2.11 and several earlier versions.
    *
-   * @param endpoint
+   * @returns {object} protobuf API for IngestService
    */
-  _createClient(endpoint) {
+  _createClient() {
+    const endpoint = this._endpoint
     logger.trace('Creating gRPC client for: ', endpoint)
 
     const packageDefinition = protoLoader.loadSync(PROTO_DEFINITION_PATH, PROTO_OPTIONS)
@@ -369,7 +375,25 @@ class GrpcConnection extends EventEmitter {
     const traceApi = protoDescriptor.com.newrelic.trace.v1
 
     const credentials = this._generateCredentials(grpc)
-    return new traceApi.IngestService(endpoint, credentials)
+
+    // If you want to use mock server use insecure creds
+    // const credentials = grpc.credentials.createInsecure()
+
+    const opts = {}
+    if (this._compression) {
+      // 2 = gzip compression
+      // see: https://github.com/grpc/grpc-node/blob/master/packages/grpc-js/src/compression-algorithms.ts#L21
+      opts['grpc.default_compression_algorithm'] = 2
+      this._metrics
+        .getOrCreateMetric(`${NAMES.INFINITE_TRACING.COMPRESSION}/enabled`)
+        .incrementCallCount()
+    } else {
+      this._metrics
+        .getOrCreateMetric(`${NAMES.INFINITE_TRACING.COMPRESSION}/disabled`)
+        .incrementCallCount()
+    }
+
+    return new traceApi.IngestService(endpoint, credentials, opts)
   }
 }
 

package/lib/grpc/endpoints/infinite-tracing/v1.proto

@@ -6,6 +6,15 @@ service IngestService {
   // Accepts a stream of Span messages, and returns an irregular stream of
   // RecordStatus messages.
   rpc RecordSpan(stream Span) returns (stream RecordStatus) {}
+
+  // Accepts a stream of SpanBatch messages, and returns an irregular
+  // stream of RecordStatus messages. This endpoint can be used to improve
+  // throughput when Span messages are small
+  rpc RecordSpanBatch(stream SpanBatch) returns (stream RecordStatus) {}
+}
+
+message SpanBatch {
+  repeated Span spans = 1;
 }
 
 message Span {
@@ -27,3 +36,4 @@ message AttributeValue {
 message RecordStatus {
   uint64 messages_seen = 1;
 }
+

package/lib/instrumentation/@nestjs/core.js

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2023 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const logger = require('../../logger').child({ component: 'nestjs' })
+const semver = require('semver')
+
+module.exports = function initialize(agent, core, moduleName, shim) {
+  const nestJsVersion = shim.require('./package.json').version
+  shim.setFramework(shim.NEST)
+  // Earliest version that runs in the tests
+  if (semver.lt(nestJsVersion, '8.0.0')) {
+    logger.debug(
+      `Not instrumenting Nest.js version ${nestJsVersion}; minimum instrumentable version is 8.0.0`
+    )
+    return
+  }
+
+  shim.wrap(core.BaseExceptionFilter.prototype, 'handleUnknownError', (shim, original) => {
+    return function wrappedHandleUnknownError(exception) {
+      const segment = shim.getActiveSegment()
+      const transaction = segment?.transaction
+      if (transaction) {
+        shim.agent.errors.add(transaction, exception)
+        logger.trace(exception, 'Captured error handled by Nest.js exception filter.')
+      } else {
+        logger.trace(
+          exception,
+          'Ignoring error handled by Nest.js exception filter: not in a transaction'
+        )
+      }
+
+      return original.apply(this, arguments)
+    }
+  })
+}

package/lib/instrumentations.js

@@ -27,6 +27,7 @@ module.exports = function instrumentations() {
     'memcached': { type: MODULE_TYPE.DATASTORE },
     'mongodb': { type: MODULE_TYPE.DATASTORE },
     'mysql': { module: './instrumentation/mysql' },
+    '@nestjs/core': { type: MODULE_TYPE.WEB_FRAMEWORK },
     'pino': { module: './instrumentation/pino' },
     'pg': { type: MODULE_TYPE.DATASTORE },
     'q': { type: null },
@@ -52,7 +53,6 @@ module.exports = function instrumentations() {
     'npmlog': { type: MODULE_TYPE.TRACKING },
     'fancy-log': { type: MODULE_TYPE.TRACKING },
     '@prisma/client': { type: MODULE_TYPE.DATASTORE },
-    '@nestjs/core': { type: MODULE_TYPE.TRACKING },
     'knex': { type: MODULE_TYPE.TRACKING }
   }
 }

package/lib/metrics/names.js

@@ -264,7 +264,9 @@ const INFINITE_TRACING = {
   SPAN_RESPONSE_GRPC_STATUS: SUPPORTABILITY.INFINITE_TRACING + '/Span/gRPC/%s',
   QUEUE_CAPACITY: SUPPORTABILITY.INFINITE_TRACING + '/Span/QueueCapacity',
   QUEUE_SIZE: SUPPORTABILITY.INFINITE_TRACING + '/Span/QueueSize',
-  DRAIN_DURATION: SUPPORTABILITY.INFINITE_TRACING + '/Drain/Duration'
+  DRAIN_DURATION: SUPPORTABILITY.INFINITE_TRACING + '/Drain/Duration',
+  COMPRESSION: `${SUPPORTABILITY.INFINITE_TRACING}/gRPC/Compression`,
+  BATCHING: `${SUPPORTABILITY.INFINITE_TRACING}/gRPC/Batching`
 }
 
 const FEATURES = {

package/lib/serverless/aws-lambda.js

@@ -5,8 +5,6 @@
 
 'use strict'
 
-/* eslint sonarjs/cognitive-complexity: ["error", 29] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
-
 const apiGateway = require('./api-gateway')
 const headerAttributes = require('../header-attributes')
 const get = require('../util/get')
@@ -67,6 +65,45 @@ class AwsLambda {
     return null
   }
 
+  wrapEnders() {
+    const shim = this.shim
+    // There is no prependListener in node 4, so we wrap emit to look for 'beforeExit'
+    // NOTE: This may be converted to holding onto a single ender function if only
+    // one invocation is executing at a time.
+    shim.wrap(process, 'emit', function wrapEmit(shim, emit) {
+      return function wrappedEmit(ev, error) {
+        // need to add error as uncaughtException to be used
+        // later to add to transaction errors
+        if (ev === 'unhandledRejection') {
+          uncaughtException = error
+        }
+
+        if (['beforeExit', 'unhandledRejection'].includes(ev)) {
+          transactionEnders.forEach((ender) => {
+            ender()
+          })
+          transactionEnders = []
+        }
+        return emit.apply(process, arguments)
+      }
+    })
+  }
+
+  wrapFatal() {
+    const shim = this.shim
+    shim.wrap(process, '_fatalException', function wrapper(shim, original) {
+      return function wrappedFatalException(error) {
+        // logic placed before the _fatalException call, since it ends the invocation
+        uncaughtException = error
+        transactionEnders.forEach((ender) => {
+          ender()
+        })
+        transactionEnders = []
+        return original.apply(this, arguments)
+      }
+    })
+  }
+
   patchLambdaHandler(handler) {
     const awsLambda = this
     const shim = this.shim
@@ -80,38 +117,8 @@ class AwsLambda {
       // Only wrap emit on process the first time patch is called.
       patchCalled = true
 
-      // There is no prependListener in node 4, so we wrap emit to look for 'beforeExit'
-      // NOTE: This may be converted to holding onto a single ender function if only
-      // one invocation is executing at a time.
-      shim.wrap(process, 'emit', function wrapEmit(shim, emit) {
-        return function wrappedEmit(ev, error) {
-          // need to add error as uncaughtException to be used
-          // later to add to transaction errors
-          if (ev === 'unhandledRejection') {
-            uncaughtException = error
-          }
-
-          if (['beforeExit', 'unhandledRejection'].includes(ev)) {
-            transactionEnders.forEach((ender) => {
-              ender()
-            })
-            transactionEnders = []
-          }
-          return emit.apply(process, arguments)
-        }
-      })
-
-      shim.wrap(process, '_fatalException', function wrapper(shim, original) {
-        return function wrappedFatalException(error) {
-          // logic placed before the _fatalException call, since it ends the invocation
-          uncaughtException = error
-          transactionEnders.forEach((ender) => {
-            ender()
-          })
-          transactionEnders = []
-          return original.apply(this, arguments)
-        }
-      })
+      this.wrapEnders()
+      this.wrapFatal()
     }
 
     return shim.bindCreateTransaction(wrappedHandler, { type: shim.BG })
@@ -155,7 +162,7 @@ class AwsLambda {
 
       transactionEnders.push(txnEnder)
 
-      args[cbIndex] = wrapCallbackAndCaptureError(
+      args[cbIndex] = awsLambda.wrapCallbackAndCaptureError(
         transaction,
         txnEnder,
         args[cbIndex],
@@ -164,8 +171,8 @@ class AwsLambda {
 
       // context.{done,fail,succeed} are all considered deprecated by
       // AWS, but are considered functional.
-      context.done = wrapCallbackAndCaptureError(transaction, txnEnder, context.done)
-      context.fail = wrapCallbackAndCaptureError(transaction, txnEnder, context.fail)
+      context.done = awsLambda.wrapCallbackAndCaptureError(transaction, txnEnder, context.done)
+      context.fail = awsLambda.wrapCallbackAndCaptureError(transaction, txnEnder, context.fail)
       shim.wrap(context, 'succeed', function wrapSucceed(shim, original) {
         return function wrappedSucceed() {
           txnEnder()
@@ -215,25 +222,26 @@ class AwsLambda {
       )
       return prom
     }
+  }
 
-    function wrapCallbackAndCaptureError(transaction, txnEnder, cb, processResult) {
-      return function wrappedCallback() {
-        let err = arguments[0]
-        if (typeof err === 'string') {
-          err = new Error(err)
-        }
+  wrapCallbackAndCaptureError(transaction, txnEnder, cb, processResult) {
+    const shim = this.shim
+    return function wrappedCallback() {
+      let err = arguments[0]
+      if (typeof err === 'string') {
+        err = new Error(err)
+      }
 
-        shim.agent.errors.add(transaction, err)
+      shim.agent.errors.add(transaction, err)
 
-        if (processResult) {
-          const result = arguments[1]
-          processResult(result)
-        }
+      if (processResult) {
+        const result = arguments[1]
+        processResult(result)
+      }
 
-        txnEnder()
+      txnEnder()
 
-        return cb.apply(this, arguments)
-      }
+      return cb.apply(this, arguments)
     }
   }
 

package/lib/shim/webframework-shim.js

@@ -36,6 +36,7 @@ const FRAMEWORK_NAMES = {
   HAPI: 'Hapi',
   KOA: 'Koa',
   NEXT: 'Nextjs',
+  NEST: 'Nestjs',
   RESTIFY: 'Restify'
 }
 

package/lib/spans/base-span-streamer.js

@@ -0,0 +1,135 @@
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const logger = require('../logger').child({ component: 'base-span-streamer' })
+const NAMES = require('../metrics/names').INFINITE_TRACING
+const SPAN_DROP_MSG_INTERVAL_MS = 30000
+const SPAN_DROP_MSG =
+  'Queue full, dropping spans. ' +
+  `Will not warn again for ${SPAN_DROP_MSG_INTERVAL_MS / 1000} seconds.`
+
+class BaseSpanStreamer {
+  constructor(licenseKey, connection, metrics, queueSize) {
+    this.stream = null
+    this.license_key = licenseKey
+    this.connection = connection
+    this.queue_size = queueSize
+    this.spans = []
+    this._metrics = metrics
+    this._writable = false
+
+    // 'connected' indicates a safely writeable stream.
+    // May still be mid-connect to gRPC server.
+    this.connection.on('connected', (stream) => {
+      logger.info('Span streamer connected')
+      this.stream = stream
+      this._writable = true
+      this.sendQueue()
+    })
+
+    this.connection.on('disconnected', () => {
+      logger.info('Span streamer disconnected')
+      this.stream = null
+      this._writable = false
+    })
+  }
+
+  addToQueue() {
+    throw new Error('addToQueue is not implemented')
+  }
+
+  sendQueue() {
+    throw new Error('sendQueue is not implemented')
+  }
+
+  /* Accepts a span and either writes it to the stream, queues it to be sent,
+   * or drops it depending on stream/queue state
+   */
+  write(span) {
+    this._metrics.getOrCreateMetric(NAMES.SEEN).incrementCallCount()
+
+    // If not writeable (because of backpressure) queue the span
+    if (!this._writable) {
+      if (this.spans.length < this.queue_size) {
+        this.addToQueue(span)
+        return
+      }
+
+      // While this can be directionally calculated between seen/sent the
+      // queue makes that a bit more disconnected. This will be a bit more specific.
+      this._metrics.getOrCreateMetric(NAMES.DROPPED).incrementCallCount()
+
+      // If the queue is full drop the span
+      logger.infoOncePer(
+        'SPAN_DROP_MSG', // key for the OncePer
+        SPAN_DROP_MSG_INTERVAL_MS,
+        SPAN_DROP_MSG
+      )
+    }
+  }
+
+  /**
+   *  Sends the data(spans or span) over the stream. Spans are only sent here if the stream is
+   *  in a writable state. If the stream becomes unwritable after sending the
+   *  span, a drain event handler is setup to continue writing when possible.
+   *
+   * @param {*} data spans or span
+   * @param {number} [spanLen=1] number of spans sent in a stream(defaults to 1)
+   */
+  send(data, spanLen = 1) {
+    // false indicates the stream has reached the highWaterMark
+    // and future writes should be avoided until drained. written items,
+    // including the one that returned false, will still be buffered.
+    this._writable = this.stream.write(data)
+    this._metrics.getOrCreateMetric(NAMES.SENT).incrementCallCount(spanLen)
+
+    if (!this._writable) {
+      const waitDrainStart = Date.now()
+      const onDrain = this.drain.bind(this, waitDrainStart)
+      this.stream.once('drain', onDrain)
+    }
+  }
+
+  /**
+   *  Drains the span queue that built up when the connection was
+   *  back-pressured or disconnected. `waitDrainStart` is when the stream
+   *  initially blocked, used to time how long the stream was blocked. If this
+   *  is not defined, it is assumed this is being called after a reconnect,
+   *  and the metric is not used.
+   *
+   * @param {number} waitDrainStart time that drain started
+   */
+  drain(waitDrainStart) {
+    // Metric can be used to see how frequently completing drains as well as
+    // average time to drain from when we first notice.
+    const drainCompleted = Date.now()
+    const drainDurationMs = drainCompleted - waitDrainStart
+    this._metrics.getOrCreateMetric(NAMES.DRAIN_DURATION).recordValue(drainDurationMs / 1000)
+
+    // Once the 'drain' event fires we can begin writing to the stream again
+    this._writable = true
+
+    this.sendQueue()
+  }
+
+  connect(agentRunId, requestHeadersMap) {
+    this.connection.setConnectionDetails(this.license_key, agentRunId, requestHeadersMap)
+
+    this.connection.connectSpans(this.method)
+  }
+
+  disconnect() {
+    this.connection.disconnect()
+  }
+
+  createMetrics() {
+    this._metrics.getOrCreateMetric(NAMES.QUEUE_CAPACITY).recordValue(this.queue_size)
+    this._metrics.getOrCreateMetric(NAMES.QUEUE_SIZE).recordValue(this.spans.length)
+  }
+}
+
+module.exports = BaseSpanStreamer

package/lib/spans/batch-span-streamer.js

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2023 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const logger = require('../logger').child({ component: 'batch-span-streamer' })
+const BaseSpanStreamer = require('./base-span-streamer')
+
+class BatchSpanStreamer extends BaseSpanStreamer {
+  constructor(licenseKey, connection, metrics, queueSize) {
+    super(licenseKey, connection, metrics, queueSize)
+    this.sendTimer = null
+    this.batchSize = 750
+    this.connection.on('connected', () => {
+      logger.debug('Setting up batch interval')
+      this.sendTimer = setInterval(this.sendQueue.bind(this), 5000)
+      this.sendTimer.unref()
+    })
+
+    this.connection.on('disconnected', () => {
+      logger.debug('Clearing batch interval')
+      if (this.sendTimer) {
+        clearInterval(this.sendTimer)
+      }
+    })
+  }
+
+  addToQueue(span) {
+    this.spans.push(span.toStreamingFormat())
+  }
+
+  /* Accepts a span and either writes it to the stream, queues it to be sent,
+   * or drops it depending on stream/queue state
+   */
+  write(span) {
+    super.write(span)
+
+    if (!this._writable) {
+      return
+    }
+
+    this.addToQueue(span)
+
+    if (this.spans.length < this.queue_size) {
+      return
+    }
+
+    this.sendQueue()
+  }
+
+  /**
+   * Chunks the span queue into n per batch(currently at 750).
+   * The avg span is generally 1kb, picking an option slightly under to avoid
+   * being over 1MB uncompressed limit being imposed on the gRPC server.
+   * Since the processing happens asyc it'll be very hard to split further
+   * if a span batch is too big. We are being conservative here and other
+   * language agents transmit even smaller batches(100 per batch).
+   */
+  sendQueue() {
+    if (!this.spans.length) {
+      logger.trace('Queue is empty, not sending spans.')
+      return
+    }
+
+    for (let i = 0; i < this.spans.length; i += this.batchSize) {
+      const spans = this.spans.slice(i, i + this.batchSize)
+      logger.trace('Sending spans from queue: %s', spans.length)
+      this.send({ spans }, spans.length)
+    }
+
+    this.spans = []
+
+    logger.trace('Finished sending spans from queue.')
+  }
+}
+
+module.exports = BatchSpanStreamer

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

@@ -8,6 +8,7 @@
 const logger = require('../logger')
 const SpanEventAggregator = require('./span-event-aggregator')
 const StreamingSpanEventAggregator = require('./streaming-span-event-aggregator')
+const NAMES = require('../metrics/names').INFINITE_TRACING
 
 function createSpanEventAggregator(config, collector, metrics) {
   const traceObserver = config.infinite_tracing.trace_observer
@@ -42,16 +43,32 @@ function createSpanEventAggregator(config, collector, metrics) {
 function createStreamingAggregator(config, collector, metrics) {
   logger.trace('Creating streaming span event aggregator for infinite tracing.')
   const GrpcConnection = require('../grpc/connection')
-  const SpanStreamer = require('./span-streamer')
 
-  const connection = new GrpcConnection(config.infinite_tracing.trace_observer, metrics)
-  const spanStreamer = new SpanStreamer(
-    config.license_key,
-    connection,
-    metrics,
-    config.infinite_tracing.span_events.queue_size
-  )
+  const connection = new GrpcConnection(config.infinite_tracing, metrics)
+  let spanStreamer
 
+  if (config.infinite_tracing.batching) {
+    const BatchSpanStreamer = require('./batch-span-streamer')
+    spanStreamer = new BatchSpanStreamer(
+      config.license_key,
+      connection,
+      metrics,
+      config.infinite_tracing.span_events.queue_size
+    )
+    metrics.getOrCreateMetric(`${NAMES.BATCHING}/enabled`).incrementCallCount()
+  } else {
+    const SpanStreamer = require('./span-streamer')
+    spanStreamer = new SpanStreamer(
+      config.license_key,
+      connection,
+      metrics,
+      config.infinite_tracing.span_events.queue_size
+    )
+    metrics.getOrCreateMetric(`${NAMES.BATCHING}/disabled`).incrementCallCount()
+  }
+
+  // this periodMs has no affect on gRPC calls
+  // the send method on StreamingSpanEventAggregator is a no-op
   const opts = {
     periodMs: 1000,
     limit: 50000,

package/lib/spans/span-streamer.js

@@ -1,68 +1,29 @@
 /*
- * Copyright 2020 New Relic Corporation. All rights reserved.
+ * Copyright 2023 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 'use strict'
 
 const logger = require('../logger').child({ component: 'span-streamer' })
-const NAMES = require('../metrics/names').INFINITE_TRACING
+const BaseSpanStreamer = require('./base-span-streamer')
 
-const SPAN_DROP_MSG_INTERVAL_MS = 30000
-const SPAN_DROP_MSG =
-  'Queue full, dropping spans. ' +
-  `Will not warn again for ${SPAN_DROP_MSG_INTERVAL_MS / 1000} seconds.`
-
-class SpanStreamer {
+class SpanStreamer extends BaseSpanStreamer {
   constructor(licenseKey, connection, metrics, queueSize) {
-    this.stream = null
-    this.license_key = licenseKey
-    this.connection = connection
-    this.queue_size = queueSize
-    this.spans = []
-    this._metrics = metrics
-    this._writable = false
-
-    // 'connected' indicates a safely writeable stream.
-    // May still be mid-connect to gRPC server.
-    this.connection.on('connected', (stream) => {
-      logger.info('Span streamer connected')
-      this.stream = stream
-      this._writable = true
-      this.sendQueue()
-    })
+    super(licenseKey, connection, metrics, queueSize)
+  }
 
-    this.connection.on('disconnected', () => {
-      logger.info('Span streamer disconnected')
-      this.stream = null
-      this._writable = false
-    })
+  addToQueue(span) {
+    this.spans.push(span)
   }
 
   /* Accepts a span and either writes it to the stream, queues it to be sent,
    * or drops it depending on stream/queue state
    */
   write(span) {
-    this._metrics.getOrCreateMetric(NAMES.SEEN).incrementCallCount()
+    super.write(span)
 
-    // If not writeable (because of backpressure) queue the span
     if (!this._writable) {
-      if (this.spans.length < this.queue_size) {
-        this.spans.push(span)
-        return
-      }
-
-      // While this can be directionally calculated between seen/sent the
-      // queue makes that a bit more disconnected. This will be a bit more specific.
-      this._metrics.getOrCreateMetric(NAMES.DROPPED).incrementCallCount()
-
-      // If the queue is full drop the span
-      logger.infoOncePer(
-        'SPAN_DROP_MSG', // key for the OncePer
-        SPAN_DROP_MSG_INTERVAL_MS,
-        SPAN_DROP_MSG
-      )
-
       return
     }
 
@@ -79,51 +40,13 @@ class SpanStreamer {
     }
   }
 
-  /**
-   *  Sends the span over the stream. Spans are only sent here if the stream is
-   *  in a writable state. If the stream becomes unwritable after sending the
-   *  span, a drain event handler is setup to continue writing when possible.
-   *
-   * @param span
-   */
-  send(span) {
-    // false indicates the stream has reached the highWaterMark
-    // and future writes should be avoided until drained. written items,
-    // including the one that returned false, will still be buffered.
-    this._writable = this.stream.write(span)
-    this._metrics.getOrCreateMetric(NAMES.SENT).incrementCallCount()
-
-    if (!this._writable) {
-      const waitDrainStart = Date.now()
-      const onDrain = this.drain.bind(this, waitDrainStart)
-      this.stream.once('drain', onDrain)
+  sendQueue() {
+    if (!this.spans.length) {
+      logger.trace('Queue is empty, not sending spans.')
+      return
     }
-  }
 
-  /**
-   *  Drains the span queue that built up when the connection was
-   *  back-pressured or disconnected. `waitDrainStart` is when the stream
-   *  initially blocked, used to time how long the stream was blocked. If this
-   *  is not defined, it is assumed this is being called after a reconnect,
-   *  and the metric is not used.
-   *
-   * @param waitDrainStart
-   */
-  drain(waitDrainStart) {
-    // Metric can be used to see how frequently completing drains as well as
-    // average time to drain from when we first notice.
-    const drainCompleted = Date.now()
-    const drainDurationMs = drainCompleted - waitDrainStart
-    this._metrics.getOrCreateMetric(NAMES.DRAIN_DURATION).recordValue(drainDurationMs / 1000)
-
-    // Once the 'drain' event fires we can begin writing to the stream again
-    this._writable = true
-
-    this.sendQueue()
-  }
-
-  sendQueue() {
-    logger.trace('Sending spans from queue.')
+    logger.trace('Sending spans from queue: %s.', this.spans.length)
 
     // Continue sending the spans that were in the queue. _writable is checked
     // so that if a send fails while clearing the queue, this drain handler can
@@ -136,21 +59,6 @@ class SpanStreamer {
 
     logger.trace('Finished sending spans from queue. Items left in queue: %s', this.spans.length)
   }
-
-  connect(agentRunId, requestHeadersMap) {
-    this.connection.setConnectionDetails(this.license_key, agentRunId, requestHeadersMap)
-
-    this.connection.connectSpans()
-  }
-
-  disconnect() {
-    this.connection.disconnect()
-  }
-
-  createMetrics() {
-    this._metrics.getOrCreateMetric(NAMES.QUEUE_CAPACITY).recordValue(this.queue_size)
-    this._metrics.getOrCreateMetric(NAMES.QUEUE_SIZE).recordValue(this.spans.length)
-  }
 }
 
 module.exports = SpanStreamer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "10.0.0",
+  "version": "10.1.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -231,7 +231,6 @@
     "prettier": "^2.3.2",
     "proxyquire": "^1.8.0",
     "q": "*",
-    "request": "^2.88.2",
     "rimraf": "^2.6.3",
     "should": "*",
     "sinon": "^4.5.0",