feat: Add ai_monitoring configuration (#1873)

newrelic · Nov 16, 2023 · 52bf9f3 · 52bf9f3
1 parent 1c62321
commit 52bf9f3
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 9 deletions.
diff --git a/documentation/feature-flags.md b/documentation/feature-flags.md
@@ -8,12 +8,6 @@ Any prerelease flags can be enabled or disabled in your agent config by adding a
 
 ## Current prerelease feature flags
 
-#### openai_instrumentation
-* Enabled by default: `false`
-* Configuration: `{ feature_flag: { openai_instrumentation: true|false }}`
-* Environment Variable: `NEW_RELIC_FEATURE_FLAG_OPENAI_INSTRUMENTATION`
-* Description: Enables instrumenting the `openai` module.
-
 #### promise_segments
 * Enabled by default: `false`  
 * Configuration: `{ feature_flag: { promise_segments: true|false }}`

diff --git a/lib/config/default.js b/lib/config/default.js
@@ -1345,6 +1345,20 @@ defaultConfig.definition = () => ({
       formatter: boolean,
       default: false
     }
+  },
+
+  /**
+   * When enabled, instrumentation of supported AI libraries will be in
+   * effect.
+   */
+  ai_monitoring: {
+    /**
+     * Toggles the generation of AI monitoring events by the agent.
+     */
+    enabled: {
+      formatter: boolean,
+      default: false
+    }
   }
 })
 

diff --git a/lib/config/hsm.js b/lib/config/hsm.js
@@ -55,6 +55,9 @@ const HIGH_SECURITY_SETTINGS = {
     forwarding: {
       enabled: false
     }
+  },
+  ai_monitoring: {
+    enabled: false
   }
 }
 

diff --git a/lib/feature_flags.js b/lib/feature_flags.js
@@ -8,7 +8,6 @@
 // unreleased flags gating an active feature
 exports.prerelease = {
   express5: false,
-  openai_instrumentation: false,
   promise_segments: false,
   reverse_naming_rules: false,
   undici_async_tracking: true,

diff --git a/test/unit/config/config-defaults.test.js b/test/unit/config/config-defaults.test.js
@@ -308,4 +308,9 @@ tap.test('with default properties', (t) => {
     t.equal(configuration.worker_threads.enabled, false)
     t.end()
   })
+
+  t.test('should default ai_monitoring.enabled to false', (t) => {
+    t.equal(configuration.ai_monitoring.enabled, false)
+    t.end()
+  })
 })
diff --git a/test/unit/config/config-security.test.js b/test/unit/config/config-security.test.js
@@ -226,3 +226,16 @@ tap.test('#applyLasp', (t) => {
     t.end()
   })
 })
+
+tap.test('ai_monitoring should not be enabled in HSM', (t) => {
+  const config = Config.initialize({
+    ai_monitoring: {
+      enabled: true
+    },
+    high_security: 'true'
+  })
+
+  t.equal(config.ai_monitoring.enabled, false)
+
+  t.end()
+})
diff --git a/test/unit/feature_flag.test.js b/test/unit/feature_flag.test.js
@@ -34,8 +34,7 @@ const used = [
   'certificate_bundle',
   'unresolved_promise_cleanup',
   'undici_instrumentation',
-  'undici_async_tracking',
-  'openai_instrumentation'
+  'undici_async_tracking'
 ]
 
 tap.test('feature flags', (t) => {