[Appsec] AAP Requirements - Activation Origin (#6896)

* Update origin for appsec.enabled

* Revert "Add appsec.enabled origin gauge metric (#5794)"

This reverts commit c21e73b.

* Remove telemetry test

* New config singleton

* Fix linting

* Fix config + teset

* Fix config in test

* Refactor

Author: CarlesDD

packages/dd-trace/src/appsec/telemetry/index.js

@@ -16,47 +16,17 @@ const {
   incrementWafConfigErrors,
   incrementWafRequests
 } = require('./waf')
-const telemetryMetrics = require('../../telemetry/metrics')
 
 const metricsStoreMap = new WeakMap()
 
-const appsecMetrics = telemetryMetrics.manager.namespace('appsec')
-
 let enabled = false
-let interval
-const SUPPORTED_ORIGINS = new Set(['env_var', 'code', 'remote_config', 'unknown'])
 
 function enable (config) {
-  const telemetryConfig = config.telemetry
-  enabled = telemetryConfig?.enabled && telemetryConfig.metrics
-
-  if (enabled) {
-    let origin = 'remote_config'
-
-    if (config.appsec.enabled) {
-      origin = config.getOrigin('appsec.enabled')
-
-      if (!SUPPORTED_ORIGINS.has(origin)) {
-        origin = 'unknown'
-      }
-    }
-
-    const gauge = appsecMetrics.gauge('enabled', { origin })
-    gauge.track()
-
-    interval = setInterval(() => {
-      gauge.track()
-    }, telemetryConfig.heartbeatInterval)
-    interval.unref?.()
-  }
+  enabled = config.telemetry?.enabled && config.telemetry?.metrics
 }
 
 function disable () {
   enabled = false
-  if (interval) {
-    clearInterval(interval)
-    interval = undefined
-  }
 }
 
 function newStore () {

packages/dd-trace/src/remote_config/index.js

@@ -6,6 +6,7 @@ const RemoteConfigManager = require('./manager')
 const RemoteConfigCapabilities = require('./capabilities')
 const { setCollectionMode } = require('../appsec/user_tracking')
 const log = require('../log')
+const { updateConfig } = require('../telemetry')
 
 let rc
 
@@ -62,7 +63,8 @@ function enable (config, appsec) {
 
 function enableOrDisableAppsec (action, rcConfig, config, appsec) {
   if (typeof rcConfig.asm?.enabled === 'boolean') {
-    const shouldEnable = action === 'apply' || action === 'modify'
+    const isRemoteConfigControlling = action === 'apply' || action === 'modify'
+    const shouldEnable = isRemoteConfigControlling
       ? rcConfig.asm.enabled // take control
       : config.appsec.enabled // give back control to local config
 
@@ -71,6 +73,14 @@ function enableOrDisableAppsec (action, rcConfig, config, appsec) {
     } else {
       appsec.disable()
     }
+
+    updateConfig([
+      {
+        name: 'appsec.enabled',
+        origin: isRemoteConfigControlling ? 'remote_config' : config.getOrigin('appsec.enabled'),
+        value: shouldEnable
+      }
+    ], config)
   }
 }
 

packages/dd-trace/test/appsec/index.spec.js

@@ -1276,9 +1276,8 @@ describe('AppSec Index', function () {
 
       const metrics = appsecNamespace.metrics.toJSON()
 
-      expect(metrics.series.length).to.equal(2)
-      expect(metrics.series[0].metric).to.equal('enabled')
-      expect(metrics.series[1].metric).to.equal('waf.init')
+      expect(metrics.series.length).to.equal(1)
+      expect(metrics.series[0].metric).to.equal('waf.init')
     })
 
     it('should not increment waf.init metric if metrics are not enabled', () => {

packages/dd-trace/test/appsec/telemetry/index.spec.js

@@ -218,13 +218,13 @@ describe('Appsec Waf Telemetry metrics', () => {
         appsecTelemetry.incrementWafInitMetric(wafVersion, rulesVersion, true)
 
         const { metrics } = appsecNamespace.toJSON()
-        expect(metrics.series.length).to.be.eq(2)
-        expect(metrics.series[1].metric).to.be.eq('waf.init')
-        expect(metrics.series[1].points.length).to.be.eq(1)
-        expect(metrics.series[1].points[0][1]).to.be.eq(3)
-        expect(metrics.series[1].tags).to.include('waf_version:0.0.1')
-        expect(metrics.series[1].tags).to.include('event_rules_version:0.0.2')
-        expect(metrics.series[1].tags).to.include('success:true')
+        expect(metrics.series.length).to.be.eq(1)
+        expect(metrics.series[0].metric).to.be.eq('waf.init')
+        expect(metrics.series[0].points.length).to.be.eq(1)
+        expect(metrics.series[0].points[0][1]).to.be.eq(3)
+        expect(metrics.series[0].tags).to.include('waf_version:0.0.1')
+        expect(metrics.series[0].tags).to.include('event_rules_version:0.0.2')
+        expect(metrics.series[0].tags).to.include('success:true')
       })
 
       it('should increment waf.init and waf.config_errors on failed init', () => {
@@ -233,16 +233,16 @@ describe('Appsec Waf Telemetry metrics', () => {
         appsecTelemetry.incrementWafInitMetric(wafVersion, rulesVersion, false)
 
         const { metrics } = appsecNamespace.toJSON()
-        expect(metrics.series.length).to.be.eq(3)
-        expect(metrics.series[1].metric).to.be.eq('waf.init')
+        expect(metrics.series.length).to.be.eq(2)
+        expect(metrics.series[0].metric).to.be.eq('waf.init')
+        expect(metrics.series[0].tags).to.include('waf_version:0.0.1')
+        expect(metrics.series[0].tags).to.include('event_rules_version:0.0.2')
+        expect(metrics.series[0].tags).to.include('success:false')
+
+        expect(metrics.series[1].metric).to.be.eq('waf.config_errors')
         expect(metrics.series[1].tags).to.include('waf_version:0.0.1')
         expect(metrics.series[1].tags).to.include('event_rules_version:0.0.2')
-        expect(metrics.series[1].tags).to.include('success:false')
-
-        expect(metrics.series[2].metric).to.be.eq('waf.config_errors')
-        expect(metrics.series[2].tags).to.include('waf_version:0.0.1')
-        expect(metrics.series[2].tags).to.include('event_rules_version:0.0.2')
-        expect(metrics.series[2].tags).to.include('action:init')
+        expect(metrics.series[1].tags).to.include('action:init')
       })
     })
 
@@ -266,13 +266,13 @@ describe('Appsec Waf Telemetry metrics', () => {
         appsecTelemetry.incrementWafUpdatesMetric(wafVersion, rulesVersion, true)
 
         const { metrics } = appsecNamespace.toJSON()
-        expect(metrics.series.length).to.be.eq(2)
-        expect(metrics.series[1].metric).to.be.eq('waf.updates')
-        expect(metrics.series[1].points.length).to.be.eq(1)
-        expect(metrics.series[1].points[0][1]).to.be.eq(3)
-        expect(metrics.series[1].tags).to.include('waf_version:0.0.1')
-        expect(metrics.series[1].tags).to.include('event_rules_version:0.0.2')
-        expect(metrics.series[1].tags).to.include('success:true')
+        expect(metrics.series.length).to.be.eq(1)
+        expect(metrics.series[0].metric).to.be.eq('waf.updates')
+        expect(metrics.series[0].points.length).to.be.eq(1)
+        expect(metrics.series[0].points[0][1]).to.be.eq(3)
+        expect(metrics.series[0].tags).to.include('waf_version:0.0.1')
+        expect(metrics.series[0].tags).to.include('event_rules_version:0.0.2')
+        expect(metrics.series[0].tags).to.include('success:true')
       })
     })
 
@@ -296,13 +296,13 @@ describe('Appsec Waf Telemetry metrics', () => {
         appsecTelemetry.incrementWafConfigErrorsMetric(wafVersion, rulesVersion, true)
 
         const { metrics } = appsecNamespace.toJSON()
-        expect(metrics.series.length).to.be.eq(2)
-        expect(metrics.series[1].metric).to.be.eq('waf.config_errors')
-        expect(metrics.series[1].points.length).to.be.eq(1)
-        expect(metrics.series[1].points[0][1]).to.be.eq(3)
-        expect(metrics.series[1].tags).to.include('waf_version:0.0.1')
-        expect(metrics.series[1].tags).to.include('event_rules_version:0.0.2')
-        expect(metrics.series[1].tags).to.include('action:update')
+        expect(metrics.series.length).to.be.eq(1)
+        expect(metrics.series[0].metric).to.be.eq('waf.config_errors')
+        expect(metrics.series[0].points.length).to.be.eq(1)
+        expect(metrics.series[0].points[0][1]).to.be.eq(3)
+        expect(metrics.series[0].tags).to.include('waf_version:0.0.1')
+        expect(metrics.series[0].tags).to.include('event_rules_version:0.0.2')
+        expect(metrics.series[0].tags).to.include('action:update')
       })
     })