newrelic 8.0.0 → 8.1.0

package/NEWS.md

@@ -1,3 +1,18 @@
+### v8.1.0 (2021-08-05)
+
+* Added necessary instrumentation to support v4 of `mongodb`.
+  * Explicitly enabled APM for `mongodb` instrumentation(`client.monitorCommands = true`)
+
+* Fixed issue where Promise based `pg.Client.query` timings were always in sub-millisecond range.
+
+* Fixed bug where `API.shutdown` would not harvest or keep process active effectively after an agent restart.
+
+  The agent will now correctly update its state to 'started' after a reconnect has completed.
+
+* Added an eslint rule to verify every file includes the copyright statement.
+
+* Fixed the `homepage` field in package.json to use `https` in the link to the github repo. Thank you @pzrq for the contribution.
+
 ### v8.0.0 (2021-07-26)
 
 * Added official parity support for Node 16.

package/THIRD_PARTY_NOTICES.md

@@ -42,6 +42,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [bluebird](#bluebird)
 * [chai](#chai)
 * [commander](#commander)
+* [eslint-plugin-header](#eslint-plugin-header)
 * [eslint](#eslint)
 * [express](#express)
 * [fastify](#fastify)
@@ -61,7 +62,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [q](#q)
 * [redis](#redis)
 * [request](#request)
-* [request](#request)
 * [restify](#restify)
 * [rimraf](#rimraf)
 * [rimraf](#rimraf)
@@ -77,7 +77,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 ### @grpc/grpc-js
 
-This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.2.11](https://github.com/grpc/grpc-node/tree/%40grpc/grpc-js%401.2.11/packages/grpc-js)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/blob/%40grpc/grpc-js%401.2.11/packages/grpc-js/LICENSE):
+This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.3.6](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.3.6)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.3.6/LICENSE):
 
 ```
                                  Apache License
@@ -1762,7 +1762,7 @@ This product includes source derived from [@newrelic/test-utilities](https://git
 
 ### @octokit/rest
 
-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):
+This product includes source derived from [@octokit/rest](https://github.com/octokit/rest.js) ([v18.8.0](https://github.com/octokit/rest.js/tree/v18.8.0)), distributed under the [MIT License](https://github.com/octokit/rest.js/blob/v18.8.0/LICENSE):
 
 ```
 The MIT License
@@ -1871,7 +1871,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### bluebird
 
-This product includes source derived from [bluebird](https://github.com/petkaantonov/bluebird) ([v3.7.1](https://github.com/petkaantonov/bluebird/tree/v3.7.1)), distributed under the [MIT License](https://github.com/petkaantonov/bluebird/blob/v3.7.1/LICENSE):
+This product includes source derived from [bluebird](https://github.com/petkaantonov/bluebird) ([v3.7.2](https://github.com/petkaantonov/bluebird/tree/v3.7.2)), distributed under the [MIT License](https://github.com/petkaantonov/bluebird/blob/v3.7.2/LICENSE):
 
 ```
 The MIT License (MIT)
@@ -1900,7 +1900,7 @@ THE SOFTWARE.
 
 ### chai
 
-This product includes source derived from [chai](https://github.com/chaijs/chai) ([v4.2.0](https://github.com/chaijs/chai/tree/v4.2.0)), distributed under the [MIT License](https://github.com/chaijs/chai/blob/v4.2.0/LICENSE):
+This product includes source derived from [chai](https://github.com/chaijs/chai) ([v4.3.4](https://github.com/chaijs/chai/tree/v4.3.4)), distributed under the [MIT License](https://github.com/chaijs/chai/blob/v4.3.4/LICENSE):
 
 ```
 MIT License
@@ -1954,12 +1954,27 @@ 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.
+```
+
+### eslint-plugin-header
+
+This product includes source derived from [eslint-plugin-header](https://github.com/Stuk/eslint-plugin-header) ([v3.1.1](https://github.com/Stuk/eslint-plugin-header/tree/v3.1.1)), distributed under the [MIT License](https://github.com/Stuk/eslint-plugin-header/blob/v3.1.1/README.md):
 
+```
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+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.
 ```
 
 ### eslint
 
-This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v6.8.0](https://github.com/eslint/eslint/tree/v6.8.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v6.8.0/LICENSE):
+This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v7.32.0](https://github.com/eslint/eslint/tree/v7.32.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v7.32.0/LICENSE):
 
 ```
 Copyright JS Foundation and other contributors, https://js.foundation
@@ -2050,7 +2065,7 @@ SOFTWARE.
 
 ### generic-pool
 
-This product includes source derived from [generic-pool](https://github.com/coopernurse/node-pool) ([v3.7.1](https://github.com/coopernurse/node-pool/tree/v3.7.1)), distributed under the [MIT License](https://github.com/coopernurse/node-pool/blob/v3.7.1/README.md):
+This product includes source derived from [generic-pool](https://github.com/coopernurse/node-pool) ([v3.8.2](https://github.com/coopernurse/node-pool/tree/v3.8.2)), distributed under the [MIT License](https://github.com/coopernurse/node-pool/blob/v3.8.2/README.md):
 
 ```
 MIT License
@@ -2112,7 +2127,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ### http-errors
 
-This product includes source derived from [http-errors](https://github.com/jshttp/http-errors) ([v1.7.3](https://github.com/jshttp/http-errors/tree/v1.7.3)), distributed under the [MIT License](https://github.com/jshttp/http-errors/blob/v1.7.3/LICENSE):
+This product includes source derived from [http-errors](https://github.com/jshttp/http-errors) ([v1.8.0](https://github.com/jshttp/http-errors/tree/v1.8.0)), distributed under the [MIT License](https://github.com/jshttp/http-errors/blob/v1.8.0/LICENSE):
 
 ```
 
@@ -2172,7 +2187,7 @@ SOFTWARE.
 
 ### jsdoc
 
-This product includes source derived from [jsdoc](https://github.com/jsdoc/jsdoc) ([v3.6.3](https://github.com/jsdoc/jsdoc/tree/v3.6.3)), distributed under the [Apache-2.0 License](https://github.com/jsdoc/jsdoc/blob/v3.6.3/LICENSE.md):
+This product includes source derived from [jsdoc](https://github.com/jsdoc/jsdoc) ([v3.6.7](https://github.com/jsdoc/jsdoc/tree/v3.6.7)), distributed under the [Apache-2.0 License](https://github.com/jsdoc/jsdoc/blob/v3.6.7/LICENSE.md):
 
 ```
 # License
@@ -2282,7 +2297,7 @@ https://github.com/jmblog/color-themes-for-google-code-prettify
 
 ### lint-staged
 
-This product includes source derived from [lint-staged](https://github.com/okonet/lint-staged) ([v11.0.0](https://github.com/okonet/lint-staged/tree/v11.0.0)), distributed under the [MIT License](https://github.com/okonet/lint-staged/blob/v11.0.0/LICENSE):
+This product includes source derived from [lint-staged](https://github.com/okonet/lint-staged) ([v11.1.1](https://github.com/okonet/lint-staged/tree/v11.1.1)), distributed under the [MIT License](https://github.com/okonet/lint-staged/blob/v11.1.1/LICENSE):
 
 ```
 The MIT License (MIT)
@@ -2406,7 +2421,7 @@ https://github.com/jsdoc3/jsdoc
 
 ### mongodb
 
-This product includes source derived from [mongodb](https://github.com/mongodb/node-mongodb-native) ([v3.3.4](https://github.com/mongodb/node-mongodb-native/tree/v3.3.4)), distributed under the [Apache-2.0 License](https://github.com/mongodb/node-mongodb-native/blob/v3.3.4/LICENSE.md):
+This product includes source derived from [mongodb](https://github.com/mongodb/node-mongodb-native) ([v3.6.10](https://github.com/mongodb/node-mongodb-native/tree/v3.6.10)), distributed under the [Apache-2.0 License](https://github.com/mongodb/node-mongodb-native/blob/v3.6.10/LICENSE.md):
 
 ```
 Apache License
@@ -2614,7 +2629,7 @@ Apache License
 
 ### mysql
 
-This product includes source derived from [mysql](https://github.com/mysqljs/mysql) ([v2.17.1](https://github.com/mysqljs/mysql/tree/v2.17.1)), distributed under the [MIT License](https://github.com/mysqljs/mysql/blob/v2.17.1/License):
+This product includes source derived from [mysql](https://github.com/mysqljs/mysql) ([v2.18.1](https://github.com/mysqljs/mysql/tree/v2.18.1)), distributed under the [MIT License](https://github.com/mysqljs/mysql/blob/v2.18.1/License):
 
 ```
 Copyright (c) 2012 Felix Geisendörfer (felix@debuggable.com) and contributors
@@ -2743,68 +2758,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ### request
 
-This product includes source derived from [request](https://github.com/request/request) ([v2.88.0](https://github.com/request/request/tree/v2.88.0)), distributed under the [Apache-2.0 License](https://github.com/request/request/blob/v2.88.0/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
-```
-
-### 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):
 
 ```
@@ -2867,7 +2820,7 @@ END OF TERMS AND CONDITIONS
 
 ### restify
 
-This product includes source derived from [restify](https://github.com/restify/node-restify) ([v8.4.0](https://github.com/restify/node-restify/tree/v8.4.0)), distributed under the [MIT License](https://github.com/restify/node-restify/blob/v8.4.0/LICENSE):
+This product includes source derived from [restify](https://github.com/restify/node-restify) ([v8.5.1](https://github.com/restify/node-restify/tree/v8.5.1)), distributed under the [MIT License](https://github.com/restify/node-restify/blob/v8.5.1/LICENSE):
 
 ```
 Copyright (c) 2011 Mark Cavage, All rights reserved.

package/bin/test-naming-rules.js

@@ -1,5 +1,4 @@
 #! /usr/bin/env node
-
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0

package/bin/tracetractor

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0

package/lib/agent.js

@@ -240,32 +240,12 @@ Agent.prototype.start = function start(callback) {
     }
 
     if (agent.collector.isConnected()) {
-      agent.onConnect()
-      agent.setState('started')
       const config = response.payload
 
-      if (agent.config.no_immediate_harvest) {
-        agent.startAggregators()
+      const shouldImmediatelyHarvest = !agent.config.no_immediate_harvest
+      agent.onConnect(shouldImmediatelyHarvest, () => {
         callback(null, config)
-      } else {
-        // For data collection that streams immediately, dont delay capture/sending until
-        // the harvest of everything else has completed.
-        agent.startStreaming()
-
-        // Harvest immediately for quicker data display, but after at least 1
-        // second or the collector will throw away the data.
-        //
-        // NOTE: this setTimeout is deliberately NOT unref'd due to it being
-        // the last step in the Agent startup process
-        setTimeout(function afterTimeout() {
-          logger.info(`Starting initial ${INITIAL_HARVEST_DELAY_MS}ms harvest.`)
-
-          agent.forceHarvestAll(function afterAllAggregatorsSend() {
-            agent.startAggregators()
-            callback(null, config)
-          })
-        }, INITIAL_HARVEST_DELAY_MS)
-      }
+      })
     } else {
       callback(new Error('Collector did not connect and did not error'))
     }
@@ -450,18 +430,58 @@ Agent.prototype.startAggregators = function startAggregators() {
   }
 }
 
-Agent.prototype.onConnect = function onConnect() {
-  this.metrics.reconfigure(this.config)
-  this.errors.reconfigure(this.config)
-  this.traces.reconfigure(this.config)
-  this.queries.reconfigure(this.config)
-  this.spanEventAggregator.reconfigure(this.config)
-  this.transactionEventAggregator.reconfigure(this.config)
-  this.customEventAggregator.reconfigure(this.config)
+/**
+ * Completes any final setup upon full connection to New Relic
+ * servers and sets the agent state to 'started'.
+ */
+Agent.prototype.onConnect = function onConnect(shouldImmediatelyHarvest, callback) {
+  this._reconfigureAggregators(this.config)
 
   if (this.config.certificates && this.config.certificates.length > 0) {
     this.metrics.getOrCreateMetric(NAMES.FEATURES.CERTIFICATES).incrementCallCount()
   }
+
+  this._scheduleHarvests(shouldImmediatelyHarvest, callback)
+
+  this.setState('started')
+}
+
+Agent.prototype._reconfigureAggregators = function _reconfigureAggregators(config) {
+  this.metrics.reconfigure(config)
+  this.errors.reconfigure(config)
+  this.traces.reconfigure(config)
+  this.queries.reconfigure(config)
+  this.spanEventAggregator.reconfigure(config)
+  this.transactionEventAggregator.reconfigure(config)
+  this.customEventAggregator.reconfigure(config)
+}
+
+Agent.prototype._scheduleHarvests = function _scheduleHarvests(shouldImmediatelyHarvest, callback) {
+  if (!shouldImmediatelyHarvest) {
+    this.startAggregators()
+    setImmediate(callback)
+    return
+  }
+
+  const agent = this
+
+  // For data collection that streams immediately, dont delay capture/sending until
+  // the harvest of everything else has completed.
+  agent.startStreaming()
+
+  // Harvest immediately for quicker data display, but after at least 1
+  // second or the collector will throw away the data.
+  //
+  // NOTE: this setTimeout is deliberately NOT unref'd due to it being
+  // the last step in the Agent startup process
+  setTimeout(function afterTimeout() {
+    logger.info(`Starting initial ${INITIAL_HARVEST_DELAY_MS}ms harvest.`)
+
+    agent.forceHarvestAll(function afterAllAggregatorsSend() {
+      agent.startAggregators()
+      callback()
+    })
+  }, INITIAL_HARVEST_DELAY_MS)
 }
 
 /**

package/lib/collector/api.js

@@ -515,9 +515,8 @@ CollectorAPI.prototype.restart = function restart(callback) {
   var api = this
   this.shutdown(function reconnect() {
     api.connect(function afterConnect() {
-      api._agent.onConnect()
-      api._agent.startAggregators()
-      return callback.apply(null, arguments)
+      const shouldImmediatelyHarvest = false
+      api._agent.onConnect(shouldImmediatelyHarvest, callback)
     })
   })
 }

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

@@ -1,3 +1,8 @@
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 'use strict'
 
 const getRawRequestFromFastifyRequest = (shim, fn, fnName, args) => {

package/lib/instrumentation/fastify.js

@@ -1,3 +1,8 @@
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 'use strict'
 const semver = require('semver')
 const {

package/lib/instrumentation/mongodb/common.js

@@ -0,0 +1,186 @@
+/*
+ * Copyright 2021 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const {
+  CURSOR_OPS,
+  COLLECTION_OPS,
+  DB_OPS
+} = require('./constants')
+const { URL } = require('url')
+
+const common = module.exports
+
+/**
+ * Instruments all methods from constants.CURSOR_OPS on a given
+ * cursor class
+ *
+ * @param {Shim} shim
+ * @param {Cursor} Cursor
+ */
+common.instrumentCursor = function instrumentCursor(shim, Cursor) {
+  if (Cursor && Cursor.prototype) {
+    const proto = Cursor.prototype
+    for (let i = 0; i < CURSOR_OPS.length; i++) {
+      shim.recordQuery(proto, CURSOR_OPS[i], common.makeQueryDescFunc(shim, CURSOR_OPS[i]))
+    }
+
+    shim.recordQuery(proto, 'each', common.makeQueryDescFunc(shim, 'each'))
+    shim.recordOperation(proto, 'pipe')
+  }
+}
+
+/**
+ * Instruments all methods from constants.COLLECTION_OPS on
+ * the Collection class
+ *
+ * @param {Shim} shim
+ * @param {Collection} Collection
+ */
+common.instrumentCollection = function instrumentCollection(shim, Collection) {
+  if (Collection && Collection.prototype) {
+    const proto = Collection.prototype
+    for (let i = 0; i < COLLECTION_OPS.length; i++) {
+      shim.recordQuery(
+        proto,
+        COLLECTION_OPS[i],
+        common.makeQueryDescFunc(shim, COLLECTION_OPS[i])
+      )
+    }
+  }
+}
+
+/**
+ * Instruments all methods from constants.DB_OPS on
+ * the Db class.
+ *
+ * @param {Object} params
+ * @param {Shim} params.shim
+ * @param {Db} params.Db
+ */
+common.instrumentDb = function instrumentDb(shim, Db) {
+  if (Db && Db.prototype) {
+    const proto = Db.prototype
+    shim.recordOperation(proto, DB_OPS, {callback: shim.LAST, opaque: true })
+    // link to client.connect(removed in v4.0)
+    shim.recordOperation(Db, 'connect', {callback: shim.LAST})
+  }
+}
+
+/**
+ * Sets up the desc for all instrumented query methods
+ * @param {Shim} shim
+ * @param {string} methodName
+ */
+common.makeQueryDescFunc = function makeQueryDescFunc(shim, methodName) {
+  if (methodName === 'each') {
+    return function eachDescFunc() {
+      const parameters = getInstanceAttributeParameters(shim, this)
+      return {query: methodName, parameters, rowCallback: shim.LAST, opaque: true }
+    }
+  }
+
+  return function queryDescFunc() {
+    // segment name does not actually use query string
+    // method name is set as query so the query parser has access to the op name
+    const parameters = getInstanceAttributeParameters(shim, this)
+    return {query: methodName, parameters, promise: true, callback: shim.LAST, opaque: true}
+  }
+}
+
+/**
+ * Sets up a listener for `started` on instrumenter(mongo APM). This applies to
+ * mongo <4. The listener adds the following attributes to the active segment:
+ * host, port_path_or_id, and database_name
+ *
+ * @param {Shim} shim
+ * @param {Instrumentation} instrumenter instance of mongo APM class
+ */
+common.captureAttributesOnStarted = function captureAttributesOnStarted(shim, instrumenter) {
+  instrumenter.on('started', function onMongoEventStarted(evnt) {
+    // This assumes that this `started` event is fired _after_ our wrapper
+    // starts and creates the segment. We perform a check of the segment name
+    // out of an excess of caution.
+    const connId = evnt.connectionId
+    if (connId) {
+      // Mongo sticks the path to the domain socket in the "host" slot, but we
+      // want it in the "port", so if we have a domain socket we need to change
+      // the order of our parameters.
+      if (typeof connId === 'string') {
+        const parts = connId.split(':')
+        if (parts.length && parts[0][0] === '/') {
+          shim.captureInstanceAttributes('localhost', parts[0], evnt.databaseName)
+        } else {
+          shim.captureInstanceAttributes(parts[0], parts[1], evnt.databaseName)
+        }
+      } else if (connId.domainSocket) {
+        shim.captureInstanceAttributes('localhost', connId.host, evnt.databaseName)
+      } else {
+        shim.captureInstanceAttributes(connId.host, connId.port, evnt.databaseName)
+      }
+    }
+  })
+}
+
+/**
+ * Get the database_name, host, port_path_or_id
+ * for the query segment. v4 refactored where the toplogy is stored.
+ * You can now get the details via the client obj that's deeply nested
+ * See: https://github.com/mongodb/node-mongodb-native/pull/2594/files#diff-1d214e57ddda9095d296e5700ebce701333bfefcf417e234c584d14091b2f50dR168
+ */
+function getInstanceAttributeParameters(shim, obj) {
+  if (obj.s && obj.s.db && obj.s.topology) {
+    shim.logger.trace(
+      'Adding datastore instance attributes from obj.s.db + obj.s.topology'
+    )
+    const databaseName = obj.s.db.databaseName || null
+    const topology = obj.s.topology
+    if (topology.s && topology.s.options) {
+      return doCapture(topology.s.options, databaseName)
+    }
+  } else if (obj.s && obj.s.db && obj.s.db.s && obj.s.db.s.client &&
+    obj.s.db.s.client.s && obj.s.db.s.client.s.url) {
+    let { hostname: host, port: port_path_or_id } = new URL(obj.s.db.s.client.s.url)
+    if (host.endsWith('.sock')) {
+      // socket path is uri encoded
+      // decode it to properly name attrs
+      port_path_or_id = decodeURIComponent(host)
+      host = 'localhost'
+    }
+    return {
+      host,
+      port_path_or_id,
+      database_name: obj.s.db.databaseName
+    }
+  }
+
+  shim.logger.trace('Could not find datastore instance attributes.')
+  return {
+    host: null,
+    port_path_or_id: null,
+    database_name: null
+  }
+
+  function doCapture(conf, database) {
+    let host = conf.host
+    let port = conf.port
+
+    // If using a domain socket, mongo stores the path as the host name, but we
+    // pass it through the port value.
+    if (
+      (conf.socketOptions && conf.socketOptions.domainSocket) ||
+      /\.sock$/.test(host)
+    ) {
+      port = host
+      host = 'localhost'
+    }
+
+    return {
+      host: host,
+      port_path_or_id: port,
+      database_name: database
+    }
+  }
+}