dd-trace 6.10.0 → 6.12.0

package/packages/dd-trace/src/aiguard/sdk.js

@@ -1,90 +1,18 @@
 'use strict'
 
-const rfdc = require('../../../../vendor/dist/rfdc')({ proto: false, circles: false })
-const { HTTP_CLIENT_IP, NETWORK_CLIENT_IP, HTTP_USERAGENT } = require('../../../../ext/tags')
-const { USER_ID, USER_SESSION_ID } = require('../appsec/addresses')
-const { getActiveRequest } = require('../appsec/store')
 const log = require('../log')
-const { extractIp } = require('../plugins/util/ip_extractor')
-const telemetryMetrics = require('../telemetry/metrics')
-const tracerVersion = require('../../../../package.json').version
-const { keepTrace } = require('../priority_sampler')
-const { AI_GUARD } = require('../standalone/product')
+const AIGuardClient = require('./client')
+const { createEvaluationOutcome, EvaluationReporter } = require('./evaluation')
+const { AIGuardAbortError } = require('./errors')
 const NoopAIGuard = require('./noop')
-const executeRequest = require('./client')
 const TAGS = require('./tags')
 
-const aiguardMetrics = telemetryMetrics.manager.namespace('ai_guard')
-
-const ALLOW = 'ALLOW'
-
-// Tags from the service entry span that must be mirrored onto every AI Guard span
-// so anomaly detection pipelines can process each span independently.
-const SERVICE_ENTRY_TAG_MAPPINGS = [
-  [HTTP_USERAGENT, TAGS.HTTP_USERAGENT_TAG_KEY],
-  [HTTP_CLIENT_IP, TAGS.HTTP_CLIENT_IP_TAG_KEY],
-  [NETWORK_CLIENT_IP, TAGS.NETWORK_CLIENT_IP_TAG_KEY],
-  [USER_ID, TAGS.USR_ID_TAG_KEY],
-  [USER_SESSION_ID, TAGS.USR_SESSION_ID_TAG_KEY],
-]
-
-/**
- * Reports a telemetry error
- *
- * @param {string} errorType - The error type constant (client_error, bad_status, bad_response)
- * @param {{ source: string, integration: string }} telemetryTags - Source and integration tags
- */
-function reportTelemetryError (errorType, telemetryTags) {
-  aiguardMetrics.count(TAGS.TELEMETRY_REQUESTS, { error: true, ...telemetryTags }).inc(1)
-  aiguardMetrics.count(TAGS.TELEMETRY_ERROR, { type: errorType, ...telemetryTags }).inc(1)
-}
-
-class AIGuardAbortError extends Error {
-  constructor (reason, tags, tagProbs, sds) {
-    super(reason)
-    this.name = 'AIGuardAbortError'
-    this.reason = reason
-    this.tags = tags
-    this.tagProbabilities = tagProbs
-    this.sds = sds || []
-  }
-}
-
-class AIGuardClientError extends Error {
-  constructor (message, opts = {}) {
-    super(message)
-    this.name = 'AIGuardClientError'
-    if (opts.errors) {
-      this.errors = opts.errors
-    }
-    if (opts.cause) {
-      this.cause = opts.cause
-    }
-  }
-}
-
-/**
- * Resolves the AI Guard host for a given Datadog site. Sites with a single subdomain level
- * (e.g. `datadoghq.com`, `ddog-gov.com`) are served from the `app.` subdomain, while regional
- * sites (e.g. `us3.datadoghq.com`, `ap1.datadoghq.com`) are used as-is.
- *
- * @param {string} site - Datadog site (e.g. `datadoghq.com`, `us3.datadoghq.com`)
- * @returns {string} The host to use for the AI Guard endpoint
- */
-function aiGuardHost (site) {
-  return site.split('.').length === 2 ? `app.${site}` : site
-}
-
 class AIGuard extends NoopAIGuard {
   #initialized
   #tracer
-  #headers
-  #evaluateUrl
-  #timeout
-  #maxMessagesLength
-  #maxContentSize
+  #client
+  #reporter
   #meta
-  #config
 
   /**
    * @param {import('../tracer')} tracer - Tracer instance
@@ -99,223 +27,39 @@ class AIGuard extends NoopAIGuard {
       return
     }
     this.#tracer = tracer
-    this.#headers = {
-      'DD-API-KEY': config.DD_API_KEY,
-      'DD-APPLICATION-KEY': config.DD_APP_KEY,
-      'DD-AI-GUARD-VERSION': tracerVersion,
-      'DD-AI-GUARD-SOURCE': 'SDK',
-      'DD-AI-GUARD-LANGUAGE': 'nodejs',
-    }
-    const endpoint = config.experimental.aiguard.endpoint || `https://${aiGuardHost(config.site)}/api/v2/ai-guard`
-    this.#evaluateUrl = `${endpoint}/evaluate`
-    this.#timeout = config.experimental.aiguard.timeout
-    this.#maxMessagesLength = config.experimental.aiguard.maxMessagesLength
-    this.#maxContentSize = config.experimental.aiguard.maxContentSize
+    this.#client = new AIGuardClient(config)
+    this.#reporter = new EvaluationReporter(config)
     this.#meta = { service: config.service, env: config.env }
-    this.#config = config
     this.#initialized = true
   }
 
-  /**
-   * Returns a safe copy of the messages to be serialized into the meta struct.
-   *
-   * - Clones each message so callers cannot mutate the data set in the meta struct.
-   * - Truncates the list of messages and `content` fields emitting metrics accordingly.
-   *
-   * @param {import('../../../../index').aiguard.Message[]} messages
-   * @param {{ source: string, integration: string }} telemetryTags
-   */
-  #buildMessagesForMetaStruct (messages, telemetryTags) {
-    const size = Math.min(messages.length, this.#maxMessagesLength)
-    if (messages.length > size) {
-      aiguardMetrics.count(TAGS.TELEMETRY_TRUNCATED, { type: 'messages', ...telemetryTags }).inc(1)
-    }
-    const result = []
-    let contentTruncated = false
-    for (let i = messages.length - size; i < messages.length; i++) {
-      const message = rfdc(messages[i])
-      if (message.content?.length > this.#maxContentSize) {
-        contentTruncated = true
-        message.content = message.content.slice(0, this.#maxContentSize)
-      }
-      result.push(message)
-    }
-    if (contentTruncated) {
-      aiguardMetrics.count(TAGS.TELEMETRY_TRUNCATED, { type: 'content', ...telemetryTags }).inc(1)
-    }
-    return result
-  }
-
-  #isToolCall (message) {
-    return message.tool_calls || message.tool_call_id
-  }
-
-  #getToolName (message, history) {
-    // 1. assistant message with tool calls
-    if (message.tool_calls) {
-      const names = message.tool_calls.map((tool) => tool.function.name)
-      return names.length === 0 ? null : names.join(',')
-    }
-    // 2. assistant message with tool output (search the linked tool call in reverse order)
-    const id = message.tool_call_id
-    for (let i = history.length - 2; i >= 0; i--) {
-      const item = history[i]
-      if (item.tool_calls) {
-        for (const toolCall of item.tool_calls) {
-          if (toolCall.id === id) {
-            return toolCall.function.name
-          }
-        }
-      }
-    }
-    return null
-  }
-
-  #setRootSpanClientIpTags (rootSpan) {
-    if (!rootSpan) return
-
-    const currentTags = rootSpan.context().getTags()
-    const needsHttpClientIp = !Object.hasOwn(currentTags, HTTP_CLIENT_IP)
-    const needsNetworkClientIp = !Object.hasOwn(currentTags, NETWORK_CLIENT_IP)
-
-    if (!needsHttpClientIp && !needsNetworkClientIp) return
-
-    const req = getActiveRequest()
-
-    if (!req) return
-
-    const newTags = {}
-
-    if (needsHttpClientIp) {
-      const clientIp = extractIp(this.#config, req)
-
-      if (clientIp) {
-        newTags[HTTP_CLIENT_IP] = clientIp
-      }
-    }
-
-    if (needsNetworkClientIp) {
-      const networkClientIp = req.socket?.remoteAddress
-
-      if (networkClientIp) {
-        newTags[NETWORK_CLIENT_IP] = networkClientIp
-      }
-    }
-
-    if (Object.keys(newTags).length > 0) {
-      rootSpan.addTags(newTags)
-    }
-  }
-
-  /**
-   * Copies service entry span tags needed by anomaly detection to the AI Guard span.
-   *
-   * @param {import('../opentracing/span')} guardSpan
-   * @param {import('../opentracing/span')} rootSpan
-   */
-  #copyServiceEntryTagsToGuardSpan (guardSpan, rootSpan) {
-    const rootTags = rootSpan.context().getTags()
-    for (const [sourceTag, destTag] of SERVICE_ENTRY_TAG_MAPPINGS) {
-      const value = rootTags[sourceTag]
-      if (value !== undefined && value !== null) {
-        guardSpan.setTag(destTag, value)
-      }
-    }
-  }
-
   evaluate (messages, opts) {
     if (!this.#initialized) {
       return super.evaluate(messages, opts)
     }
     const { block = true, source = TAGS.SOURCE_SDK, integration = TAGS.INTEGRATION_NONE, childOf } = opts ?? {}
-    const telemetryTags = { source, integration }
     // Only pass `childOf` when truthy so `tracer.trace`'s default (`scope().active()`)
     // still applies for SDK callers that don't supply an explicit parent.
     const traceOpts = childOf ? { childOf } : {}
     return this.#tracer.trace(TAGS.RESOURCE, traceOpts, async (span) => {
-      const last = messages.at(-1)
-      const target = this.#isToolCall(last) ? 'tool' : 'prompt'
-      span.setTag(TAGS.TARGET_TAG_KEY, target)
-      if (target === 'tool') {
-        const name = this.#getToolName(last, messages)
-        if (name) {
-          span.setTag(TAGS.TOOL_NAME_TAG_KEY, name)
-        }
-      }
-      const metaStruct = {
-        messages: this.#buildMessagesForMetaStruct(messages, telemetryTags),
-      }
-      span.meta_struct = {
-        [TAGS.META_STRUCT_KEY]: metaStruct,
-      }
-      const rootSpan = span.context()?._trace?.started?.[0]
-      if (rootSpan) {
-        this.#setRootSpanClientIpTags(rootSpan)
-        this.#copyServiceEntryTagsToGuardSpan(span, rootSpan)
-        // keepTrace must be called before executeRequest so the sampling decision
-        // is propagated correctly to outgoing HTTP client calls.
-        keepTrace(rootSpan, AI_GUARD)
-        rootSpan.setTag(TAGS.EVENT_TAG_KEY, 'true')
-      }
-      let response
+      const report = this.#reporter.start(span, messages, { source, integration })
+      let evaluation
       try {
-        const payload = {
-          data: {
-            attributes: {
-              messages,
-              meta: this.#meta,
-            },
-          },
-        }
-        response = await executeRequest(
-          payload,
-          { url: this.#evaluateUrl, headers: this.#headers, timeout: this.#timeout })
-      } catch (e) {
-        reportTelemetryError(TAGS.ERROR_TYPE_CLIENT, telemetryTags)
-        throw new AIGuardClientError(`Unexpected error calling AI Guard service: ${e.message}`, { cause: e })
-      }
-      if (response.status !== 200) {
-        reportTelemetryError(TAGS.ERROR_TYPE_STATUS, telemetryTags)
-        throw new AIGuardClientError(
-          `AI Guard service call failed, status ${response.status}`,
-          { errors: response.body?.errors })
+        evaluation = await this.#client.evaluate(messages, this.#meta)
+      } catch (error) {
+        this.#reporter.fail(report, error.telemetryType ?? TAGS.ERROR_TYPE_CLIENT)
+        throw error
       }
-      const attr = response.body?.data?.attributes
-      if (!attr?.action) {
-        reportTelemetryError(TAGS.ERROR_TYPE_RESPONSE, telemetryTags)
-        throw new AIGuardClientError(`AI Guard service returned unexpected response : ${response.body}`)
-      }
-      const action = attr.action
-      const reason = attr.reason
-      const tags = attr.tags ?? []
-      if (tags.length > 0) {
-        metaStruct.attack_categories = tags
-      }
-      const sdsFindings = attr.sds_findings ?? []
-      if (sdsFindings.length > 0) {
-        metaStruct.sds = sdsFindings
-      }
-      const tagProbabilities = attr.tag_probs ?? {}
-      if (attr.tag_probs) {
-        metaStruct.tag_probs = tagProbabilities
-      }
-      const blockingEnabled = attr.is_blocking_enabled ?? false
-      const shouldBlock = block && blockingEnabled && action !== ALLOW
-      aiguardMetrics.count(TAGS.TELEMETRY_REQUESTS, {
-        action,
-        error: false,
-        block: shouldBlock,
-        ...telemetryTags,
-      }).inc(1)
-      span.setTag(TAGS.ACTION_TAG_KEY, action)
-      if (reason) {
-        span.setTag(TAGS.REASON_TAG_KEY, reason)
-      }
-      if (shouldBlock) {
-        span.setTag(TAGS.BLOCKED_TAG_KEY, 'true')
-        throw new AIGuardAbortError(reason, tags, tagProbabilities, sdsFindings)
+
+      const outcome = createEvaluationOutcome(evaluation, block)
+      this.#reporter.finish(report, outcome)
+
+      if (outcome.shouldBlock) {
+        const { reason, tags, tagProbabilities, sds } = outcome.result
+        throw new AIGuardAbortError(reason, tags, tagProbabilities, sds)
       }
-      return { action, reason, tags, tagProbabilities, sds: sdsFindings }
+
+      return outcome.result
     })
   }
 }

package/packages/dd-trace/src/appsec/iast/taint-tracking/rewriter.js

@@ -97,15 +97,14 @@ function getPrepareStackTraceAccessor () {
 
 function getCompileMethodFn (compileMethod) {
   let delegate = function (content, filename) {
+    if (isDdTrace(filename) || !isPrivateModule(filename) || !config.iast?.enabled) {
+      return compileMethod.apply(this, [content, filename])
+    }
+
+    // TODO when we have CJS support for orchestrion and taint-tracking, add
+    // them here as appropriate
+    let rewrittenContent
     try {
-      if (isDdTrace(filename)) {
-        return compileMethod.apply(this, [content, filename])
-      }
-      if (!isPrivateModule(filename) || !config.iast?.enabled) {
-        return compileMethod.apply(this, [content, filename])
-      }
-      // TODO when we have CJS support for orchestrion and taint-tracking, add
-      // them here as appropriate
       const rewritten = rewriter.rewrite(content, filename, ['iast'])
 
       incrementTelemetryIfNeeded(rewritten.metrics)
@@ -114,13 +113,11 @@ function getCompileMethodFn (compileMethod) {
         hardcodedSecretCh.publish(rewritten.literalsResult)
       }
 
-      if (rewritten?.content) {
-        return compileMethod.apply(this, [rewritten.content, filename])
-      }
+      rewrittenContent = rewritten?.content
     } catch (e) {
       log.error('Error rewriting file %s', filename, e)
     }
-    return compileMethod.apply(this, [content, filename])
+    return compileMethod.apply(this, [rewrittenContent || content, filename])
   }
 
   const shim = function (...args) {

package/packages/dd-trace/src/appsec/reporter.js

@@ -15,6 +15,7 @@ const {
   incrementWafUpdatesMetric,
   incrementWafConfigErrorsMetric,
   incrementWafRequestsMetric,
+  incrementRequestDurationMetrics,
   updateWafRequestsMetricTags,
   updateRaspRequestsMetricTags,
   updateRaspRuleSkippedMetricTags,
@@ -608,6 +609,7 @@ function finishRequest (req, res, storedResponseHeaders, requestBody, rootSpan)
 
   if (!req) return
 
+  incrementRequestDurationMetrics(req)
   incrementWafRequestsMetric(req)
 
   const tags = rootSpan.context().getTags()

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

@@ -12,6 +12,7 @@ const {
   trackRaspMetrics,
   trackRaspRuleMatch,
   trackRaspRuleSkipped,
+  incrementRaspDurationMetrics,
 } = require('./rasp')
 const {
   addWafRequestMetrics,
@@ -20,6 +21,7 @@ const {
   incrementWafUpdates,
   incrementWafConfigErrors,
   incrementWafRequests,
+  incrementWafDurationMetrics,
 } = require('./waf')
 
 const metricsStoreMap = new WeakMap()
@@ -142,6 +144,16 @@ function incrementWafRequestsMetric (req) {
   metricsStoreMap.delete(req)
 }
 
+function incrementRequestDurationMetrics (req) {
+  if (!req || !enabled) return
+
+  const store = getStore(req)
+  const requestMetrics = store[DD_TELEMETRY_REQUEST_METRICS]
+
+  incrementWafDurationMetrics(requestMetrics)
+  incrementRaspDurationMetrics(requestMetrics)
+}
+
 function incrementMissingUserLoginMetric (framework, eventType) {
   if (!enabled) return
 
@@ -199,6 +211,7 @@ module.exports = {
   incrementWafUpdatesMetric,
   incrementWafConfigErrorsMetric,
   incrementWafRequestsMetric,
+  incrementRequestDurationMetrics,
   incrementMissingUserLoginMetric,
   incrementMissingUserIdMetric,
   incrementSdkEventMetric,

package/packages/dd-trace/src/appsec/telemetry/rasp.js

@@ -77,6 +77,21 @@ function trackRaspRuleMatch (store, raspRule, blockTriggered, blocked) {
   appsecMetrics.count('rasp.rule.match', tags).inc(1)
 }
 
+function incrementRaspDurationMetrics (requestMetrics) {
+  const { raspDuration, raspDurationExt, wafVersion, rulesVersion } = requestMetrics
+  if (!raspDuration && !raspDurationExt) return
+
+  const versionsTags = getVersionsTags(wafVersion, rulesVersion)
+
+  if (raspDuration) {
+    appsecMetrics.distribution('rasp.duration', versionsTags).track(raspDuration)
+  }
+
+  if (raspDurationExt) {
+    appsecMetrics.distribution('rasp.duration_ext', versionsTags).track(raspDurationExt)
+  }
+}
+
 function trackRaspRuleSkipped (raspRule, reason) {
   const tags = { reason, rule_type: raspRule.type }
 
@@ -100,4 +115,5 @@ module.exports = {
   trackRaspMetrics,
   trackRaspRuleMatch,
   trackRaspRuleSkipped,
+  incrementRaspDurationMetrics,
 }

package/packages/dd-trace/src/appsec/telemetry/waf.js

@@ -34,6 +34,14 @@ function addWafRequestMetrics (store, { duration, durationExt, wafTimeout, error
 function trackWafMetrics (store, metrics) {
   const versionsTags = getVersionsTags(metrics.wafVersion, metrics.rulesVersion)
 
+  const requestMetrics = store[DD_TELEMETRY_REQUEST_METRICS]
+  if (metrics.wafVersion) {
+    requestMetrics.wafVersion = metrics.wafVersion
+  }
+  if (metrics.rulesVersion) {
+    requestMetrics.rulesVersion = metrics.rulesVersion
+  }
+
   const metricTags = getOrCreateMetricTags(store, versionsTags)
 
   if (metrics.blockFailed) {
@@ -118,6 +126,21 @@ function incrementWafRequests (store) {
   }
 }
 
+function incrementWafDurationMetrics (requestMetrics) {
+  const { duration, durationExt, wafVersion, rulesVersion } = requestMetrics
+  if (!duration && !durationExt) return
+
+  const versionsTags = getVersionsTags(wafVersion, rulesVersion)
+
+  if (duration) {
+    appsecMetrics.distribution('waf.duration', versionsTags).track(duration)
+  }
+
+  if (durationExt) {
+    appsecMetrics.distribution('waf.duration_ext', versionsTags).track(durationExt)
+  }
+}
+
 function incrementTruncatedMetrics (metrics, truncationReason) {
   const truncationTags = { truncation_reason: truncationReason }
   appsecMetrics.count('waf.input_truncated', truncationTags).inc(1)
@@ -140,4 +163,5 @@ module.exports = {
   incrementWafUpdates,
   incrementWafConfigErrors,
   incrementWafRequests,
+  incrementWafDurationMetrics,
 }