newrelic 11.13.0 → 11.15.0

package/NEWS.md

@@ -1,39 +1,92 @@
-### v11.13.0 (2024-03-13)
+### v11.15.0 (2024-04-09)
 
-#### Features
+#### Bug fixes
 
-* Added AI Monitoring(AIM) for OpenAI, Amazon Bedrock, and Langchain.
-  * To enable set `config.ai_monitoring.enabled` or `NEW_RELIC_AI_MONITORING_ENABLED` to `true`.
-  * It is recommended for a full experience to set `config.span_events.max_samples_stored` to `10000`, `config.custom_insights_events.max_samples_stored` to `100000`, and `config.distributed_tracing.enabled` should not be set to false.
-  * **Note**: Enabling [high-security mode](https://docs.newrelic.com/docs/apm/agents/manage-apm-agents/configuration/high-security-mode/) will disable the AIM instrumentation and events. 
-* Added instrumentation for VectorStore.similaritySearch for langchain.js ([#2049](https://github.com/newrelic/node-newrelic/pull/2049)) ([3c50606](https://github.com/newrelic/node-newrelic/commit/3c50606a57a8dc18c91fe36e3b180bafd15a4cbc))
-* Added setLlmTokenCountCallback API endpoint to register a callback for calculating token count when none is provided ([#2065](https://github.com/newrelic/node-newrelic/pull/2065)) ([d2faf1a](https://github.com/newrelic/node-newrelic/commit/d2faf1a4942aacefd8b92e0bc2dc11bd8b687328))
-* Added token_count to LlmEmbedding and LlmChatCompletionMessage for openai ([#2061](https://github.com/newrelic/node-newrelic/pull/2061)) ([47a925e](https://github.com/newrelic/node-newrelic/commit/47a925eccce8e5b5d682b46277bbef5191f8b553))
-* Added tool_id to langchain error event ([#2064](https://github.com/newrelic/node-newrelic/pull/2064)) ([793abe8](https://github.com/newrelic/node-newrelic/commit/793abe8c9854b80fb1cf42f839a7db6a646cdc0b))
+* Fixed instrumenting the same module installed in different locations ([#2104](https://github.com/newrelic/node-newrelic/pull/2104)) ([88bdace](https://github.com/newrelic/node-newrelic/commit/88bdace6489c7d258ed3200f1550367f35824bc1))
 
-#### Miscellaneous chores
-
-* Added flag for verbosity during docs publishing ([#2060](https://github.com/newrelic/node-newrelic/pull/2060)) ([fe0d41a](https://github.com/newrelic/node-newrelic/commit/fe0d41a86cba8da6173f5935e61c62b7dca75344))
-* Added some delays to docs publishing ([#2062](https://github.com/newrelic/node-newrelic/pull/2062)) ([a602fd4](https://github.com/newrelic/node-newrelic/commit/a602fd48e929437e4bc933c4ce276989013c53f1))
-* Changed casing of OpenAI in vendor property ([#2068](https://github.com/newrelic/node-newrelic/pull/2068)) ([64b4ca2](https://github.com/newrelic/node-newrelic/commit/64b4ca2750c9de8d9028fef515c15019e358a5d9))
-* Changed token_count to only use tokenCountCallback ([#2070](https://github.com/newrelic/node-newrelic/pull/2070)) ([66f94b0](https://github.com/newrelic/node-newrelic/commit/66f94b05aa7018af6fa1db1d2d87de9013f23a5b))
-* Removed langchain_instrumentation feature flag as the instrumentation is feature complete ([#2073](https://github.com/newrelic/node-newrelic/pull/2073)) ([925a463](https://github.com/newrelic/node-newrelic/commit/925a463c708b29c78567aecf78ac89ac226b7995))
-* updated @newrelic/aws-sdk and @newrelic/koa to latest ([#2074](https://github.com/newrelic/node-newrelic/pull/2074)) ([0747ca4](https://github.com/newrelic/node-newrelic/commit/0747ca4f0f6615e1fbfcc734a36059960facf23e))
-
-### v11.12.0 (2024-03-04)
+#### Code refactoring
 
-#### Features
-
-* Added instrumentation for `chain.stream` for langchain js. ([#2052](https://github.com/newrelic/node-newrelic/pull/2052)) ([03abfce](https://github.com/newrelic/node-newrelic/commit/03abfce666d3c48abd0994c44817bb5cbe8655a9))
+* **mongodb:** Removed instrumentation that handles connecting via unix domain socket. ([#2129](https://github.com/newrelic/node-newrelic/pull/2129)) ([808323f](https://github.com/newrelic/node-newrelic/commit/808323f0832952870fd1e94474b3fd3e0ab1b8c4))
+* Updated shim classes to no longer construct specs. ([#2096](https://github.com/newrelic/node-newrelic/pull/2096)) ([158c295](https://github.com/newrelic/node-newrelic/commit/158c29566f6a5993ec77f84aeaa266ceab0bf4f0))
 
 #### Miscellaneous chores
 
-* Added @azure/openai and @langchain/community/llms/bedrock as tracking packages so we can measure usage with angler ([#2053](https://github.com/newrelic/node-newrelic/pull/2053)) ([4830ea3](https://github.com/newrelic/node-newrelic/commit/4830ea3285726f8cc8fb60820c4cf2d3790e5250))
+* **deps-dev:** Bumped express from 4.18.2 to 4.19.2 ([#2101](https://github.com/newrelic/node-newrelic/pull/2101)) ([639cb78](https://github.com/newrelic/node-newrelic/commit/639cb785dff7568ad227091512013c2dfb81e5f9))
+* **deps:** Updated @newrelic/security-agent to v1.1.1 ([#2092](https://github.com/newrelic/node-newrelic/pull/2092)) ([3272aa3](https://github.com/newrelic/node-newrelic/commit/3272aa3da2260ce18c71c24608ffdda512ca6817))
+* Fixed incorrect pinning of @elastic/transport ([#2120](https://github.com/newrelic/node-newrelic/pull/2120)) ([7b5bdaa](https://github.com/newrelic/node-newrelic/commit/7b5bdaac1b1081636636cd7ca7c6b484f5251f76))
+* Removed scrollbar styling in generated API docs ([#2091](https://github.com/newrelic/node-newrelic/pull/2091)) ([cb0fa11](https://github.com/newrelic/node-newrelic/commit/cb0fa11c81290bb93cb30e974fdb1ece82a1e80e))
+* Removed transaction_id and legacy token count attributes from llm events for openai and langchain ([#2093](https://github.com/newrelic/node-newrelic/pull/2093)) ([df2a0fd](https://github.com/newrelic/node-newrelic/commit/df2a0fd7c99a7bbf024c1e33c7fdff512b45c970))
 
 #### Tests
 
-* Updated aws-sdk branch to main as the necessary code was merged. ([#2051](https://github.com/newrelic/node-newrelic/pull/2051)) ([1e52a5c](https://github.com/newrelic/node-newrelic/commit/1e52a5cd7a8acc8970dbdc6b1bf774c06aa6f5fb))
+* Updated test/integration/core/dns reverse test to remove flakiness ([#2121](https://github.com/newrelic/node-newrelic/pull/2121)) ([c32cb27](https://github.com/newrelic/node-newrelic/commit/c32cb2739ece3adcf5bd42e646071b3f59e691ba))
+* Updated elastic tests to skip broken version ([#2119](https://github.com/newrelic/node-newrelic/pull/2119)) ([5d0d1bb](https://github.com/newrelic/node-newrelic/commit/5d0d1bb4994b41d43ab9b4eb110fea036ac307bc))
+
+#### Continuous integration
 
+* Removed usage of `use_new_release` from prepare release workflow ([#2124](https://github.com/newrelic/node-newrelic/pull/2124)) ([007ddb4](https://github.com/newrelic/node-newrelic/commit/007ddb4dce6cf5ab463a1868fe4cfa203d3e9ff2))
+* Updated `prepare-release.js` to not require changelog.json ([#2106](https://github.com/newrelic/node-newrelic/pull/2106)) ([328a570](https://github.com/newrelic/node-newrelic/commit/328a570bbe9f359d23a21317ccd8a8bc52b473b4))
+* Updated prepare release to provide a drop down for release type ([#2133](https://github.com/newrelic/node-newrelic/pull/2133)) ([846269b](https://github.com/newrelic/node-newrelic/commit/846269bb256f287c5fb9be32bdb62e9786e3cfe4))
+* Updated versioned security agent workflow ([#2100](https://github.com/newrelic/node-newrelic/pull/2100)) ([f787b15](https://github.com/newrelic/node-newrelic/commit/f787b15f94c416d547af1ab4b2d7c31665b417b7))
+* Fixed typo in constant name for prepare release script ([#2094](https://github.com/newrelic/node-newrelic/pull/2094)) ([3b887d9](https://github.com/newrelic/node-newrelic/commit/3b887d96c70a2cc5e3833cdc8b65de99b643f7a1))
+
+### v11.14.0 (2024-03-20)
+
+#### Features
+
+* Added `guid` attribute to `TransactionError` events ([#2079](https://github.com/newrelic/node-newrelic/pull/2079)) ([3468fb1](https://github.com/newrelic/node-newrelic/commit/3468fb14635b10c30a9a814dc0d084aeacfd9e10))
+* Added instrumentation for `initializeUnorderedBulkOp`, and `initializeOrderedBulkOp` in mongodb 4+ ([#2086](https://github.com/newrelic/node-newrelic/pull/2086)) ([666ae6e](https://github.com/newrelic/node-newrelic/commit/666ae6ea4be8167748e31fe9b1d086aee5d0135d))
+* Added support for Mongo v5+ ([#2085](https://github.com/newrelic/node-newrelic/pull/2085)) ([00f6feb](https://github.com/newrelic/node-newrelic/commit/00f6febb4893ed2abe902644514af3ab629cdbc1))
+
+#### Security improvements
+
+* **deps:** bump follow-redirects from 1.15.5 to 1.15.6 ([#2078](https://github.com/newrelic/node-newrelic/pull/2078)) ([aa86482](https://github.com/newrelic/node-newrelic/commit/aa86482738ba6b17bf6c2c7362931a3ad57736dd))
+
+#### Documentation
+
+* Changed bug bounty URL ([#2081](https://github.com/newrelic/node-newrelic/pull/2081)) ([f4586d7](https://github.com/newrelic/node-newrelic/commit/f4586d71cbe9c886181fbfe4b414cf0f9d630873))
+
+#### Miscellaneous chores
+
+* Added instrumentation tracking class ([#2084](https://github.com/newrelic/node-newrelic/pull/2084)) ([07d7e7d](https://github.com/newrelic/node-newrelic/commit/07d7e7d50edf9cd8a1cd1b465b24bc589409c5dc))
+* **deps:** pin @newrelic/security-agent to 1.0.1 ([#2089](https://github.com/newrelic/node-newrelic/pull/2089)) ([e133c76](https://github.com/newrelic/node-newrelic/commit/e133c76a34f7d2af16610f00958651a6cff8824d))
+
+### v11.13.0 (2024-03-13)
+
+#### Features
+
+* Added AI Monitoring(AIM) for OpenAI, Amazon Bedrock, and Langchain.
+  * To enable set `config.ai_monitoring.enabled` or `NEW_RELIC_AI_MONITORING_ENABLED` to `true`.
+  * It is recommended for a full experience to set `config.span_events.max_samples_stored` to `10000`, `config.custom_insights_events.max_samples_stored` to `100000`, and `config.distributed_tracing.enabled` should not be set to false.
+  * **Note**: Enabling [high-security mode](https://docs.newrelic.com/docs/apm/agents/manage-apm-agents/configuration/high-security-mode/) will disable the AIM instrumentation and events. 
+* Added instrumentation for VectorStore.similaritySearch for langchain.js ([#2049](https://github.com/newrelic/node-newrelic/pull/2049)) ([3c50606](https://github.com/newrelic/node-newrelic/commit/3c50606a57a8dc18c91fe36e3b180bafd15a4cbc))
+* Added setLlmTokenCountCallback API endpoint to register a callback for calculating token count when none is provided ([#2065](https://github.com/newrelic/node-newrelic/pull/2065)) ([d2faf1a](https://github.com/newrelic/node-newrelic/commit/d2faf1a4942aacefd8b92e0bc2dc11bd8b687328))
+* Added token_count to LlmEmbedding and LlmChatCompletionMessage for openai ([#2061](https://github.com/newrelic/node-newrelic/pull/2061)) ([47a925e](https://github.com/newrelic/node-newrelic/commit/47a925eccce8e5b5d682b46277bbef5191f8b553))
+* Added tool_id to langchain error event ([#2064](https://github.com/newrelic/node-newrelic/pull/2064)) ([793abe8](https://github.com/newrelic/node-newrelic/commit/793abe8c9854b80fb1cf42f839a7db6a646cdc0b))
+
+#### Miscellaneous chores
+
+* Added flag for verbosity during docs publishing ([#2060](https://github.com/newrelic/node-newrelic/pull/2060)) ([fe0d41a](https://github.com/newrelic/node-newrelic/commit/fe0d41a86cba8da6173f5935e61c62b7dca75344))
+* Added some delays to docs publishing ([#2062](https://github.com/newrelic/node-newrelic/pull/2062)) ([a602fd4](https://github.com/newrelic/node-newrelic/commit/a602fd48e929437e4bc933c4ce276989013c53f1))
+* Changed casing of OpenAI in vendor property ([#2068](https://github.com/newrelic/node-newrelic/pull/2068)) ([64b4ca2](https://github.com/newrelic/node-newrelic/commit/64b4ca2750c9de8d9028fef515c15019e358a5d9))
+* Changed token_count to only use tokenCountCallback ([#2070](https://github.com/newrelic/node-newrelic/pull/2070)) ([66f94b0](https://github.com/newrelic/node-newrelic/commit/66f94b05aa7018af6fa1db1d2d87de9013f23a5b))
+* Removed langchain_instrumentation feature flag as the instrumentation is feature complete ([#2073](https://github.com/newrelic/node-newrelic/pull/2073)) ([925a463](https://github.com/newrelic/node-newrelic/commit/925a463c708b29c78567aecf78ac89ac226b7995))
+* updated @newrelic/aws-sdk and @newrelic/koa to latest ([#2074](https://github.com/newrelic/node-newrelic/pull/2074)) ([0747ca4](https://github.com/newrelic/node-newrelic/commit/0747ca4f0f6615e1fbfcc734a36059960facf23e))
+
+### v11.12.0 (2024-03-04)
+
+#### Features
+
+* Added instrumentation for `chain.stream` for langchain js. ([#2052](https://github.com/newrelic/node-newrelic/pull/2052)) ([03abfce](https://github.com/newrelic/node-newrelic/commit/03abfce666d3c48abd0994c44817bb5cbe8655a9))
+
+#### Miscellaneous chores
+
+* Added @azure/openai and @langchain/community/llms/bedrock as tracking packages so we can measure usage with angler ([#2053](https://github.com/newrelic/node-newrelic/pull/2053)) ([4830ea3](https://github.com/newrelic/node-newrelic/commit/4830ea3285726f8cc8fb60820c4cf2d3790e5250))
+
+#### Tests
+
+* Updated aws-sdk branch to main as the necessary code was merged. ([#2051](https://github.com/newrelic/node-newrelic/pull/2051)) ([1e52a5c](https://github.com/newrelic/node-newrelic/commit/1e52a5cd7a8acc8970dbdc6b1bf774c06aa6f5fb))
+
 ### v11.11.0 (2024-02-27)
 
 #### Features

package/README.md

@@ -234,7 +234,7 @@ If you have any questions, or to execute our corporate CLA, required if your con
 
 As noted in our [security policy](../../security/policy), New Relic is committed to the privacy and security of our customers and their data. We believe that providing coordinated disclosure by security researchers and engaging with the security community are important means to achieve our security goals.
 
-If you believe you have found a security vulnerability in this project or any of New Relic's products or websites, we welcome and greatly appreciate you reporting it to New Relic through [HackerOne](https://hackerone.com/newrelic).
+If you believe you have found a security vulnerability in this project or any of New Relic's products or websites, we welcome and greatly appreciate you reporting it to New Relic through [our bug bounty program](https://docs.newrelic.com/docs/security/security-privacy/information-security/report-security-vulnerabilities/).
 
 If you would like to contribute to this project, review [these guidelines](./CONTRIBUTING.md).
 

package/THIRD_PARTY_NOTICES.md

@@ -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) ([v9.0.0](https://github.com/newrelic/node-newrelic-koa/tree/v9.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-koa/blob/v9.0.0/LICENSE):
+This product includes source derived from [@newrelic/koa](https://github.com/newrelic/node-newrelic-koa) ([v9.1.0](https://github.com/newrelic/node-newrelic-koa/tree/v9.1.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-koa/blob/v9.1.0/LICENSE):
 
 ```
 Apache License
@@ -951,7 +951,7 @@ SOFTWARE.
 
 ### @newrelic/security-agent
 
-This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v1.0.1](https://github.com/newrelic/csec-node-agent/tree/v1.0.1)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v1.0.1/LICENSE):
+This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v1.1.1](https://github.com/newrelic/csec-node-agent/tree/v1.1.1)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v1.1.1/LICENSE):
 
 ```
 ## New Relic Software License v1.0

package/api.js

@@ -26,7 +26,7 @@ const {
 const LlmFeedbackMessage = require('./lib/llm-events/feedback-message')
 
 const ATTR_DEST = require('./lib/config/attribute-filter').DESTINATIONS
-const MODULE_TYPE = require('./lib/shim/constants').MODULE_TYPE
+const MODULE_TYPE = require('./lib/instrumentation-descriptor').TYPES
 const NAMES = require('./lib/metrics/names')
 const obfuscate = require('./lib/util/sql/obfuscate')
 const { DESTINATIONS } = require('./lib/config/attribute-filter')

package/lib/errors/index.js

@@ -240,6 +240,7 @@ function _getErrorEventIntrinsicAttrs(transaction, errorClass, message, expected
     }
 
     attributes['nr.transactionGuid'] = transaction.id
+    attributes.guid = transaction.id
 
     if (transaction.port) {
       attributes.port = transaction.port

package/lib/instrumentation/cassandra-driver.js

@@ -28,7 +28,9 @@ module.exports = function initialize(_agent, cassandra, _moduleName, shim) {
   shim.recordOperation(
     ClientProto,
     ['connect', 'shutdown'],
-    new OperationSpec({ callback: shim.LAST })
+    function operationSpec(shim, _fn, name) {
+      return new OperationSpec({ callback: shim.LAST, name })
+    }
   )
 
   if (semver.satisfies(cassandraVersion, '>=4.4.0')) {

package/lib/instrumentation/mongodb/common.js

@@ -11,7 +11,6 @@ const {
 } = require('../../shim/specs')
 const { CURSOR_OPS, COLLECTION_OPS, DB_OPS } = require('./constants')
 const common = module.exports
-common.NR_ATTRS = Symbol('NR_ATTRS')
 
 /**
  * Instruments all methods from constants.CURSOR_OPS on a given
@@ -23,12 +22,9 @@ common.NR_ATTRS = Symbol('NR_ATTRS')
 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', new OperationSpec({ opaque: true }))
+    shim.recordQuery(proto, CURSOR_OPS, common.makeQueryDescFunc)
+    shim.recordQuery(proto, 'each', common.makeQueryDescFunc)
+    shim.recordOperation(proto, 'pipe', new OperationSpec({ opaque: true, name: 'pipe' }))
   }
 }
 
@@ -42,9 +38,7 @@ common.instrumentCursor = function instrumentCursor(shim, Cursor) {
 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]))
-    }
+    shim.recordQuery(proto, COLLECTION_OPS, common.makeQueryDescFunc)
   }
 }
 
@@ -72,9 +66,20 @@ common.instrumentBulkOperation = function instrumentBulkOperation(shim, BulkOper
 common.instrumentDb = function instrumentDb(shim, Db) {
   if (Db && Db.prototype) {
     const proto = Db.prototype
-    shim.recordOperation(proto, DB_OPS, new OperationSpec({ callback: shim.LAST, opaque: true }))
+    shim.recordOperation(proto, DB_OPS, function makeOperationDescFunc(shim, _fn, methodName) {
+      return new OperationSpec({
+        callback: shim.LAST,
+        opaque: true,
+        promise: true,
+        name: methodName
+      })
+    })
     // link to client.connect(removed in v4.0)
-    shim.recordOperation(Db, 'connect', new OperationSpec({ callback: shim.LAST }))
+    shim.recordOperation(
+      Db,
+      'connect',
+      new OperationSpec({ callback: shim.LAST, promise: true, name: 'connect' })
+    )
   }
 }
 
@@ -82,29 +87,26 @@ common.instrumentDb = function instrumentDb(shim, Db) {
  * Sets up the desc for all instrumented query methods
  *
  * @param {Shim} shim instance of shim
- * @param {string} methodName name of method getting executed
- * @returns {object} query spec
+ * @param {Function} _fn function getting instrumented
+ * @param {string} methodName name of function
+ * @returns {QuerySpec} query spec
  */
-common.makeQueryDescFunc = function makeQueryDescFunc(shim, methodName) {
+common.makeQueryDescFunc = function makeQueryDescFunc(shim, _fn, methodName) {
   if (methodName === 'each') {
-    return function eachDescFunc() {
-      const parameters = getInstanceAttributeParameters(shim, this)
-      return new QuerySpec({ 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 new QuerySpec({
-      query: methodName,
-      parameters,
-      promise: true,
-      callback: shim.LAST,
-      opaque: true
-    })
+    return new QuerySpec({ query: methodName, parameters, rowCallback: shim.LAST, opaque: true })
   }
+
+  // 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 new QuerySpec({
+    query: methodName,
+    parameters,
+    promise: true,
+    callback: shim.LAST,
+    opaque: true
+  })
 }
 
 /**
@@ -133,7 +135,7 @@ common.makeBulkDescFunc = function makeBulkDescFunc(shim) {
  *
  * @param {Shim} shim instance of shim
  * @param {object} instrumenter instance of mongo APM class
- * @param {object} [options={}] provide command names to skip updating host/port as they are unrelated to the active query.  This is only in v3 because after every command is runs `endSessions` which runs on the admin database
+ * @param {object} [options] provide command names to skip updating host/port as they are unrelated to the active query.  This is only in v3 because after every command is runs `endSessions` which runs on the admin database
  */
 common.captureAttributesOnStarted = function captureAttributesOnStarted(
   shim,
@@ -152,13 +154,10 @@ common.captureAttributesOnStarted = function captureAttributesOnStarted(
     if (connId) {
       // used in v3 when connection is a cluster pool
       if (typeof connId === 'number') {
-        setHostPort(shim, evnt.address, evnt.databaseName, this.$MongoClient)
+        setHostPort(shim, evnt.address, evnt.databaseName)
         // used in v3 when connection is to 1 host
       } else if (typeof connId === 'string') {
         setHostPort(shim, connId, evnt.databaseName)
-        // v2 contains `domainSocket`, get socket connection from `host`
-      } else if (connId.domainSocket) {
-        shim.captureInstanceAttributes('localhost', connId.host, evnt.databaseName)
         // v2 remote connection get `host` `port` from respective properties
       } else {
         shim.captureInstanceAttributes(connId.host, connId.port, evnt.databaseName)
@@ -169,37 +168,14 @@ common.captureAttributesOnStarted = function captureAttributesOnStarted(
 
 /**
  * Extracts the host and port from a connection string
- * This also handles if connection string is a domain socket
- * 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.
  *
  * @param {Shim} shim instance of shim
  * @param {string} connStr mongo connection string
  * @param {string} db database name
- * @param {object} client mongo client instance
  */
-function setHostPort(shim, connStr, db, client) {
+function setHostPort(shim, connStr, db) {
   const parts = common.parseAddress(connStr)
-  // in v3 when running with a cluster of socket connections
-  // the address is `undefined:undefined`. we will instead attempt
-  // to get connection details from the client symbol NR_ATTRS
-  // added in `lib/instrumentation/mongodb/v3-mongo` when a client connects
-  // with a URL string
-  if (parts.includes('undefined')) {
-    try {
-      const attrs = client[common.NR_ATTRS]
-      const socket = decodeURIComponent(attrs.split(',')[0].split('mongodb://')[1])
-      shim.captureInstanceAttributes('localhost', socket, db)
-    } catch (err) {
-      shim.logger.debug(err, 'Could not extract host/port from mongo command')
-    }
-    // connected using domain socket but the "host"(e.g: /path/to/mongo-socket-port.sock)
-  } else if (parts.length && parts[0][0] === '/') {
-    shim.captureInstanceAttributes('localhost', parts[0], db)
-  } else {
-    shim.captureInstanceAttributes(parts[0], parts[1], db)
-  }
+  shim.captureInstanceAttributes(parts[0], parts[1], db)
 }
 
 /**
@@ -214,7 +190,6 @@ function setHostPort(shim, connStr, db, client) {
  */
 function getInstanceAttributeParameters(shim, mongo) {
   let params
-
   if (mongo?.s?.topology) {
     shim.logger.trace('Adding datastore instance attributes from mongo.s.db + mongo.s.topology')
     const databaseName = mongo?.s?.db?.databaseName || mongo?.s?.namespace?.db || null
@@ -224,6 +199,10 @@ function getInstanceAttributeParameters(shim, mongo) {
     const databaseName = mongo?.s?.db?.databaseName || null
     const hosts = mongo.s.db.s.client.s.options.hosts
     params = getParametersFromHosts(hosts, databaseName)
+  } else if (mongo?.s?.db?.client?.topology) {
+    const databaseName = mongo?.s?.namespace?.db
+    const topology = mongo.s.db.client.topology
+    params = getParametersFromTopology(topology, databaseName)
   } else {
     shim.logger.trace('Could not find datastore instance attributes.')
     params = new DatastoreParameters()
@@ -240,13 +219,8 @@ function getInstanceAttributeParameters(shim, mongo) {
  * @returns {object} db params
  */
 function getParametersFromHosts(hosts, database) {
-  let [{ host, port }] = hosts
-  const [{ socketPath }] = hosts
+  const [{ host, port }] = hosts
 
-  if (socketPath) {
-    port = socketPath
-    host = 'localhost'
-  }
   return new DatastoreParameters({
     host,
     port_path_or_id: port,
@@ -272,15 +246,13 @@ function getParametersFromTopology(conf, database) {
     ;[{ host, port }] = conf.s.options.servers
   }
 
-  // host is a domain socket. set host as localhost and use the domain
-  // socket host as the port
-  if (host && host.endsWith('.sock')) {
-    port = host
-    host = 'localhost'
+  // hosts is an array but we will always pull the first for consistency
+  if (conf?.s?.options?.hosts?.length) {
+    ;[{ host, port }] = conf.s.options.hosts
   }
 
   return new DatastoreParameters({
-    host: host,
+    host,
     port_path_or_id: port,
     database_name: database
   })

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

@@ -38,7 +38,7 @@ module.exports = function instrument(shim, mongodb) {
   const recordDesc = {
     Gridstore: {
       isQuery: false,
-      makeDescFunc: function makeGridDesc(opName) {
+      makeDescFunc: function makeGridDesc(shim, fn, opName) {
         return new OperationSpec({ name: 'GridFS-' + opName, callback: shim.LAST })
       }
     },
@@ -50,8 +50,8 @@ module.exports = function instrument(shim, mongodb) {
     Collection: { isQuery: true, makeDescFunc: makeQueryDescFunc },
     Db: {
       isQuery: false,
-      makeDescFunc: function makeDbDesc() {
-        return new OperationSpec({ callback: shim.LAST })
+      makeDescFunc: function makeDbDesc(shim, fn, method) {
+        return new OperationSpec({ callback: shim.LAST, name: method })
       }
     }
   }
@@ -95,10 +95,10 @@ module.exports = function instrument(shim, mongodb) {
         const { isQuery, makeDescFunc } = recordDesc[objectName]
         const proto = object.prototype
         if (isQuery) {
-          shim.recordQuery(proto, method, makeDescFunc(shim, method))
+          shim.recordQuery(proto, method, makeDescFunc)
         } else if (isQuery === false) {
           // could be unset
-          shim.recordOperation(proto, method, makeDescFunc(shim, method))
+          shim.recordOperation(proto, method, makeDescFunc)
         } else {
           shim.logger.trace('No wrapping method found for %s', objectName)
         }
@@ -108,7 +108,11 @@ module.exports = function instrument(shim, mongodb) {
     // the cursor object implements Readable stream and internally calls nextObject on
     // each read, in which case we do not want to record each nextObject() call
     if (/Cursor$/.test(objectName)) {
-      shim.recordOperation(object.prototype, 'pipe', new OperationSpec({ opaque: true }))
+      shim.recordOperation(
+        object.prototype,
+        'pipe',
+        new OperationSpec({ opaque: true, name: 'pipe' })
+      )
     }
   }
 }

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

@@ -11,15 +11,15 @@ const {
   instrumentBulkOperation,
   instrumentCollection,
   instrumentCursor,
-  instrumentDb,
-  NR_ATTRS
+  instrumentDb
 } = require('./common')
 
 /**
  * parser used to grab the collection and operation
  * on every mongo operation
  *
- * @param {object} operation
+ * @param {object} operation mongodb operation
+ * @returns {object} { operation, collection } parsed operation and collection
  */
 function queryParser(operation) {
   let collection = this.collectionName || 'unknown'
@@ -40,15 +40,12 @@ function queryParser(operation) {
  * to a Symbol on the MongoClient to be used later to extract the host/port in cases where the topology
  * is a cluster of domain sockets
  *
- * @param {Shim} shim
+ * @param {Shim} shim instance of shim
  * @param {object} mongodb resolved package
  */
 function instrumentClient(shim, mongodb) {
-  shim.recordOperation(mongodb.MongoClient, 'connect', function wrappedConnect(shim, _, __, args) {
-    // Add the connection url to the MongoClient to retrieve later in the `lib/instrumentation/mongo/common`
-    // captureAttributesOnStarted listener
-    this[NR_ATTRS] = args[0]
-    return new RecorderSpec({ callback: shim.LAST })
+  shim.recordOperation(mongodb.MongoClient, 'connect', function wrappedConnect(shim) {
+    return new RecorderSpec({ callback: shim.LAST, name: 'connect' })
   })
 }
 
@@ -61,7 +58,7 @@ function instrumentClient(shim, mongodb) {
  * as well as sets up a listener for when commands start to properly
  * add necessary attributes to segments
  *
- * @param {Shim} shim
+ * @param {Shim} shim instance of shim
  * @param {object} mongodb resolved package
  */
 module.exports = function instrument(shim, mongodb) {

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

@@ -6,20 +6,30 @@
 'use strict'
 
 const { OperationSpec } = require('../../shim/specs')
-const { instrumentCollection, instrumentCursor, instrumentDb, parseAddress } = require('./common')
+const {
+  instrumentBulkOperation,
+  instrumentCollection,
+  instrumentCursor,
+  instrumentDb,
+  parseAddress
+} = require('./common')
 
 /**
  * parser used to grab the collection and operation
  * from a running query
  *
- * @param {object} operation
+ * @param {object} operation mongodb operation
+ * @returns {object} { operation, collection } parsed operation and collection
  */
 function queryParser(operation) {
   let collection = this.collectionName || 'unknown'
 
   // cursor methods have collection on namespace.collection
-  if (this.namespace && this.namespace.collection) {
+  if (this?.namespace?.collection) {
     collection = this.namespace.collection
+    // (un)ordered bulk operations have collection on different key
+  } else if (this?.s?.collection?.collectionName) {
+    collection = this.s.collection.collectionName
   }
 
   return { operation, collection }
@@ -30,23 +40,15 @@ function queryParser(operation) {
  * update host, port and database_name
  * on segment attributes
  *
- * @param {Shim} shim
- * @param {CommandStartedEvent} evnt
+ * @param {Shim} shim instance of shim
+ * @param {CommandStartedEvent} evnt mongodb event
  */
 function cmdStartedHandler(shim, evnt) {
   if (evnt.connectionId) {
-    let [host, port] = parseAddress(evnt.address)
-
-    // connection via socket get port from 1st host
-    // socketPath property
-    // which looks like mongodb:///tmp/mongodb-27017.sock"
-    if (['undefined'].includes(host, port)) {
-      host = 'localhost'
-      const hosts = this.s.options.hosts
-      if (hosts && hosts.length && hosts[0].socketPath) {
-        port = hosts[0].socketPath
-      }
-    } else if (['127.0.0.1', '::1', '[::1]'].includes(host)) {
+    const address = parseAddress(evnt.address)
+    let [host] = address
+    const [, port] = address
+    if (['127.0.0.1', '::1', '[::1]'].includes(host)) {
       host = 'localhost'
     }
 
@@ -59,12 +61,13 @@ function cmdStartedHandler(shim, evnt) {
  * enable APM(monitorCommands) and add the
  * `commandStarted` listener
  *
- * @param {Shim} shim
+ * @param {Shim} shim instance of shim
+ * @returns {OperationSpec} spec to capture connect method
  */
 function wrapConnect(shim) {
   this.monitorCommands = true
   this.on('commandStarted', cmdStartedHandler.bind(this, shim))
-  return new OperationSpec({ callback: shim.LAST })
+  return new OperationSpec({ callback: shim.LAST, name: 'connect' })
 }
 
 /**
@@ -73,7 +76,7 @@ function wrapConnect(shim) {
  * so we can properly update the segment attributes with a more accurate
  * host/port/database name
  *
- * @param {Shim} shim
+ * @param {Shim} shim instance of shim
  * @param {MongoClient} MongoClient reference
  */
 function instrumentMongoClient(shim, MongoClient) {
@@ -88,4 +91,5 @@ module.exports = function instrument(shim, mongodb) {
   instrumentCursor(shim, mongodb.AggregationCursor)
   instrumentCollection(shim, mongodb.Collection)
   instrumentDb(shim, mongodb.Db)
+  instrumentBulkOperation(shim, shim.require('./lib/bulk/common'))
 }

package/lib/instrumentation/pg.js

@@ -6,7 +6,7 @@
 'use strict'
 
 const { nrEsmProxy } = require('../symbols')
-const { RecorderSpec, QuerySpec } = require('../shim/specs')
+const { RecorderSpec, QuerySpec, ClassWrapSpec } = require('../shim/specs')
 const DatastoreParameters = require('../shim/specs/params/datastore')
 
 function getQuery(shim, original, name, args) {
@@ -58,12 +58,12 @@ module.exports = function initialize(agent, pgsql, moduleName, shim) {
   // wrapping for native
   function instrumentPGNative(pg) {
     shim.wrapReturn(pg, 'Client', clientFactoryWrapper)
-    shim.wrapClass(pg, 'Pool', { post: poolPostConstructor, es6: true })
+    shim.wrapClass(pg, 'Pool', new ClassWrapSpec({ post: poolPostConstructor, es6: true }))
   }
 
   function poolPostConstructor(shim) {
     if (!shim.isWrapped(this.Client)) {
-      shim.wrapClass(this, 'Client', clientPostConstructor)
+      shim.wrapClass(this, 'Client', new ClassWrapSpec({ post: clientPostConstructor }))
     }
   }