newrelic 8.7.0 → 8.9.0

package/NEWS.md

@@ -1,60 +1,169 @@
-### v8.7.0 (2022-01-04)
-
-* Updated `onResolved` instrumentation hook to only be called the first time we see a specific module filepath resolved.
-
-* Removed `tracer.segment` in place of direct usage of context manager.
-
+### v8.9.0 (2022-03-15)
+
+* Added support for `initializeUnorderedBulkOp`, and `initializeOrderedBulkOp` in mongodb v3 instrumentation.
+
+  Thanks to Denis Lantsman (@dlants) for the contribution.
+
+* Updated logger to delay logging until configuration is parsed. The logger will now queue all log entries that occur before the agent can parse the configuration.
+
+  Thanks to Cody Landry (@codylandry) for the contribution.
+
+* Added `NEW_RELIC_ALLOW_ALL_HEADERS` as a boolean environment variable, same behavior as existing `allow_all_headers`.
+
+* Updated the AWS IMDBS v2 endpoint to use `latest` to align with the internal agent specification.
+
+* Bumped `@newrelic/koa` to ^6.1.1.
+
+* Added Next.js to External Modules list in README.
+
+* Updated mysql and mysql2 versioned tests to run against their own databases on the MySQL instance.
+
+* Removed upper-bound testing from restify versioned tests so future major versions will be covered.
+
+* Removed upper-bound testing from mysql2 versioned tests to cover existing and future major versions. 
+
+  Continues to skip version 1.6.2 which had a bug that broke tests which was resolved in 1.6.3.
+
+* Updated @hapi/hapi Node 16 versioned test runs to run against @hapi/hapi >=20.1.2 so future major releases will be ran.
+
+* Fixed sparse checkout of non-default branch for external versioned tests.
+
+* Added external versioned tests for the Apollo Server plugin instrumentation.
+
+* Added nock delay to test timeouts in utilization integration tests.
+
+* Added newrelic-node-nextjs to external versioned tests to be run on every PR.
+
+* Updated external version test running to support more test scenarios.
+  * Adds `test/versioned-external` to lint ignore to avoid issues for scripts in tests that auto run linting tools (next/react).
+  * Adds `index.js` and `nr-hooks.js` to files automatically checked-out for test runs.
+
+### v8.8.0 (2022-02-23)
+
+* Updated AWS metadata capture to utilize IMDSv2.
+
+* Fixed link to discuss.newrelic.com in README
+
+* Updated minimum Node version warning to output current Node version from process.
+
+* Bumped `@newrelic/native-metrics` to ^7.1.1.
+
+* Added `Nextjs` to a framework constant within the webframework-shim.
+
+* Updated shim to pass active segment to inContext callback.
+
+* Bumped `@grpc/grpc-js` to ^1.5.5.
+
+* Bumped `@grpc/proto-loader` to ^0.6.9.
+
+* Bumped `@newrelic/superagent` to ^5.1.0.
+
+* Bumped `@newrelic/koa` to ^6.1.0.
+
+* Bumped `async` to ^3.2.3.
+
+* Resolved several npm audit warnings for dev deps.
+
+* Fixed Post Release workflow by properly configuring git credentials so it can push API docs to branch
+ * Added `set -e` in publish docs script to exit on possible failures
+ * Removed redundant `npm ci` in publish API docs script
+
+* Added ability to ignore certain PRs in `bin/pending-prs.js` report to slack
+
+* Updated README to include `@newrelic/pino-enricher` as an external module.
+
+* Fixed documentation in a sample of the Datastore Instrumentation for Node.js.
+
+* Added a new `mongo:5` container to `npm run sevices` to test mongodb driver >=4.2.0.
+
+* Fixed conditions in post release workflow to function when triggered via successful release and manual invoked.
+
+* Updated method for retrieving agent version from repository by using `cat package.json | jq .version`
+
+* Fixed minor formatting and spelling issues in `create-docs-pr.js`.
+
+* Fixed an issue with the docs PR script that assumed `\n` in the NEWS.md file when extract version and release date
+
+### v8.7.1 (2022-01-18)
+
+* Bumped @newrelic/aws-sdk to ^4.1.1.
+
+* Upgraded `@newrelic/test-utilities` to ^6.3.0.
+
+  Includes `helpers.getShim` so sub packages properly execute.
+
+* Resolved dependabot and certain npm audit warnings.
+
+* Automation and CI improvements:
+  * Added a script to be used by agent developers to add a PR to `docs-website` after the release of agent.
+  * Changed the trigger for post release jobs.
+  * Updated the `create-release-tag` script to pass in workflows to check before creating tag.
+    * Fixed `create-release-tag` to properly filter out all async workflow run checks
+    * Updated agent release to pass in a different list of workflows vs the default
+  * Fixed release creation reusable workflow by passing in repo to `bin/create-release-tag.js` and `bin/create-github-release.js`.
+  * Added `workflow_dispatch` to Agent Post Release workflow for manual testing.
+  * Added a reusable workflow to create a release tag, publish to NPM and publish a GitHub release.
+    * Updated agent release workflow to reference reusable workflow.
+    * Added a new workflow to update RPM and publish API docs on a published release event type.
+
+
+### v8.7.0 (2022-01-04)
+
+* Updated `onResolved` instrumentation hook to only be called the first time we see a specific module filepath resolved.
+
+* Removed `tracer.segment` in place of direct usage of context manager.
+
 * Fixed an issue where multiple calls to `instrumentLoadedModule` resulted in re-instrumenting the same module.
-
-* Fixed issue where `instrumentLoadedModule` would return `true` even if the instrumentation handler indicated it did not apply instrumentation.
-
+
+* Fixed issue where `instrumentLoadedModule` would return `true` even if the instrumentation handler indicated it did not apply instrumentation.
+
 * Added support metrics for tracking when instrumentation was applied per module.
 
   * `Supportability/Features/Instrumentation/OnResolved/<module-name>`
   * `Supportability/Features/Instrumentation/OnResolved/<module-name>/Version/<major version>`
   * `Supportability/Features/Instrumentation/OnRequire/<module-name>`
-  * `Supportability/Features/Instrumentation/OnRequire/<module-name>/Version/<major version>`
-
-* Fixed issue where expected status code ranges would not be parsed until ignored status codes were also defined.
-
-* Added an input `changelog_file` to pass in name of changelog.  This defaults to `NEWS.md` but some repos use `CHANGELOG.md`
-
-* Abstracted `bin/prepare-release.js` to work against other repositories.  
-
-* Added reusable prepare-release workflow that can be referenced in all other newrelic Node.js repositories.
-
-* Updated pending PRs workflow to check all repos the team owns.
-
-* Changed the event type from `pull_request` to `pull_request_target` to allow for auto assign of PRs to the Node.js Engineering Board
-
-* Fixed add to board workflow to properly pass repository secrets into reusable board workflow.
-
-* Changes token used to post issues to org level project board
-
-* Runs versioned tests for external modules against tests defined in the external repository instead of tests published in npm modules.
-
-* Added a reusable workflow to automatically add issues to the Node.js Engineering Board when created.
-
-* Added CI job to update system configurations with new agent version on release.
-
-* Moved `methods.js` under bluebird versioned test folder.
-
-### v8.6.0 (2021-11-17)
-
+  * `Supportability/Features/Instrumentation/OnRequire/<module-name>/Version/<major version>`
+
+* Fixed issue where expected status code ranges would not be parsed until ignored status codes were also defined.
+
+* Added an input `changelog_file` to pass in name of changelog.  This defaults to `NEWS.md` but some repos use `CHANGELOG.md`
+
+* Abstracted `bin/prepare-release.js` to work against other repositories.
+
+* Added reusable prepare-release workflow that can be referenced in all other newrelic Node.js repositories.
+
+* Updated pending PRs workflow to check all repos the team owns.
+
+* Changed the event type from `pull_request` to `pull_request_target` to allow for auto assign of PRs to the Node.js Engineering Board
+
+* Fixed add to board workflow to properly pass repository secrets into reusable board workflow.
+
+* Changes token used to post issues to org level project board
+
+* Runs versioned tests for external modules against tests defined in the external repository instead of tests published in npm modules.
+
+* Added a reusable workflow to automatically add issues to the Node.js Engineering Board when created.
+
+* Added CI job to update system configurations with new agent version on release.
+
+* Moved `methods.js` under bluebird versioned test folder.
+
+### v8.6.0 (2021-11-17)
+
 * Added `onResolved` instrumentation hook to apply instrumentation prior to module load.
 
-  This hook fires after the module filepath has been resolved just prior to the module being loaded by the CommonJS module loader.
-
-* Fixed issue where `recordConsume` was not binding consumer if it was a promise
-
-* Pinned mongo versioned tests to `<4.2.0` until we can address https://github.com/newrelic/node-newrelic/issues/982
-
-* Introduced a context management API to be used in place of manually calling tracer.segment get/set.
-
-### v8.5.2 (2021-11-09)
-
-* Fixed issue where unhandled promise rejections were not getting logged as errors in a lambda execution
-
+  This hook fires after the module filepath has been resolved just prior to the module being loaded by the CommonJS module loader.
+
+* Fixed issue where `recordConsume` was not binding consumer if it was a promise
+
+* Pinned mongo versioned tests to `<4.2.0` until we can address https://github.com/newrelic/node-newrelic/issues/982
+
+* Introduced a context management API to be used in place of manually calling tracer.segment get/set.
+
+### v8.5.2 (2021-11-09)
+
+* Fixed issue where unhandled promise rejections were not getting logged as errors in a lambda execution
+
 ### v8.5.1 (2021-11-03)
 
 * Fixed bug where failure to retrieve CPU/Memory details for certain Linux distros could result in a crash.

package/README.md

@@ -67,8 +67,10 @@ For more information on getting started, [check the Node.js docs](https://docs.n
 There are several modules that can be installed and configured to accompany the Node.js agent:
 
  * [@newrelic/apollo-server-plugin](https://github.com/newrelic/newrelic-node-apollo-server-plugin): New Relic's official Apollo Server plugin for use with the Node.js agent.
- * [@newrelic/winston-enricher](https://github.com/newrelic/newrelic-winston-logenricher-node): Provides distributed trace and span information output as JSON-formatted log messages.  This is most commonly used with the New Relic Logs product.
+ * [@newrelic/winston-enricher](https://github.com/newrelic/newrelic-node-log-extensions/tree/main/packages/winston-log-enricher): Provides distributed trace and span information output as JSON-formatted log messages in Winston.  This is most commonly used with the New Relic Logs product.
+ * [@newrelic/pino-enricher](https://github.com/newrelic/newrelic-node-log-extensions/tree/main/packages/pino-log-enricher): Provides distributed trace and span information output as JSON-formatted log messages in Pino.  This is most commonly used with the New Relic Logs product.
  * [@newrelic/mysql](https://github.com/newrelic/node-newrelic-mysql)(**Experimental**): Standalone instrumentation for [mysql2](https://github.com/sidorares/node-mysql2#readme) and [mysql2/promise](https://github.com/sidorares/node-mysql2/blob/master/documentation/Promise-Wrapper.md) as well as the same instrumentation for [mysql](https://github.com/mysqljs/mysql#readme) within the Node.js agent.
+ * [@newrelic/next](https://github.com/newrelic/newrelic-node-nextjs): Provides instrumentation for the [Next.js](https://github.com/vercel/next.js/) npm package.
 
 There are several modules included within the Node.js agent to add more instrumentation for 3rd party modules:
 
@@ -152,7 +154,7 @@ If the issue has been confirmed as a bug or is a feature request, please file a
 **Support Channels**
 
 * [New Relic Documentation](https://docs.newrelic.com/docs/agents/nodejs-agent/getting-started/introduction-new-relic-nodejs): Comprehensive guidance for using our platform
-* [New Relic Community](https://discuss.newrelic.com/c/support-products-agents/node-js-agent/): The best place to engage in troubleshooting questions
+* [New Relic Community](https://discuss.newrelic.com/tags/c/telemetry-data-platform/agents/nodeagent): The best place to engage in troubleshooting questions
 * [New Relic Developer](https://developer.newrelic.com/): Resources for building a custom observability applications
 * [New Relic University](https://learn.newrelic.com/): A range of online training for New Relic users of every level
 * [New Relic Technical Support](https://support.newrelic.com/) 24/7/365 ticketed support. Read more about our [Technical Support Offerings](https://docs.newrelic.com/docs/licenses/license-information/general-usage-licenses/support-plan).

package/THIRD_PARTY_NOTICES.md

@@ -86,7 +86,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.3.7](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.3.7)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.3.7/LICENSE):
+This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.5.5](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.5.5)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.5.5/LICENSE):
 
 ```
                                  Apache License
@@ -295,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.5.6](https://github.com/grpc/grpc-node/tree/v0.5.6)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/blob/v0.5.6/LICENSE):
+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):
 
 ```
                                  Apache License
@@ -504,7 +504,7 @@ This product includes source derived from [@grpc/proto-loader](https://github.co
 
 ### @newrelic/aws-sdk
 
-This product includes source derived from [@newrelic/aws-sdk](https://github.com/newrelic/node-newrelic-aws-sdk) ([v4.0.1](https://github.com/newrelic/node-newrelic-aws-sdk/tree/v4.0.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-aws-sdk/blob/v4.0.1/LICENSE):
+This product includes source derived from [@newrelic/aws-sdk](https://github.com/newrelic/node-newrelic-aws-sdk) ([v4.1.1](https://github.com/newrelic/node-newrelic-aws-sdk/tree/v4.1.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-aws-sdk/blob/v4.1.1/LICENSE):
 
 ```
                                  Apache License
@@ -712,7 +712,7 @@ This product includes source derived from [@newrelic/aws-sdk](https://github.com
 
 ### @newrelic/koa
 
-This product includes source derived from [@newrelic/koa](https://github.com/newrelic/node-newrelic-koa) ([v6.0.1](https://github.com/newrelic/node-newrelic-koa/tree/v6.0.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-koa/blob/v6.0.1/LICENSE):
+This product includes source derived from [@newrelic/koa](https://github.com/newrelic/node-newrelic-koa) ([v6.1.0](https://github.com/newrelic/node-newrelic-koa/tree/v6.1.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-koa/blob/v6.1.0/LICENSE):
 
 ```
 Apache License
@@ -921,7 +921,7 @@ Apache License
 
 ### @newrelic/superagent
 
-This product includes source derived from [@newrelic/superagent](https://github.com/newrelic/node-newrelic-superagent) ([v5.0.1](https://github.com/newrelic/node-newrelic-superagent/tree/v5.0.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-superagent/blob/v5.0.1/LICENSE):
+This product includes source derived from [@newrelic/superagent](https://github.com/newrelic/node-newrelic-superagent) ([v5.1.0](https://github.com/newrelic/node-newrelic-superagent/tree/v5.1.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-superagent/blob/v5.1.0/LICENSE):
 
 ```
                                  Apache License
@@ -1159,7 +1159,7 @@ THE SOFTWARE.
 
 ### async
 
-This product includes source derived from [async](https://github.com/caolan/async) ([v3.2.1](https://github.com/caolan/async/tree/v3.2.1)), distributed under the [MIT License](https://github.com/caolan/async/blob/v3.2.1/LICENSE):
+This product includes source derived from [async](https://github.com/caolan/async) ([v3.2.3](https://github.com/caolan/async/tree/v3.2.3)), distributed under the [MIT License](https://github.com/caolan/async/blob/v3.2.3/LICENSE):
 
 ```
 Copyright (c) 2010-2018 Caolan McMahon
@@ -1770,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.1.1](https://github.com/newrelic/node-test-utilities/tree/v6.1.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v6.1.1/LICENSE):
+This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v6.3.0](https://github.com/newrelic/node-test-utilities/tree/v6.3.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v6.3.0/LICENSE):
 
 ```
                                  Apache License
@@ -2531,7 +2531,7 @@ SOFTWARE.
 
 ### jsdoc
 
-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):
+This product includes source derived from [jsdoc](https://github.com/jsdoc/jsdoc) ([v3.6.10](https://github.com/jsdoc/jsdoc/tree/v3.6.10)), distributed under the [Apache-2.0 License](https://github.com/jsdoc/jsdoc/blob/v3.6.10/LICENSE.md):
 
 ```
 # License
@@ -3292,7 +3292,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ### tap
 
-This product includes source derived from [tap](https://github.com/tapjs/node-tap) ([v15.0.10](https://github.com/tapjs/node-tap/tree/v15.0.10)), distributed under the [ISC License](https://github.com/tapjs/node-tap/blob/v15.0.10/LICENSE):
+This product includes source derived from [tap](https://github.com/tapjs/node-tap) ([v15.1.6](https://github.com/tapjs/node-tap/tree/v15.1.6)), distributed under the [ISC License](https://github.com/tapjs/node-tap/blob/v15.1.6/LICENSE):
 
 ```
 The ISC License
@@ -3377,7 +3377,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### @newrelic/native-metrics
 
-This product includes source derived from [@newrelic/native-metrics](https://github.com/newrelic/node-native-metrics) ([v7.0.1](https://github.com/newrelic/node-native-metrics/tree/v7.0.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-native-metrics/blob/v7.0.1/LICENSE):
+This product includes source derived from [@newrelic/native-metrics](https://github.com/newrelic/node-native-metrics) ([v7.1.1](https://github.com/newrelic/node-native-metrics/tree/v7.1.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-native-metrics/blob/v7.1.1/LICENSE):
 
 ```
                                  Apache License

package/index.js

@@ -45,10 +45,9 @@ function initialize() {
     logger.debug('Process was running %s seconds before agent was loaded.', preAgentTime)
 
     if (!psemver.satisfies(pkgJSON.engines.node)) {
-      // TODO: Update this message when Node v12 is deprecated.
       message =
-        'New Relic for Node.js requires a version of Node equal to or\n' +
-        'greater than 12.0.0. Not starting!'
+        `New Relic for Node.js requires a version of Node ${pkgJSON.engines.node}. \n` +
+        `Please upgrade from your current Node version: ${process.version}. Not starting!`
 
       logger.error(message)
       throw new Error(message)

package/lib/config/default.js

@@ -134,6 +134,8 @@ exports.config = () => ({
    * When true, all request headers except for those listed in attributes.exclude
    * will be captured for all traces, unless otherwise specified in a destination's
    * attributes include/exclude lists.
+   *
+   * @env NEW_RELIC_ALLOW_ALL_HEADERS
    */
   allow_all_headers: false,
 

package/lib/config/env.js

@@ -21,6 +21,7 @@ const ENV_MAPPING = {
   proxy_user: 'NEW_RELIC_PROXY_USER',
   proxy_pass: 'NEW_RELIC_PROXY_PASS',
   agent_enabled: 'NEW_RELIC_ENABLED',
+  allow_all_headers: 'NEW_RELIC_ALLOW_ALL_HEADERS',
   attributes: {
     enabled: 'NEW_RELIC_ATTRIBUTES_ENABLED',
     exclude: 'NEW_RELIC_ATTRIBUTES_EXCLUDE',
@@ -206,6 +207,7 @@ const OBJECT_LIST_VARS = new Set(['NEW_RELIC_NAMING_RULES'])
 // fancy--just use 'true' and 'false', everybody.
 const BOOLEAN_VARS = new Set([
   'NEW_RELIC_ENABLED',
+  'NEW_RELIC_ALLOW_ALL_HEADERS',
   'NEW_RELIC_ATTRIBUTES_ENABLED',
   'NEW_RELIC_ERROR_COLLECTOR_ENABLED',
   'NEW_RELIC_ERROR_COLLECTOR_ATTRIBUTES_ENABLED',

package/lib/config/index.js

@@ -1623,7 +1623,8 @@ function initialize(config) {
   /**
    * When the logger is required here, it bootstraps itself and then
    * injects itself into this module's closure via setLogger on the
-   * instance of the logger it creates.
+   * instance of the logger it creates.  Logs are queued until config
+   * has been loaded to apply logging settings to bootstrapping logs
    */
   logger = require('../logger')
 
@@ -1712,7 +1713,14 @@ function getOrCreateInstance() {
 
       // Config construction has potential to throw due to invalid settings.
       // This allows the agent to return a stub api without crashing the process.
-      _configInstance = Object.assign(defaultConfig(), { agent_enabled: false })
+      _configInstance = Object.assign(defaultConfig(), {
+        agent_enabled: false,
+        logging: {
+          enabled: true,
+          filepath: 'stdout'
+        }
+      })
+
       _configInstance.setLogger = Config.prototype.setLogger
     }
   }

package/lib/instrumentation/mongodb/common.js

@@ -43,6 +43,23 @@ common.instrumentCollection = function instrumentCollection(shim, Collection) {
   }
 }
 
+/**
+ * Instruments the execute method on
+ * the BulkOperationBase class
+ *
+ * @param {Shim} shim
+ * @param {BulkOperationModule} bulk operation module, typically from mongodb/lib/bulk/common
+ * @param BulkOperationModule
+ */
+common.instrumentBulkOperation = function instrumentBulkOperation(shim, BulkOperationModule) {
+  const BulkOperationBase = BulkOperationModule && BulkOperationModule.BulkOperationBase
+
+  if (BulkOperationBase && BulkOperationBase.prototype) {
+    const proto = BulkOperationBase.prototype
+    shim.recordBatchQuery(proto, 'execute', common.makeBulkDescFunc(shim, 'execute'))
+  }
+}
+
 /**
  * Instruments all methods from constants.DB_OPS on
  * the Db class.
@@ -84,6 +101,25 @@ common.makeQueryDescFunc = function makeQueryDescFunc(shim, methodName) {
   }
 }
 
+/**
+ * Sets up the desc for all instrumented bulk operations
+ *
+ * @param {Shim} shim
+ * @param {string} methodName
+ */
+common.makeBulkDescFunc = function makeBulkDescFunc(shim) {
+  return function bulkDescFunc() {
+    const parameters = getInstanceAttributeParameters(shim, this)
+    return {
+      query: this.isOrdered ? 'orderedBulk' : 'unorderedBulk',
+      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:
@@ -161,9 +197,10 @@ function setHostPort(shim, connStr, db, client) {
  * @param obj
  */
 function getInstanceAttributeParameters(shim, obj) {
-  if (obj.s && obj.s.db && obj.s.topology) {
+  if (obj.s && 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 databaseName =
+      (obj.s.db && obj.s.db.databaseName) || (obj.s.namespace && obj.s.namespace.db) || null
     const topology = obj.s.topology
     if (topology.s && topology.s.options) {
       return doCapture(topology.s.options, databaseName)

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

@@ -7,6 +7,7 @@
 
 const {
   captureAttributesOnStarted,
+  instrumentBulkOperation,
   instrumentCollection,
   instrumentCursor,
   instrumentDb,
@@ -27,6 +28,8 @@ function queryParser(operation) {
     collection = this.operation.target
   } else if (this.ns) {
     collection = this.ns.split(/\./)[1] || collection
+  } else if (this.s && this.s.collection && this.s.collection.collectionName) {
+    collection = this.s.collection.collectionName
   }
   return { operation, collection }
 }
@@ -68,6 +71,7 @@ module.exports = function instrument(shim, mongodb) {
   instrumentCursor(shim, mongodb.Cursor)
   instrumentCursor(shim, shim.require('./lib/aggregation_cursor'))
   instrumentCursor(shim, shim.require('./lib/command_cursor'))
+  instrumentBulkOperation(shim, shim.require('./lib/bulk/common'))
   instrumentCollection(shim, mongodb.Collection)
   instrumentDb(shim, mongodb.Db)
 

package/lib/logger.js

@@ -9,12 +9,16 @@ const Logger = require('./util/logger')
 const fs = require('./util/unwrapped-core').fs
 
 // create bootstrapping logger
-module.exports = new Logger({
+const logger = new Logger({
   name: 'newrelic_bootstrap',
-  stream: process.stdout,
-  level: 'info'
+  level: 'info',
+
+  // logger is configured below.  Logs are queued until configured
+  configured: false
 })
 
+module.exports = logger
+
 /**
  * Don't load config until this point, because it requires this
  * module, and if it gets loaded too early, module.exports will have no
@@ -28,8 +32,8 @@ if (config) {
     enabled: config.logging.enabled
   }
 
-  // create the "real" logger
-  module.exports = new Logger(options)
+  // configure logger
+  logger.configure(options)
 
   if (config.logging.enabled) {
     let stream
@@ -52,9 +56,6 @@ if (config) {
           /* eslint-enable no-console */
         })
     }
-    module.exports.pipe(stream)
+    logger.pipe(stream)
   }
-
-  // now tell the config module to switch to the real logger
-  config.setLogger(module.exports)
 }

package/lib/shim/shim.js

@@ -1307,7 +1307,7 @@ function applySegment(func, segment, full, context, args, inContextCB) {
     }
 
     if (typeof inContextCB === 'function') {
-      inContextCB()
+      inContextCB(segment)
     }
 
     try {