address feedback

Author: jsumners-nr

lib/subscribers/dc-base.js

@@ -18,6 +18,13 @@ const resolvePackageVersion = require('./resolve-package-version.js')
  * @property {object} logger An agent logger instance.
  * @property {string} packageName The package name being instrumented.
  * This is what a developer would provide to the `require` function.
+ * @property {boolean} [skipUsageMetricRecording=false] When set to `true`, the
+ * instrumentation will not attempt to record the usage metric. This is useful
+ * when the module being instrumented is also being instrumented via the
+ * Orchestrion based subscriber system. It is much cheaper to record the metric
+ * via Orchestrion based subscribers than through this direct diagnostics
+ * channel method (Orchestrion provides the module version, whereas we have
+ * to perform expensive operations here to get the same information).
  */
 
 /**
@@ -42,11 +49,15 @@ class Subscriber {
   /**
    * @param {SubscriberParams} params to function
    */
-  constructor({ agent, logger, packageName }) {
+  constructor({ agent, logger, packageName, skipUsageMetricRecording = false }) {
     this.agent = agent
     this.logger = logger.child({ component: `${packageName}-subscriber` })
     this.config = agent.config
     this.id = packageName
+
+    if (skipUsageMetricRecording === true) {
+      this.#usageMetricRecorded = true
+    }
   }
 
   set channels(channels) {

lib/subscribers/fastify/index.js

@@ -10,7 +10,7 @@ const MiddlewareWrapper = require('../middleware-wrapper')
 
 class FastifyInitialization extends DcBase {
   constructor({ agent, logger }) {
-    super({ agent, logger, packageName: 'fastify' })
+    super({ agent, logger, packageName: 'fastify', skipUsageMetricRecording: true })
     this.channels = [
       { channel: initChannel, hook: this.handler }
     ]
@@ -24,7 +24,10 @@ class FastifyInitialization extends DcBase {
         return
       }
 
-      routeOptions.handler = self.wrapper.wrap({ handler: routeOptions.handler, route: routeOptions.path })
+      routeOptions.handler = self.wrapper.wrap({
+        handler: routeOptions.handler,
+        route: routeOptions.path
+      })
     })
   }
 }

lib/tracking-packages.js

@@ -19,15 +19,7 @@ const trackingPkgs = [
   'fancy-log',
   'knex',
   'loglevel',
-  'npmlog',
-  // These packages are required for the tracking metrics
-  // for @langchain/core to be created. Ideally, these
-  // should not be here.
-  // TODO: will be addressed in https://github.com/newrelic/node-newrelic/issues/3575
-  '@langchain/core/prompts',
-  '@langchain/core/tools',
-  '@langchain/core/runnables',
-  '@langchain/core/vectorstores',
+  'npmlog'
 ]
 
 module.exports = trackingPkgs