dd-trace 5.41.1 → 5.42.0

package/packages/datadog-plugin-google-cloud-vertexai/src/index.js

@@ -0,0 +1,195 @@
+'use strict'
+
+const { MEASURED } = require('../../../ext/tags')
+const { storage } = require('../../datadog-core')
+const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
+const makeUtilities = require('../../dd-trace/src/plugins/util/llm')
+
+class GoogleCloudVertexAIPlugin extends TracingPlugin {
+  static get id () { return 'google-cloud-vertexai' }
+  static get prefix () {
+    return 'tracing:apm:vertexai:request'
+  }
+
+  constructor () {
+    super(...arguments)
+
+    Object.assign(this, makeUtilities('vertexai', this._tracerConfig))
+  }
+
+  bindStart (ctx) {
+    const { instance, request, resource, stream } = ctx
+
+    const tags = this.tagRequest(request, instance, stream)
+
+    const span = this.startSpan('vertexai.request', {
+      service: this.config.service,
+      resource,
+      kind: 'client',
+      meta: {
+        [MEASURED]: 1,
+        ...tags
+      }
+    }, false)
+
+    const store = storage('legacy').getStore() || {}
+    ctx.currentStore = { ...store, span }
+
+    return ctx.currentStore
+  }
+
+  asyncEnd (ctx) {
+    const span = ctx.currentStore?.span
+    if (!span) return
+
+    const { result } = ctx
+
+    const response = result?.response
+    if (response) {
+      const tags = this.tagResponse(response)
+      span.addTags(tags)
+    }
+
+    span.finish()
+  }
+
+  tagRequest (request, instance, stream) {
+    const model = extractModel(instance)
+    const tags = {
+      'vertexai.request.model': model
+    }
+
+    const history = instance.historyInternal
+    let contents = typeof request === 'string' || Array.isArray(request) ? request : request.contents
+    if (history) {
+      contents = [...history, ...(Array.isArray(contents) ? contents : [contents])]
+    }
+
+    const generationConfig = instance.generationConfig || {}
+    for (const key of Object.keys(generationConfig)) {
+      const transformedKey = key.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()
+      tags[`vertexai.request.generation_config.${transformedKey}`] = JSON.stringify(generationConfig[key])
+    }
+
+    if (stream) {
+      tags['vertexai.request.stream'] = true
+    }
+
+    if (!this.isPromptCompletionSampled()) return tags
+
+    const systemInstructions = extractSystemInstructions(instance)
+
+    for (const [idx, systemInstruction] of systemInstructions.entries()) {
+      tags[`vertexai.request.system_instruction.${idx}.text`] = systemInstruction
+    }
+
+    if (typeof contents === 'string') {
+      tags['vertexai.request.contents.0.text'] = contents
+      return tags
+    }
+
+    for (const [contentIdx, content] of contents.entries()) {
+      this.tagRequestContent(tags, content, contentIdx)
+    }
+
+    return tags
+  }
+
+  tagRequestPart (part, tags, partIdx, contentIdx) {
+    tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.text`] = this.normalize(part.text)
+
+    const functionCall = part.functionCall
+    const functionResponse = part.functionResponse
+
+    if (functionCall) {
+      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_call.name`] = functionCall.name
+      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_call.args`] =
+              this.normalize(JSON.stringify(functionCall.args))
+    }
+    if (functionResponse) {
+      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_response.name`] =
+              functionResponse.name
+      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_response.response`] =
+              this.normalize(JSON.stringify(functionResponse.response))
+    }
+  }
+
+  tagRequestContent (tags, content, contentIdx) {
+    if (typeof content === 'string') {
+      tags[`vertexai.request.contents.${contentIdx}.text`] = this.normalize(content)
+      return
+    }
+
+    if (content.text || content.functionCall || content.functionResponse) {
+      this.tagRequestPart(content, tags, 0, contentIdx)
+      return
+    }
+
+    const { role, parts } = content
+    if (role) {
+      tags[`vertexai.request.contents.${contentIdx}.role`] = role
+    }
+
+    for (const [partIdx, part] of parts.entries()) {
+      this.tagRequestPart(part, tags, partIdx, contentIdx)
+    }
+  }
+
+  tagResponse (response) {
+    const tags = {}
+
+    const candidates = response.candidates
+    for (const [candidateIdx, candidate] of candidates.entries()) {
+      const finishReason = candidate.finishReason
+      if (finishReason) {
+        tags[`vertexai.response.candidates.${candidateIdx}.finish_reason`] = finishReason
+      }
+      const candidateContent = candidate.content
+      const role = candidateContent.role
+      tags[`vertexai.response.candidates.${candidateIdx}.content.role`] = role
+
+      if (!this.isPromptCompletionSampled()) continue
+
+      const parts = candidateContent.parts
+      for (const [partIdx, part] of parts.entries()) {
+        const text = part.text
+        tags[`vertexai.response.candidates.${candidateIdx}.content.parts.${partIdx}.text`] =
+          this.normalize(String(text))
+
+        const functionCall = part.functionCall
+        if (!functionCall) continue
+
+        tags[`vertexai.response.candidates.${candidateIdx}.content.parts.${partIdx}.function_call.name`] =
+          functionCall.name
+        tags[`vertexai.response.candidates.${candidateIdx}.content.parts.${partIdx}.function_call.args`] =
+          this.normalize(JSON.stringify(functionCall.args))
+      }
+    }
+
+    const tokenCounts = response.usageMetadata
+    if (tokenCounts) {
+      tags['vertexai.response.usage.prompt_tokens'] = tokenCounts.promptTokenCount
+      tags['vertexai.response.usage.completion_tokens'] = tokenCounts.candidatesTokenCount
+      tags['vertexai.response.usage.total_tokens'] = tokenCounts.totalTokenCount
+    }
+
+    return tags
+  }
+}
+
+function extractModel (instance) {
+  const model = instance.model || instance.resourcePath || instance.publisherModelEndpoint
+  return model?.split('/').pop()
+}
+
+function extractSystemInstructions (instance) {
+  // systemInstruction is either a string or a Content object
+  // Content objects have parts (Part[]) and a role
+  const systemInstruction = instance.systemInstruction
+  if (!systemInstruction) return []
+  if (typeof systemInstruction === 'string') return [systemInstruction]
+
+  return systemInstruction.parts?.map(part => part.text)
+}
+
+module.exports = GoogleCloudVertexAIPlugin

package/packages/datadog-plugin-jest/src/index.js

@@ -26,7 +26,8 @@ const {
   getFormattedError,
   TEST_RETRY_REASON,
   TEST_MANAGEMENT_ENABLED,
-  TEST_MANAGEMENT_IS_QUARANTINED
+  TEST_MANAGEMENT_IS_QUARANTINED,
+  TEST_MANAGEMENT_IS_DISABLED
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const id = require('../../dd-trace/src/id')
@@ -108,7 +109,7 @@ class JestPlugin extends CiPlugin {
       error,
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
-      isQuarantinedTestsEnabled,
+      isTestManagementTestsEnabled,
       onDone
     }) => {
       this.testSessionSpan.setTag(TEST_STATUS, status)
@@ -140,7 +141,7 @@ class JestPlugin extends CiPlugin {
       if (isEarlyFlakeDetectionFaulty) {
         this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ABORT_REASON, 'faulty')
       }
-      if (isQuarantinedTestsEnabled) {
+      if (isTestManagementTestsEnabled) {
         this.testSessionSpan.setTag(TEST_MANAGEMENT_ENABLED, 'true')
       }
 
@@ -150,7 +151,10 @@ class JestPlugin extends CiPlugin {
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
       finishAllTraceSpans(this.testSessionSpan)
 
-      this.telemetry.count(TELEMETRY_TEST_SESSION, { provider: this.ciProviderName })
+      this.telemetry.count(TELEMETRY_TEST_SESSION, {
+        provider: this.ciProviderName,
+        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+      })
 
       this.tracer._exporter.flush(() => {
         if (onDone) {
@@ -172,7 +176,7 @@ class JestPlugin extends CiPlugin {
         config._ddEarlyFlakeDetectionNumRetries = this.libraryConfig?.earlyFlakeDetectionNumRetries ?? 0
         config._ddRepositoryRoot = this.repositoryRoot
         config._ddIsFlakyTestRetriesEnabled = this.libraryConfig?.isFlakyTestRetriesEnabled ?? false
-        config._ddIsQuarantinedTestsEnabled = this.libraryConfig?.isQuarantinedTestsEnabled ?? false
+        config._ddIsTestManagementTestsEnabled = this.libraryConfig?.isTestManagementEnabled ?? false
         config._ddFlakyTestRetriesCount = this.libraryConfig?.flakyTestRetriesCount
         config._ddIsDiEnabled = this.libraryConfig?.isDiEnabled ?? false
         config._ddIsKnownTestsEnabled = this.libraryConfig?.isKnownTestsEnabled ?? false
@@ -377,9 +381,17 @@ class JestPlugin extends CiPlugin {
       }
     })
 
-    this.addSub('ci:jest:test:skip', (test) => {
+    this.addSub('ci:jest:test:skip', ({
+      test,
+      isDisabled
+    }) => {
       const span = this.startTestSpan(test)
       span.setTag(TEST_STATUS, 'skip')
+
+      if (isDisabled) {
+        span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
+      }
+
       span.finish()
     })
   }

package/packages/datadog-plugin-langchain/src/handlers/embedding.js

@@ -43,7 +43,10 @@ class LangChainEmbeddingHandler extends LangChainHandler {
   }
 
   extractApiKey (instance) {
-    const apiKey = instance.clientConfig?.apiKey
+    const apiKey =
+      instance.clientConfig?.apiKey ||
+      instance.apiKey ||
+      instance.client?.apiKey
     if (!apiKey || apiKey.length < 4) return ''
     return `...${apiKey.slice(-4)}`
   }

package/packages/datadog-plugin-mocha/src/index.js

@@ -33,7 +33,8 @@ const {
   TEST_BROWSER_DRIVER,
   TEST_RETRY_REASON,
   TEST_MANAGEMENT_ENABLED,
-  TEST_MANAGEMENT_IS_QUARANTINED
+  TEST_MANAGEMENT_IS_QUARANTINED,
+  TEST_MANAGEMENT_IS_DISABLED
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
@@ -311,7 +312,7 @@ class MochaPlugin extends CiPlugin {
       error,
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
-      isQuarantinedTestsEnabled,
+      isTestManagementEnabled,
       isParallel
     }) => {
       if (this.testSessionSpan) {
@@ -328,7 +329,7 @@ class MochaPlugin extends CiPlugin {
           this.testSessionSpan.setTag(MOCHA_IS_PARALLEL, 'true')
         }
 
-        if (isQuarantinedTestsEnabled) {
+        if (isTestManagementEnabled) {
           this.testSessionSpan.setTag(TEST_MANAGEMENT_ENABLED, 'true')
         }
 
@@ -359,7 +360,10 @@ class MochaPlugin extends CiPlugin {
         this.testSessionSpan.finish()
         this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
         finishAllTraceSpans(this.testSessionSpan)
-        this.telemetry.count(TELEMETRY_TEST_SESSION, { provider: this.ciProviderName })
+        this.telemetry.count(TELEMETRY_TEST_SESSION, {
+          provider: this.ciProviderName,
+          autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+        })
       }
       this.libraryConfig = null
       this.tracer._exporter.flush()
@@ -405,6 +409,7 @@ class MochaPlugin extends CiPlugin {
       isEfdRetry,
       testStartLine,
       isParallel,
+      isDisabled,
       isQuarantined
     } = testInfo
 
@@ -424,6 +429,10 @@ class MochaPlugin extends CiPlugin {
       extraTags[MOCHA_IS_PARALLEL] = 'true'
     }
 
+    if (isDisabled) {
+      extraTags[TEST_MANAGEMENT_IS_DISABLED] = 'true'
+    }
+
     if (isQuarantined) {
       extraTags[TEST_MANAGEMENT_IS_QUARANTINED] = 'true'
     }

package/packages/datadog-plugin-playwright/src/index.js

@@ -19,7 +19,8 @@ const {
   TEST_RETRY_REASON,
   TEST_MANAGEMENT_IS_QUARANTINED,
   TEST_MANAGEMENT_ENABLED,
-  TEST_BROWSER_NAME
+  TEST_BROWSER_NAME,
+  TEST_MANAGEMENT_IS_DISABLED
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT } = require('../../dd-trace/src/constants')
@@ -44,7 +45,7 @@ class PlaywrightPlugin extends CiPlugin {
     this.addSub('ci:playwright:session:finish', ({
       status,
       isEarlyFlakeDetectionEnabled,
-      isQuarantinedTestsEnabled,
+      isTestManagementTestsEnabled,
       onDone
     }) => {
       this.testModuleSpan.setTag(TEST_STATUS, status)
@@ -64,7 +65,7 @@ class PlaywrightPlugin extends CiPlugin {
         this.testSessionSpan.setTag('error', error)
       }
 
-      if (isQuarantinedTestsEnabled) {
+      if (isTestManagementTestsEnabled) {
         this.testSessionSpan.setTag(TEST_MANAGEMENT_ENABLED, 'true')
       }
 
@@ -73,7 +74,10 @@ class PlaywrightPlugin extends CiPlugin {
       this.testSessionSpan.finish()
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
       finishAllTraceSpans(this.testSessionSpan)
-      this.telemetry.count(TELEMETRY_TEST_SESSION, { provider: this.ciProviderName })
+      this.telemetry.count(TELEMETRY_TEST_SESSION, {
+        provider: this.ciProviderName,
+        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+      })
       appClosingTelemetry()
       this.tracer._exporter.flush(onDone)
       this.numFailedTests = 0
@@ -132,12 +136,22 @@ class PlaywrightPlugin extends CiPlugin {
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
     })
 
-    this.addSub('ci:playwright:test:start', ({ testName, testSuiteAbsolutePath, testSourceLine, browserName }) => {
+    this.addSub('ci:playwright:test:start', ({
+      testName,
+      testSuiteAbsolutePath,
+      testSourceLine,
+      browserName,
+      isDisabled
+    }) => {
       const store = storage('legacy').getStore()
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.rootDir)
       const testSourceFile = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
       const span = this.startTestSpan(testName, testSuite, testSourceFile, testSourceLine, browserName)
 
+      if (isDisabled) {
+        span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
+      }
+
       this.enter(span, store)
     })
     this.addSub('ci:playwright:test:finish', ({

package/packages/datadog-plugin-vitest/src/index.js

@@ -20,7 +20,10 @@ const {
   TEST_EARLY_FLAKE_ABORT_REASON,
   TEST_RETRY_REASON,
   TEST_MANAGEMENT_ENABLED,
-  TEST_MANAGEMENT_IS_QUARANTINED
+  TEST_MANAGEMENT_IS_QUARANTINED,
+  TEST_MANAGEMENT_IS_DISABLED,
+  DD_CAPABILITIES_EARLY_FLAKE_DETECTION,
+  DD_CAPABILITIES_AUTO_TEST_RETRIES
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
@@ -50,16 +53,16 @@ class VitestPlugin extends CiPlugin {
       onDone(!testsForThisTestSuite.includes(testName))
     })
 
-    this.addSub('ci:vitest:test:is-quarantined', ({ quarantinedTests, testSuiteAbsolutePath, testName, onDone }) => {
+    this.addSub('ci:vitest:test:is-disabled', ({ testManagementTests, testSuiteAbsolutePath, testName, onDone }) => {
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
-      const isQuarantined = quarantinedTests
-        ?.vitest
-        ?.suites
-        ?.[testSuite]
-        ?.tests
-        ?.[testName]
-        ?.properties
-        ?.quarantined
+      const { isDisabled } = this.getTestProperties(testManagementTests, testSuite, testName)
+
+      onDone(isDisabled ?? false)
+    })
+
+    this.addSub('ci:vitest:test:is-quarantined', ({ testManagementTests, testSuiteAbsolutePath, testName, onDone }) => {
+      const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+      const { isQuarantined } = this.getTestProperties(testManagementTests, testSuite, testName)
 
       onDone(isQuarantined ?? false)
     })
@@ -178,7 +181,7 @@ class VitestPlugin extends CiPlugin {
       }
     })
 
-    this.addSub('ci:vitest:test:skip', ({ testName, testSuiteAbsolutePath, isNew }) => {
+    this.addSub('ci:vitest:test:skip', ({ testName, testSuiteAbsolutePath, isNew, isDisabled }) => {
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
       const testSpan = this.startTestSpan(
         testName,
@@ -188,6 +191,7 @@ class VitestPlugin extends CiPlugin {
           [TEST_SOURCE_FILE]: testSuite,
           [TEST_SOURCE_START]: 1, // we can't get the proper start line in vitest
           [TEST_STATUS]: 'skip',
+          ...(isDisabled ? { [TEST_MANAGEMENT_IS_DISABLED]: 'true' } : {}),
           ...(isNew ? { [TEST_IS_NEW]: 'true' } : {})
         }
       )
@@ -197,7 +201,12 @@ class VitestPlugin extends CiPlugin {
       testSpan.finish()
     })
 
-    this.addSub('ci:vitest:test-suite:start', ({ testSuiteAbsolutePath, frameworkVersion }) => {
+    this.addSub('ci:vitest:test-suite:start', ({
+      testSuiteAbsolutePath,
+      frameworkVersion,
+      isFlakyTestRetriesEnabled,
+      isEarlyFlakeDetectionEnabled
+    }) => {
       this.command = process.env.DD_CIVISIBILITY_TEST_COMMAND
       this.frameworkVersion = frameworkVersion
       const testSessionSpanContext = this.tracer.extract('text_map', {
@@ -213,8 +222,13 @@ class VitestPlugin extends CiPlugin {
           [TEST_SESSION_NAME]: testSessionName
         }
       }
-      if (this.tracer._exporter.setMetadataTags) {
-        this.tracer._exporter.setMetadataTags(metadataTags)
+      if (this.tracer._exporter.addMetadataTags) {
+        metadataTags.test = {
+          ...metadataTags.test,
+          [DD_CAPABILITIES_EARLY_FLAKE_DETECTION]: isEarlyFlakeDetectionEnabled ? 'true' : 'false',
+          [DD_CAPABILITIES_AUTO_TEST_RETRIES]: isFlakyTestRetriesEnabled ? 'true' : 'false'
+        }
+        this.tracer._exporter.addMetadataTags(metadataTags)
       }
 
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
@@ -277,7 +291,7 @@ class VitestPlugin extends CiPlugin {
       testCodeCoverageLinesTotal,
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
-      isQuarantinedTestsEnabled,
+      isTestManagementTestsEnabled,
       onFinish
     }) => {
       this.testSessionSpan.setTag(TEST_STATUS, status)
@@ -296,7 +310,7 @@ class VitestPlugin extends CiPlugin {
       if (isEarlyFlakeDetectionFaulty) {
         this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ABORT_REASON, 'faulty')
       }
-      if (isQuarantinedTestsEnabled) {
+      if (isTestManagementTestsEnabled) {
         this.testSessionSpan.setTag(TEST_MANAGEMENT_ENABLED, 'true')
       }
       this.testModuleSpan.finish()
@@ -304,10 +318,20 @@ class VitestPlugin extends CiPlugin {
       this.testSessionSpan.finish()
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
       finishAllTraceSpans(this.testSessionSpan)
-      this.telemetry.count(TELEMETRY_TEST_SESSION, { provider: this.ciProviderName })
+      this.telemetry.count(TELEMETRY_TEST_SESSION, {
+        provider: this.ciProviderName,
+        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+      })
       this.tracer._exporter.flush(onFinish)
     })
   }
+
+  getTestProperties (testManagementTests, testSuite, testName) {
+    const { disabled: isDisabled, quarantined: isQuarantined } =
+      testManagementTests?.vitest?.suites?.[testSuite]?.tests?.[testName]?.properties || {}
+
+    return { isDisabled, isQuarantined }
+  }
 }
 
 module.exports = VitestPlugin

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

@@ -8,12 +8,16 @@ const { AUTO_REJECT, USER_REJECT } = require('../../../../ext/priority')
 const MAX_SIZE = 4096
 
 let enabled
+
+/**
+ * @type {TTLCache}
+ */
 let sampledRequests
 
 class NoopTTLCache {
   clear () { }
-  set (key) { return undefined }
-  has (key) { return false }
+  set (_key, _value) { return undefined }
+  has (_key) { return false }
 }
 
 function configure ({ apiSecurity }) {
@@ -48,7 +52,7 @@ function sampleRequest (req, res, force = false) {
   }
 
   if (force) {
-    sampledRequests.set(key)
+    sampledRequests.set(key, undefined)
   }
 
   return true

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

@@ -100,29 +100,36 @@ function getBlockingData (req, specificType, actionParameters) {
 }
 
 function block (req, res, rootSpan, abortController, actionParameters = defaultBlockingActionParameters) {
-  if (res.headersSent) {
-    log.warn('[ASM] Cannot send blocking response when headers have already been sent')
-    return
-  }
+  try {
+    if (res.headersSent) {
+      log.warn('[ASM] Cannot send blocking response when headers have already been sent')
 
-  const { body, headers, statusCode } = getBlockingData(req, null, actionParameters)
+      throw new Error('Headers have already been sent')
+    }
 
-  rootSpan.addTags({
-    'appsec.blocked': 'true'
-  })
+    const { body, headers, statusCode } = getBlockingData(req, null, actionParameters)
 
-  for (const headerName of res.getHeaderNames()) {
-    res.removeHeader(headerName)
-  }
+    for (const headerName of res.getHeaderNames()) {
+      res.removeHeader(headerName)
+    }
 
-  res.writeHead(statusCode, headers)
+    res.writeHead(statusCode, headers)
 
-  // this is needed to call the original end method, since express-session replaces it
-  res.constructor.prototype.end.call(res, body)
+    // this is needed to call the original end method, since express-session replaces it
+    res.constructor.prototype.end.call(res, body)
 
-  responseBlockedSet.add(res)
+    rootSpan.setTag('appsec.blocked', 'true')
 
-  abortController?.abort()
+    responseBlockedSet.add(res)
+    abortController?.abort()
+
+    return true
+  } catch (err) {
+    rootSpan?.setTag('_dd.appsec.block.failed', 1)
+    log.error('[ASM] Blocking error', err)
+
+    return false
+  }
 }
 
 function getBlockingAction (actions) {

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

@@ -7,6 +7,7 @@ const {
   getBlockingData,
   getBlockingAction
 } = require('./blocking')
+const log = require('../log')
 const waf = require('./waf')
 const addresses = require('./addresses')
 const web = require('../plugins/util/web')
@@ -94,14 +95,20 @@ function beforeWriteApolloGraphqlResponse ({ abortController, abortData }) {
     const rootSpan = web.root(req)
     if (!rootSpan) return
 
-    const blockingData = getBlockingData(req, specificBlockingTypes.GRAPHQL, requestData.wafAction)
-    abortData.statusCode = blockingData.statusCode
-    abortData.headers = blockingData.headers
-    abortData.message = blockingData.body
+    try {
+      const blockingData = getBlockingData(req, specificBlockingTypes.GRAPHQL, requestData.wafAction)
+      abortData.statusCode = blockingData.statusCode
+      abortData.headers = blockingData.headers
+      abortData.message = blockingData.body
 
-    rootSpan.setTag('appsec.blocked', 'true')
+      rootSpan.setTag('appsec.blocked', 'true')
 
-    abortController?.abort()
+      abortController?.abort()
+    } catch (err) {
+      rootSpan.setTag('_dd.appsec.block.failed', 1)
+
+      log.error('[ASM] Blocking error', err)
+    }
   }
 
   graphqlRequestData.delete(req)

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

@@ -49,7 +49,6 @@ function handleResult (actions, req, res, abortController, config) {
 
   const blockingAction = getBlockingAction(actions)
   if (blockingAction) {
-    const rootSpan = web.root(req)
     // Should block only in express
     if (rootSpan?.context()._name === 'express.request') {
       const abortError = new DatadogRaspAbortError(req, res, blockingAction)