fix errors and add tests

jandro996 · jandro996 · commit b4e85167cb76 · 2025-12-09T16:58:45.000+01:00
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java
@@ -486,7 +486,7 @@ private Flow.Action.RequestBlockingAction createBlockRequestAction(
           log.warn("Unknown content type: {}; using auto", contentType);
         }
         return new Flow.Action.RequestBlockingAction(
-            statusCode, blockingContentType, null, securityResponseId);
+            statusCode, blockingContentType, Collections.emptyMap(), securityResponseId);
       } catch (RuntimeException cce) {
         log.warn("Invalid blocking action data", cce);
         if (!isRasp) {
diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java
@@ -186,7 +186,7 @@ public boolean tryCommitBlockingResponse(
         return false;
       }
       return GrizzlyHttpBlockingHelper.block(
-          ctx, acceptHeader, statusCode, templateType, extraHeaders, segment);
+          ctx, acceptHeader, statusCode, templateType, extraHeaders, segment, securityResponseId);
     }
   }
 }
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java11/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java
@@ -54,7 +54,7 @@ public static boolean block(
         BlockingActionHelper.TemplateType type =
             BlockingActionHelper.determineTemplateType(bct, acceptHeader);
         putHeader(fields, "Content-type", BlockingActionHelper.getContentType(type));
-        byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+        byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
         putHeader(fields, "Content-length", Integer.toString(template.length));
 
         info = new MetaData.Response(request.getHttpVersion(), statusCode, fields, template.length);
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyOnCommitBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/src/main/java/datadog/trace/instrumentation/jetty904/JettyOnCommitBlockingHelper.java
@@ -56,7 +56,7 @@ public static boolean block(
         BlockingActionHelper.TemplateType type =
             BlockingActionHelper.determineTemplateType(bct, acceptHeader);
         fields.put("Content-type", BlockingActionHelper.getContentType(type));
-        byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+        byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
         fields.put("Content-length", Integer.toString(template.length));
 
         info =
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyOnCommitBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/src/main/java/datadog/trace/instrumentation/jetty93/JettyOnCommitBlockingHelper.java
@@ -55,7 +55,7 @@ public static boolean block(
         BlockingActionHelper.TemplateType type =
             BlockingActionHelper.determineTemplateType(bct, acceptHeader);
         fields.put("Content-type", BlockingActionHelper.getContentType(type));
-        byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+        byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
         fields.put("Content-length", Integer.toString(template.length));
 
         info = new MetaData.Response(request.getHttpVersion(), statusCode, fields, template.length);
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyOnCommitBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/src/main/java/datadog/trace/instrumentation/jetty9421/JettyOnCommitBlockingHelper.java
@@ -55,7 +55,7 @@ public static boolean block(
         BlockingActionHelper.TemplateType type =
             BlockingActionHelper.determineTemplateType(bct, acceptHeader);
         fields.put("Content-type", BlockingActionHelper.getContentType(type));
-        byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+        byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
         fields.put("Content-length", Integer.toString(template.length));
 
         info = new MetaData.Response(request.getHttpVersion(), statusCode, fields, template.length);
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyBlockingHelper.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyBlockingHelper.java
@@ -90,7 +90,7 @@ public static BlockingException syncBufferEnter(
       BlockingActionHelper.TemplateType type =
           BlockingActionHelper.determineTemplateType(
               bct, thiz.getRequest().getHeader("Accept").asString());
-      byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+      byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
       response.setHeader("Content-length", Integer.toString(template.length));
       response.setHeader("Content-type", BlockingActionHelper.getContentType(type));
       WsByteBufferImpl buffer = new WsByteBufferImpl(ByteBuffer.wrap(template));
diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyDecorator.java b/dd-java-agent/instrumentation/liberty/liberty-20.0/src/main/java/datadog/trace/instrumentation/liberty20/LibertyDecorator.java
@@ -193,7 +193,13 @@ public boolean tryCommitBlockingResponse(
         return false;
       }
       ServletBlockingHelper.commitBlockingResponse(
-          segment, request, (HttpServletResponse) response, statusCode, bct, extraHeaders);
+          segment,
+          request,
+          (HttpServletResponse) response,
+          statusCode,
+          bct,
+          extraHeaders,
+          securityResponseId);
 
       return true;
     }
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyBlockingHelper.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyBlockingHelper.java
@@ -90,7 +90,7 @@ public static BlockingException syncBufferEnter(
       BlockingActionHelper.TemplateType type =
           BlockingActionHelper.determineTemplateType(
               bct, thiz.getRequest().getHeader("Accept").asString());
-      byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+      byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
       response.setHeader("Content-length", Integer.toString(template.length));
       response.setHeader("Content-type", BlockingActionHelper.getContentType(type));
       WsByteBufferImpl buffer = new WsByteBufferImpl(ByteBuffer.wrap(template));
diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyDecorator.java b/dd-java-agent/instrumentation/liberty/liberty-23.0/src/main/java/datadog/trace/instrumentation/liberty23/LibertyDecorator.java
@@ -194,7 +194,13 @@ public boolean tryCommitBlockingResponse(
         return false;
       }
       JakartaServletBlockingHelper.commitBlockingResponse(
-          segment, request, (HttpServletResponse) response, statusCode, bct, extraHeaders);
+          segment,
+          request,
+          (HttpServletResponse) response,
+          statusCode,
+          bct,
+          extraHeaders,
+          securityResponseId);
 
       return true;
     }
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockingResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockingResponseHandler.java
@@ -27,6 +27,7 @@ public class BlockingResponseHandler extends SimpleChannelUpstreamHandler {
   private final int statusCode;
   private final BlockingContentType bct;
   private final Map<String, String> extraHeaders;
+  private final String securityResponseId;
 
   private static final Logger log = LoggerFactory.getLogger(BlockingResponseHandler.class);
   private static volatile boolean HAS_WARNED;
@@ -37,15 +38,22 @@ public BlockingResponseHandler(
       TraceSegment segment,
       int statusCode,
       BlockingContentType bct,
-      Map<String, String> extraHeaders) {
+      Map<String, String> extraHeaders,
+      String securityResponseId) {
     this.segment = segment;
     this.statusCode = statusCode;
     this.bct = bct;
     this.extraHeaders = extraHeaders;
+    this.securityResponseId = securityResponseId;
   }
 
   public BlockingResponseHandler(TraceSegment segment, Flow.Action.RequestBlockingAction rba) {
-    this(segment, rba.getStatusCode(), rba.getBlockingContentType(), rba.getExtraHeaders());
+    this(
+        segment,
+        rba.getStatusCode(),
+        rba.getBlockingContentType(),
+        rba.getExtraHeaders(),
+        rba.getSecurityResponseId());
   }
 
   @Override
@@ -117,7 +125,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Ex
       BlockingActionHelper.TemplateType type =
           BlockingActionHelper.determineTemplateType(bct, acceptHeader);
       headers.set("Content-type", BlockingActionHelper.getContentType(type));
-      byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+      byte[] template = BlockingActionHelper.getTemplate(type, this.securityResponseId);
       setContentLength(response, template.length);
       ChannelBuffer buf = ChannelBuffers.wrappedBuffer(template);
       response.setContent(buf);
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/MaybeBlockResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/MaybeBlockResponseHandler.java
@@ -98,7 +98,7 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent msg) throws E
       BlockingActionHelper.TemplateType type =
           BlockingActionHelper.determineTemplateType(bct, acceptHeader);
       headers.set("Content-type", BlockingActionHelper.getContentType(type));
-      byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+      byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
       setContentLength(response, template.length);
       ChannelBuffer buf = ChannelBuffers.wrappedBuffer(template);
       response.setContent(buf);
diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java
@@ -149,7 +149,8 @@ public boolean tryCommitBlockingResponse(
         pipeline.addAfter(
             handlerBefore.getClass().getName(),
             "blocking_handler",
-            new BlockingResponseHandler(segment, statusCode, templateType, extraHeaders));
+            new BlockingResponseHandler(
+                segment, statusCode, templateType, extraHeaders, securityResponseId));
         pipeline.addBefore(
             "blocking_handler", "before_blocking_handler", new SimpleChannelUpstreamHandler());
       } catch (RuntimeException rte) {
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/BlockingResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/BlockingResponseHandler.java
@@ -29,22 +29,30 @@ public class BlockingResponseHandler extends ChannelInboundHandlerAdapter {
   private final BlockingContentType bct;
   private final Map<String, String> extraHeaders;
   private final TraceSegment segment;
+  private final String securityResponseId;
 
   private boolean hasBlockedAlready;
 
   public BlockingResponseHandler(
       TraceSegment segment,
       int statusCode,
       BlockingContentType bct,
-      Map<String, String> extraHeaders) {
+      Map<String, String> extraHeaders,
+      String securityResponseId) {
     this.segment = segment;
     this.statusCode = statusCode;
     this.bct = bct;
     this.extraHeaders = extraHeaders;
+    this.securityResponseId = securityResponseId;
   }
 
   public BlockingResponseHandler(TraceSegment segment, Flow.Action.RequestBlockingAction rba) {
-    this(segment, rba.getStatusCode(), rba.getBlockingContentType(), rba.getExtraHeaders());
+    this(
+        segment,
+        rba.getStatusCode(),
+        rba.getBlockingContentType(),
+        rba.getExtraHeaders(),
+        rba.getSecurityResponseId());
   }
 
   @Override
@@ -98,7 +106,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
           BlockingActionHelper.determineTemplateType(bct, acceptHeader);
       headers.set("Content-type", BlockingActionHelper.getContentType(type));
 
-      byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+      byte[] template = BlockingActionHelper.getTemplate(type, this.securityResponseId);
       setContentLength(response, template.length);
       response.content().writeBytes(template);
     }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/MaybeBlockResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/MaybeBlockResponseHandler.java
@@ -121,7 +121,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) thr
       BlockingActionHelper.TemplateType type =
           BlockingActionHelper.determineTemplateType(bct, acceptHeader);
       headers.set("Content-type", BlockingActionHelper.getContentType(type));
-      byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+      byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
       setContentLength(response, template.length);
       response.content().writeBytes(template);
     }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/NettyHttpServerDecorator.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/NettyHttpServerDecorator.java
@@ -146,7 +146,8 @@ public boolean tryCommitBlockingResponse(
             .addAfter(
                 handlerBefore.getClass().getName(),
                 "blocking_handler",
-                new BlockingResponseHandler(segment, statusCode, templateType, extraHeaders))
+                new BlockingResponseHandler(
+                    segment, statusCode, templateType, extraHeaders, securityResponseId))
             .addBefore(
                 "blocking_handler", "before_blocking_handler", new ChannelInboundHandlerAdapter());
       } catch (RuntimeException rte) {
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandler.java
@@ -28,22 +28,30 @@ public class BlockingResponseHandler extends ChannelInboundHandlerAdapter {
   private final int statusCode;
   private final BlockingContentType bct;
   private final Map<String, String> extraHeaders;
+  private final String securityResponseId;
 
   private boolean hasBlockedAlready;
 
   public BlockingResponseHandler(
       TraceSegment segment,
       int statusCode,
       BlockingContentType bct,
-      Map<String, String> extraHeaders) {
+      Map<String, String> extraHeaders,
+      String securityResponseId) {
     this.segment = segment;
     this.statusCode = statusCode;
     this.bct = bct;
     this.extraHeaders = extraHeaders;
+    this.securityResponseId = securityResponseId;
   }
 
   public BlockingResponseHandler(TraceSegment segment, Flow.Action.RequestBlockingAction rba) {
-    this(segment, rba.getStatusCode(), rba.getBlockingContentType(), rba.getExtraHeaders());
+    this(
+        segment,
+        rba.getStatusCode(),
+        rba.getBlockingContentType(),
+        rba.getExtraHeaders(),
+        rba.getSecurityResponseId());
   }
 
   @Override
@@ -97,7 +105,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
           BlockingActionHelper.determineTemplateType(bct, acceptHeader);
       headers.set("Content-type", BlockingActionHelper.getContentType(type));
 
-      byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+      byte[] template = BlockingActionHelper.getTemplate(type, this.securityResponseId);
       HttpUtil.setContentLength(response, template.length);
       response.content().writeBytes(template);
     }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandler.java
@@ -118,7 +118,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise prm) thr
       BlockingActionHelper.TemplateType type =
           BlockingActionHelper.determineTemplateType(bct, acceptHeader);
       headers.set("Content-type", BlockingActionHelper.getContentType(type));
-      byte[] template = BlockingActionHelper.getTemplate(type, securityResponseId);
+      byte[] template = BlockingActionHelper.getTemplate(type, rba.getSecurityResponseId());
       setContentLength(response, template.length);
       response.content().writeBytes(template);
     }
diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerDecorator.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerDecorator.java
@@ -144,7 +144,8 @@ public boolean tryCommitBlockingResponse(
             .addAfter(
                 pipeline.context(handlerBefore).name(),
                 "blocking_handler",
-                new BlockingResponseHandler(segment, statusCode, templateType, extraHeaders))
+                new BlockingResponseHandler(
+                    segment, statusCode, templateType, extraHeaders, securityResponseId))
             .addBefore(
                 "blocking_handler", "before_blocking_handler", new ChannelInboundHandlerAdapter());
       } catch (RuntimeException rte) {
diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletBlockingHelper.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletBlockingHelper.java
@@ -22,7 +22,8 @@ public static void commitBlockingResponse(
       HttpServletResponse resp,
       int statusCode_,
       BlockingContentType bct,
-      Map<String, String> extraHeaders) {
+      Map<String, String> extraHeaders,
+      String securityResponseId) {
     int statusCode = BlockingActionHelper.getHttpCode(statusCode_);
     if (!start(resp, statusCode)) {
       return;
@@ -68,7 +69,8 @@ public static void commitBlockingResponse(
         resp,
         rba.getStatusCode(),
         rba.getBlockingContentType(),
-        rba.getExtraHeaders());
+        rba.getExtraHeaders(),
+        rba.getSecurityResponseId());
   }
 
   private static boolean start(HttpServletResponse resp, int statusCode) {
diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/ServletBlockingHelper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/ServletBlockingHelper.java
@@ -22,7 +22,8 @@ public static void commitBlockingResponse(
       HttpServletResponse resp,
       int statusCode_,
       BlockingContentType bct,
-      Map<String, String> extraHeaders) {
+      Map<String, String> extraHeaders,
+      String securityResponseId) {
     int statusCode = BlockingActionHelper.getHttpCode(statusCode_);
     if (!start(resp, statusCode)) {
       return;
@@ -69,7 +70,8 @@ public static void commitBlockingResponse(
         resp,
         rba.getStatusCode(),
         rba.getBlockingContentType(),
-        rba.getExtraHeaders());
+        rba.getExtraHeaders(),
+        rba.getSecurityResponseId());
   }
 
   private static boolean start(HttpServletResponse resp, int statusCode) {
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueAdvice.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/main/java/datadog/trace/instrumentation/tomcat7/ErrorReportValueAdvice.java
@@ -48,7 +48,7 @@ public static void onEnter(
       return;
     }
 
-    byte[] template = BlockingActionHelper.getTemplate(HTML, securityResponseId);
+    byte[] template = BlockingActionHelper.getTemplate(HTML, null);
     if (template == null) {
       return;
     }
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatBlockingHelper.java b/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatBlockingHelper.java
@@ -42,7 +42,8 @@ public static void commitBlockingResponse(
         resp,
         rba.getStatusCode(),
         rba.getBlockingContentType(),
-        rba.getExtraHeaders());
+        rba.getExtraHeaders(),
+        rba.getSecurityResponseId());
   }
 
   public static boolean commitBlockingResponse(
@@ -51,7 +52,8 @@ public static boolean commitBlockingResponse(
       Response resp,
       int statusCode,
       BlockingContentType templateType,
-      Map<String, String> extraHeaders) {
+      Map<String, String> extraHeaders,
+      String securityResponseId) {
     if (GET_OUTPUT_STREAM == null) {
       return false;
     }
@@ -70,9 +72,9 @@ public static boolean commitBlockingResponse(
 
     try {
       try {
-        tryWriteWithOutputStream(request, resp, templateType);
+        tryWriteWithOutputStream(request, resp, templateType, securityResponseId);
       } catch (IllegalStateException ise) {
-        tryWriteWithWriter(request, resp, templateType);
+        tryWriteWithWriter(request, resp, templateType, securityResponseId);
       }
       segment.effectivelyBlocked();
     } catch (Throwable e) {
@@ -82,7 +84,8 @@ public static boolean commitBlockingResponse(
   }
 
   private static void tryWriteWithOutputStream(
-      Request request, Response resp, BlockingContentType templateType) throws Throwable {
+      Request request, Response resp, BlockingContentType templateType, String securityResponseId)
+      throws Throwable {
     OutputStream os = (OutputStream) GET_OUTPUT_STREAM.invoke(resp);
     if (templateType != BlockingContentType.NONE) {
       TemplateType type =
@@ -97,7 +100,8 @@ private static void tryWriteWithOutputStream(
   }
 
   private static void tryWriteWithWriter(
-      Request request, Response resp, BlockingContentType templateType) throws IOException {
+      Request request, Response resp, BlockingContentType templateType, String securityResponseId)
+      throws IOException {
     PrintWriter writer = resp.getWriter();
     if (templateType != BlockingContentType.NONE) {
       TemplateType type =
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatDecorator.java b/dd-java-agent/instrumentation/tomcat/tomcat-common/src/main/java/datadog/trace/instrumentation/tomcat/TomcatDecorator.java
diff --git a/dd-java-agent/instrumentation/undertow/src/main/java/datadog/trace/instrumentation/undertow/UndertowBlockingHandler.java b/dd-java-agent/instrumentation/undertow/src/main/java/datadog/trace/instrumentation/undertow/UndertowBlockingHandler.java
diff --git a/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SecurityResponseIdSmokeTest.groovy b/dd-smoke-tests/appsec/springboot/src/test/groovy/datadog/smoketest/appsec/SecurityResponseIdSmokeTest.groovy

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ private Flow.Action.RequestBlockingAction createBlockRequestAction(`
`486`	`486`	`log.warn("Unknown content type: {}; using auto", contentType);`
`487`	`487`	`}`
`488`	`488`	`return new Flow.Action.RequestBlockingAction(`
`489`		`- statusCode, blockingContentType, null, securityResponseId);`
	`489`	`+ statusCode, blockingContentType, Collections.emptyMap(), securityResponseId);`
`490`	`490`	`} catch (RuntimeException cce) {`
`491`	`491`	`log.warn("Invalid blocking action data", cce);`
`492`	`492`	`if (!isRasp) {`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public boolean tryCommitBlockingResponse(`
`186`	`186`	`return false;`
`187`	`187`	`}`
`188`	`188`	`return GrizzlyHttpBlockingHelper.block(`
`189`		`- ctx, acceptHeader, statusCode, templateType, extraHeaders, segment);`
	`189`	`+ ctx, acceptHeader, statusCode, templateType, extraHeaders, segment, securityResponseId);`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,13 @@ public boolean tryCommitBlockingResponse(`
`193`	`193`	`return false;`
`194`	`194`	`}`
`195`	`195`	`ServletBlockingHelper.commitBlockingResponse(`
`196`		`- segment, request, (HttpServletResponse) response, statusCode, bct, extraHeaders);`
	`196`	`+ segment,`
	`197`	`+ request,`
	`198`	`+ (HttpServletResponse) response,`
	`199`	`+ statusCode,`
	`200`	`+ bct,`
	`201`	`+ extraHeaders,`
	`202`	`+ securityResponseId);`
`197`	`203`
`198`	`204`	`return true;`
`199`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,13 @@ public boolean tryCommitBlockingResponse(`
`194`	`194`	`return false;`
`195`	`195`	`}`
`196`	`196`	`JakartaServletBlockingHelper.commitBlockingResponse(`
`197`		`- segment, request, (HttpServletResponse) response, statusCode, bct, extraHeaders);`
	`197`	`+ segment,`
	`198`	`+ request,`
	`199`	`+ (HttpServletResponse) response,`
	`200`	`+ statusCode,`
	`201`	`+ bct,`
	`202`	`+ extraHeaders,`
	`203`	`+ securityResponseId);`
`198`	`204`
`199`	`205`	`return true;`
`200`	`206`	`}`