Cleanup

Author: amychisholm03

lib/instrumentations.js

@@ -27,7 +27,6 @@ module.exports = function instrumentations() {
     'generic-pool': { type: InstrumentationDescriptor.TYPE_GENERIC },
     kafkajs: { type: InstrumentationDescriptor.TYPE_MESSAGE },
     koa: { module: './instrumentation/koa' },
-    // langchain: { module: './instrumentation/langchain' },
     memcached: { type: InstrumentationDescriptor.TYPE_DATASTORE },
     mongodb: { type: InstrumentationDescriptor.TYPE_DATASTORE },
     next: { module: './instrumentation/nextjs' },

lib/subscribers/langchain/base.js

@@ -21,9 +21,6 @@ class LangchainSubscriber extends Subscriber {
   }
 
   get enabled() {
-    if (!this.agent?.config?.ai_monitoring?.enabled) {
-      this.logger.debug('Langchain instrumentation is disabled. To enable, set `config.ai_monitoring.enabled` to true.')
-    }
     return super.enabled && this.agent?.config?.ai_monitoring?.enabled
   }
 

lib/subscribers/langchain/runnable-stream.js

@@ -18,10 +18,14 @@ class LangchainRunnableStreamSubscriber extends LangchainSubscriber {
 
   handler(data, ctx) {
     const { agent, logger } = this
+    // We need these checks inside the handler because it is possible for monitoring
+    // to be disabled at the account level. In such a case, the value is set
+    // after the instrumentation has been initialized.
+    if (!agent?.config?.ai_monitoring?.enabled) {
+      this.logger.debug('Langchain instrumentation is disabled. To enable, set `config.ai_monitoring.enabled` to true.')
+      return ctx
+    }
     if (!agent.config?.ai_monitoring?.streaming?.enabled) {
-      // We need this check inside the handler because it is possible for monitoring
-      // to be disabled at the account level. In such a case, the value is set
-      // after the instrumentation has been initialized.
       logger.warn('`ai_monitoring.streaming.enabled` is set to `false`, stream will not be instrumented.')
       agent.metrics.getOrCreateMetric(STREAMING_DISABLED).incrementCallCount()
       agent.metrics
@@ -44,12 +48,6 @@ class LangchainRunnableStreamSubscriber extends LangchainSubscriber {
     if (transaction?.isActive() !== true) {
       return
     }
-    if (!this?.agent?.config?.ai_monitoring?.streaming?.enabled) {
-      // ideally, we'd never get here because `handler` this case,
-      // but the config could possibly get changed in-between the two
-      // logger warning and metric creation is handled by `handler` so just return here
-      return
-    }
 
     const request = data?.arguments?.[0]
     const params = data?.arguments?.[1] || {}

lib/subscribers/langchain/runnable.js

@@ -13,10 +13,11 @@ class LangchainRunnableSubscriber extends LangchainSubscriber {
   }
 
   handler(data, ctx) {
-    if (!this.enabled) {
+    if (!this?.agent?.config?.ai_monitoring?.enabled) {
       // We need this check inside the handler because it is possible for monitoring
       // to be disabled at the account level. In such a case, the value is set
       // after the instrumentation has been initialized.
+      this.logger.debug('Langchain instrumentation is disabled. To enable, set `config.ai_monitoring.enabled` to true.')
       return ctx
     }
 

lib/subscribers/langchain/tool.js

@@ -20,10 +20,11 @@ class LangchainToolSubscriber extends LangchainSubscriber {
   }
 
   handler(data, ctx) {
-    if (!this.enabled) {
-      // We need this check inside the wrapper because it is possible for monitoring
+    if (!this?.agent?.config?.ai_monitoring?.enabled) {
+      // We need this check inside the handler because it is possible for monitoring
       // to be disabled at the account level. In such a case, the value is set
       // after the instrumentation has been initialized.
+      this.logger.debug('Langchain instrumentation is disabled. To enable, set `config.ai_monitoring.enabled` to true.')
       return ctx
     }
     const tool = data?.self
@@ -53,14 +54,6 @@ class LangchainToolSubscriber extends LangchainSubscriber {
     }
     segment.end()
 
-    if (!this.enabled) {
-      // We need this check inside the wrapper because it is possible for monitoring
-      // to be disabled at the account level. In such a case, the value is set
-      // after the instrumentation has been initialized.
-      this.logger.debug('skipping sending of ai data')
-      return
-    }
-
     const toolEvent = new LangChainTool({
       agent,
       description,

lib/subscribers/langchain/vectorstore.js

@@ -87,10 +87,11 @@ class LangchainVectorstoreSubscriber extends LangchainSubscriber {
   }
 
   handler(data, ctx) {
-    if (!this.enabled) {
-      // We need this check inside the wrapper because it is possible for monitoring
+    if (!this?.agent?.config?.ai_monitoring?.enabled) {
+      // We need this check inside the handler because it is possible for monitoring
       // to be disabled at the account level. In such a case, the value is set
       // after the instrumentation has been initialized.
+      this.logger.debug('Langchain instrumentation is disabled. To enable, set `config.ai_monitoring.enabled` to true.')
       return ctx
     }
 
@@ -115,14 +116,6 @@ class LangchainVectorstoreSubscriber extends LangchainSubscriber {
     }
     ctx.segment.end()
 
-    if (!this.enabled) {
-      // We need this check inside the wrapper because it is possible for monitoring
-      // to be disabled at the account level. In such a case, the value is set
-      // after the instrumentation has been initialized.
-      this.logger.debug('skipping sending of ai data')
-      return
-    }
-
     this.recordVectorSearch({
       request,
       k,

test/versioned/langchain/vectorstore.test.js

@@ -42,7 +42,6 @@ test.beforeEach(async (ctx) => {
       node: `http://${params.elastic_host}:${params.elastic_port}`
     })
   }
-
   const { ElasticVectorSearch } = require('@langchain/community/vectorstores/elasticsearch')
 
   ctx.nr.embedding = new OpenAIEmbeddings({