chore: Updated @apm-js-collab/tracing-hooks to latest to take advantage of wasm optimizations (newrelic#3398)

Author: bizob2828

THIRD_PARTY_NOTICES.md

@@ -98,7 +98,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 ### @apm-js-collab/tracing-hooks
 
-This product includes source derived from [@apm-js-collab/tracing-hooks](https://github.com/apm-js-collab/tracing-hooks) ([v0.1.1](https://github.com/apm-js-collab/tracing-hooks/tree/v0.1.1)), distributed under the [Apache-2.0 License](https://github.com/apm-js-collab/tracing-hooks/blob/v0.1.1/LICENSE):
+This product includes source derived from [@apm-js-collab/tracing-hooks](https://github.com/apm-js-collab/tracing-hooks) ([v0.3.1](https://github.com/apm-js-collab/tracing-hooks/tree/v0.3.1)), distributed under the [Apache-2.0 License](https://github.com/apm-js-collab/tracing-hooks/blob/v0.3.1/LICENSE):
 
 ```
 
@@ -308,7 +308,7 @@ This product includes source derived from [@apm-js-collab/tracing-hooks](https:/
 
 ### @grpc/grpc-js
 
-This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.13.4](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.13.4)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.13.4/LICENSE):
+This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.14.0](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.14.0)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.14.0/LICENSE):
 
 ```
                                  Apache License
@@ -726,7 +726,7 @@ This product includes source derived from [@grpc/proto-loader](https://github.co
 
 ### @newrelic/security-agent
 
-This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v2.4.3](https://github.com/newrelic/csec-node-agent/tree/v2.4.3)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v2.4.3/LICENSE):
+This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v2.4.4](https://github.com/newrelic/csec-node-agent/tree/v2.4.4)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v2.4.4/LICENSE):
 
 ```
 ## New Relic Software License v1.0
@@ -1190,7 +1190,7 @@ This product includes source derived from [@opentelemetry/api](https://github.co
 
 ### @opentelemetry/core
 
-This product includes source derived from [@opentelemetry/core](https://github.com/open-telemetry/opentelemetry-js) ([v2.0.1](https://github.com/open-telemetry/opentelemetry-js/tree/v2.0.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.0.1/LICENSE):
+This product includes source derived from [@opentelemetry/core](https://github.com/open-telemetry/opentelemetry-js) ([v2.1.0](https://github.com/open-telemetry/opentelemetry-js/tree/v2.1.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.1.0/LICENSE):
 
 ```
                                  Apache License
@@ -1608,7 +1608,7 @@ This product includes source derived from [@opentelemetry/exporter-metrics-otlp-
 
 ### @opentelemetry/resources
 
-This product includes source derived from [@opentelemetry/resources](https://github.com/open-telemetry/opentelemetry-js) ([v2.0.1](https://github.com/open-telemetry/opentelemetry-js/tree/v2.0.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.0.1/LICENSE):
+This product includes source derived from [@opentelemetry/resources](https://github.com/open-telemetry/opentelemetry-js) ([v2.1.0](https://github.com/open-telemetry/opentelemetry-js/tree/v2.1.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.1.0/LICENSE):
 
 ```
                                  Apache License
@@ -2026,7 +2026,7 @@ This product includes source derived from [@opentelemetry/sdk-logs](https://gith
 
 ### @opentelemetry/sdk-metrics
 
-This product includes source derived from [@opentelemetry/sdk-metrics](https://github.com/open-telemetry/opentelemetry-js) ([v2.0.1](https://github.com/open-telemetry/opentelemetry-js/tree/v2.0.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.0.1/LICENSE):
+This product includes source derived from [@opentelemetry/sdk-metrics](https://github.com/open-telemetry/opentelemetry-js) ([v2.1.0](https://github.com/open-telemetry/opentelemetry-js/tree/v2.1.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.1.0/LICENSE):
 
 ```
                                  Apache License
@@ -2235,7 +2235,7 @@ This product includes source derived from [@opentelemetry/sdk-metrics](https://g
 
 ### @opentelemetry/sdk-trace-base
 
-This product includes source derived from [@opentelemetry/sdk-trace-base](https://github.com/open-telemetry/opentelemetry-js) ([v2.0.1](https://github.com/open-telemetry/opentelemetry-js/tree/v2.0.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.0.1/LICENSE):
+This product includes source derived from [@opentelemetry/sdk-trace-base](https://github.com/open-telemetry/opentelemetry-js) ([v2.1.0](https://github.com/open-telemetry/opentelemetry-js/tree/v2.1.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.1.0/LICENSE):
 
 ```
                                  Apache License
@@ -2533,7 +2533,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### import-in-the-middle
 
-This product includes source derived from [import-in-the-middle](https://github.com/nodejs/import-in-the-middle) ([v1.14.2](https://github.com/nodejs/import-in-the-middle/tree/v1.14.2)), distributed under the [Apache-2.0 License](https://github.com/nodejs/import-in-the-middle/blob/v1.14.2/LICENSE):
+This product includes source derived from [import-in-the-middle](https://github.com/nodejs/import-in-the-middle) ([v1.14.4](https://github.com/nodejs/import-in-the-middle/tree/v1.14.4)), distributed under the [Apache-2.0 License](https://github.com/nodejs/import-in-the-middle/blob/v1.14.4/LICENSE):
 
 ```
                                  Apache License
@@ -2964,7 +2964,7 @@ SOFTWARE.
 
 ### @aws-sdk/client-s3
 
-This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.872.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.872.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.872.0/LICENSE):
+This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.896.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.896.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.896.0/LICENSE):
 
 ```
                                 Apache License
@@ -3173,7 +3173,7 @@ This product includes source derived from [@aws-sdk/client-s3](https://github.co
 
 ### @aws-sdk/s3-request-presigner
 
-This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.872.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.872.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.872.0/LICENSE):
+This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.896.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.896.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.896.0/LICENSE):
 
 ```
                                 Apache License
@@ -5033,7 +5033,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ### eslint
 
-This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v9.33.0](https://github.com/eslint/eslint/tree/v9.33.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v9.33.0/LICENSE):
+This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v9.36.0](https://github.com/eslint/eslint/tree/v9.36.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v9.36.0/LICENSE):
 
 ```
 Copyright OpenJS Foundation and other contributors, <www.openjsf.org>

esm-loader.mjs

@@ -9,10 +9,10 @@ import subscriptions from './lib/subscriber-configs.js'
 import createSubscriberConfigs from './lib/subscribers/create-config.js'
 // Exclusions must be regexes
 const exclusions = [/@openai\/agents.*/]
-const { packages, instrumentations } = createSubscriberConfigs(subscriptions)
+const { instrumentations } = createSubscriberConfigs(subscriptions)
 
 register('@apm-js-collab/tracing-hooks/hook.mjs', import.meta.url, {
-  data: { instrumentations, packages }
+  data: { instrumentations }
 })
 register('import-in-the-middle/hook.mjs', import.meta.url, {
   data: { exclude: exclusions }

lib/subscribers/create-config.js

@@ -12,16 +12,14 @@
  * @returns {Object} An object containing a Set of unique package names and an array of instrumentations.
  */
 function createSubscribersConfig (subscribers = []) {
-  const packages = new Set()
   const instrumentations = []
-  for (const [packageName, subscriberList] of Object.entries(subscribers)) {
-    packages.add(packageName)
+  for (const subscriberList of Object.values(subscribers)) {
     for (const subscriber of subscriberList) {
       instrumentations.push(...subscriber.instrumentations)
     }
   }
 
-  return { packages, instrumentations }
+  return { instrumentations }
 }
 
 module.exports = createSubscribersConfig

lib/subscribers/openai/base.js

@@ -10,12 +10,38 @@ const Subscriber = require('../base')
 class OpenAISubscriber extends Subscriber {
   constructor({ agent, logger, channelName }) {
     super({ agent, logger, packageName: 'openai', channelName })
-    this.events = ['asyncEnd']
+    this.events = ['asyncEnd', 'end']
   }
 
   get enabled() {
     return super.enabled && this.config.ai_monitoring?.enabled
   }
+
+  /**
+   * Temporary fix as `tracePromise` wraps the promise in a native one.
+   * We are now wrapping all openai functions in a `traceSync` call.
+   * Then we wrap the promise here so it returns the custom promise.
+   * OpenAI has a [custom promise](https://github.com/openai/openai-node/blob/master/src/core/api-promise.ts).
+   * see: https://github.com/newrelic/node-newrelic/issues/3379
+   * see: https://github.com/nodejs/node/issues/59936
+   * @param data
+   */
+  end(data) {
+    const promise = data?.result
+    if (!promise.then) {
+      return promise
+    }
+
+    return promise.then((result) => {
+      data.result = result
+      this.channel.asyncEnd.publish(data)
+      return result
+    }).catch((err) => {
+      data.error = err
+      this.channel.asyncEnd.publish(data)
+      return err
+    })
+  }
 }
 
 module.exports = OpenAISubscriber

lib/subscribers/openai/chat.js

@@ -23,7 +23,6 @@ const MIN_STREAM_VERSION = '4.12.2'
 class OpenAIChatCompletions extends OpenAISubscriber {
   constructor({ agent, logger, channelName = 'nr_completionsCreate' }) {
     super({ agent, logger, channelName })
-    this.events = ['asyncEnd', 'end']
   }
 
   handler(data, ctx) {
@@ -43,32 +42,6 @@ class OpenAIChatCompletions extends OpenAISubscriber {
     return newCtx
   }
 
-  /**
-   * Temporary fix as `tracePromise` wraps the promise in a native one.
-   * We are now wrapping `openai.chat.completions.parse` in a traceSync call
-   * and then wrapping the promise here so it returns the custom promise.
-   * OpenAI has a [custom promise](https://github.com/openai/openai-node/blob/master/src/core/api-promise.ts) that crashes applications using `openai.chat.completions.parse`
-   * see: https://github.com/newrelic/node-newrelic/issues/3379
-   * see: https://github.com/nodejs/node/issues/59936
-   * @param data
-   */
-  end(data) {
-    const promise = data?.result
-    if (!promise.then) {
-      return promise
-    }
-
-    return promise.then((result) => {
-      data.result = result
-      this.channel.asyncEnd.publish(data)
-      return result
-    }).catch((err) => {
-      data.error = err
-      this.channel.asyncEnd.publish(data)
-      return err
-    })
-  }
-
   asyncEnd(data) {
     const ctx = this.agent.tracer.getContext()
     if (!ctx?.segment || !ctx?.transaction) {

lib/subscribers/openai/config.js

@@ -53,7 +53,7 @@ module.exports = {
           functionQuery: {
             className: 'APIClient',
             methodName: 'makeRequest',
-            kind: 'Async'
+            kind: 'Sync'
           }
         },
         {
@@ -62,7 +62,7 @@ module.exports = {
           functionQuery: {
             className: 'OpenAI',
             methodName: 'makeRequest',
-            kind: 'Async'
+            kind: 'Sync'
           }
         }
       ]
@@ -76,7 +76,7 @@ module.exports = {
           functionQuery: {
             className: 'Embeddings',
             methodName: 'create',
-            kind: 'Async'
+            kind: 'Sync'
           }
         }
       ]

package.json

@@ -201,7 +201,7 @@
     "#test/assert": "./test/lib/custom-assertions/index.js"
   },
   "dependencies": {
-    "@apm-js-collab/tracing-hooks": "^0.1.0",
+    "@apm-js-collab/tracing-hooks": "^0.3.1",
     "@grpc/grpc-js": "^1.13.2",
     "@grpc/proto-loader": "^0.7.5",
     "@newrelic/security-agent": "^2.4.2",