Skip to content

Refactor: Introduce overloaded tryCommitBlockingResponse accepting RequestBlockingAction #10125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jandro996 merged 4 commits into from
Dec 11, 2025
Merged

Refactor: Introduce overloaded tryCommitBlockingResponse accepting RequestBlockingAction #10125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cced1b3
Refactor
jandro996 Dec 9, 2025
07184ac
Merge branch 'master' into alejandro.gonzalez/appsec-block-refactor
jandro996 Dec 10, 2025
7e45783
Merge branch 'master' into alejandro.gonzalez/appsec-block-refactor
jandro996 Dec 10, 2025
5f62fa1
Merge branch 'master' into alejandro.gonzalez/appsec-block-refactor
jandro996 Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .../main/java/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,7 @@ public void onRawStatement(AgentSpan span, String sql) {
BlockResponseFunction brf = ctx.getBlockResponseFunction();
if (brf != null) {
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
brf.tryCommitBlockingResponse(
ctx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
}
throw new BlockingException("Blocked request (for SQL query)");
}
Expand Down
6 changes: 1 addition & 5 deletions .../src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpClientDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,7 @@ protected void onHttpClientRequest(final AgentSpan span, final String url) {
BlockResponseFunction brf = ctx.getBlockResponseFunction();
if (brf != null) {
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
brf.tryCommitBlockingResponse(
ctx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
}
throw new BlockingException("Blocked request (for SSRF attempt)");
}
Expand Down
6 changes: 1 addition & 5 deletions ...0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/BlockingResponseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@ public static HttpResponse handleFinishForWaf(final AgentSpan span, final HttpRe
if (action instanceof Flow.Action.RequestBlockingAction) {
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
if (brf instanceof AkkaBlockResponseFunction) {
brf.tryCommitBlockingResponse(
requestContext.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
HttpResponse altResponse =
((AkkaBlockResponseFunction) brf).maybeCreateAlternativeResponse();
if (altResponse != null) {
Expand Down
6 changes: 1 addition & 5 deletions ...10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/UnmarshallerHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,7 @@ private static void executeCallback(
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
boolean success =
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
if (success) {
if (blockResponseFunction instanceof AkkaBlockResponseFunction) {
AkkaBlockResponseFunction abrf = (AkkaBlockResponseFunction) blockResponseFunction;
Expand Down
6 changes: 1 addition & 5 deletions ...ava/datadog/trace/instrumentation/grizzlyhttp232/ParsedBodyParametersInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
if (t == null) {
t = new BlockingException("Blocked request (for Parameters/processParameters)");
}
Expand Down
6 changes: 1 addition & 5 deletions ...va-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,7 @@ public void beforeFileLoaded(@Nonnull final String path) {
BlockResponseFunction brf = ctx.getBlockResponseFunction();
if (brf != null) {
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
brf.tryCommitBlockingResponse(
ctx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
}
throw new BlockingException("Blocked request (for LFI attempt)");
}
Expand Down
6 changes: 1 addition & 5 deletions ...et/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,7 @@ private static void raspCallback(@Nonnull final URL url) {
BlockResponseFunction brf = ctx.getBlockResponseFunction();
if (brf != null) {
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
brf.tryCommitBlockingResponse(
ctx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
}
throw new BlockingException("Blocked request (for SSRF attempt)");
}
Expand Down
6 changes: 1 addition & 5 deletions ...src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
t = new BlockingException("Blocked request (for ReaderInterceptorExecutor/proceed)");
reqCtx.getTraceSegment().effectivelyBlocked();
}
Expand Down
6 changes: 1 addition & 5 deletions .../java/datadog/trace/instrumentation/jersey2/MultiPartReaderServerSideInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
t = new BlockingException("Blocked request (for MultiPartReaderClientSide/readFrom)");
reqCtx.getTraceSegment().effectivelyBlocked();
}
Expand Down
6 changes: 1 addition & 5 deletions ...src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
t =
new BlockingException(
"Blocked request (for UriRoutingContextInstrumentation/getPathParameters)");
Expand Down
6 changes: 1 addition & 5 deletions ...src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
t = new BlockingException("Blocked request (for ReaderInterceptorExecutor/proceed)");
reqCtx.getTraceSegment().effectivelyBlocked();
}
Expand Down
6 changes: 1 addition & 5 deletions .../java/datadog/trace/instrumentation/jersey3/MultiPartReaderServerSideInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
t = new BlockingException("Blocked request (for MultiPartReaderClientSide/readFrom)");
reqCtx.getTraceSegment().effectivelyBlocked();
}
Expand Down
6 changes: 1 addition & 5 deletions ...ec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
if (t == null) {
t = new BlockingException("Blocked request (for UrlEncoded/decodeTo)");
reqCtx.getTraceSegment().effectivelyBlocked();
Expand Down
6 changes: 1 addition & 5 deletions ....3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
if (t == null) {
t = new BlockingException("Blocked request (for Request/parsePart(s))");
}
Expand Down
12 changes: 2 additions & 10 deletions ...datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
t = new BlockingException("Blocked request (for Request/extractContentParameters)");
reqCtx.getTraceSegment().effectivelyBlocked();
}
Expand Down Expand Up @@ -130,11 +126,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
if (t == null) {
t = new BlockingException("Blocked request (for Request/getParts)");
reqCtx.getTraceSegment().effectivelyBlocked();
Expand Down
6 changes: 1 addition & 5 deletions ...datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
if (t == null) {
t = new BlockingException("Blocked request (for Request/extractContentParameters)");
reqCtx.getTraceSegment().effectivelyBlocked();
Expand Down
7 changes: 1 addition & 6 deletions ...c/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,7 @@ static class CommitResponseAdvice {
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction brf = requestContext.getBlockResponseFunction();
if (brf != null) {
boolean res =
brf.tryCommitBlockingResponse(
requestContext.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
boolean res = brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
if (res) {
requestContext.getTraceSegment().effectivelyBlocked();
return true;
Expand Down
6 changes: 1 addition & 5 deletions ...c/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,7 @@ static class CommitResponseAdvice {
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction brf = requestContext.getBlockResponseFunction();
if (brf != null) {
return brf.tryCommitBlockingResponse(
requestContext.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
return brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
}
}

Expand Down
7 changes: 1 addition & 6 deletions ...rc/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,7 @@ static class CommitResponseAdvice {
BlockResponseFunction brf = requestContext.getBlockResponseFunction();
if (brf != null) {
_committed.set(false);
boolean res =
brf.tryCommitBlockingResponse(
requestContext.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
boolean res = brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
if (res && _committed.get()) {
requestContext.getTraceSegment().effectivelyBlocked();
return true;
Expand Down
6 changes: 1 addition & 5 deletions ...src/main/java/datadog/trace/instrumentation/liberty20/ParseParametersInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
t = new BlockingException("Blocked request (for SRTServletRequest/parseParameters)");
reqCtx.getTraceSegment().effectivelyBlocked();
}
Expand Down
6 changes: 1 addition & 5 deletions ...0/src/main/java/datadog/trace/instrumentation/liberty20/ParsePostDataInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
t = new BlockingException("Blocked request (for SRTServletRequest/parsePostData)");
reqCtx.getTraceSegment().effectivelyBlocked();
}
Expand Down
6 changes: 1 addition & 5 deletions ...src/main/java/datadog/trace/instrumentation/liberty23/ParseParametersInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
t = new BlockingException("Blocked request (for SRTServletRequest/parseParameters)");
reqCtx.getTraceSegment().effectivelyBlocked();
}
Expand Down
6 changes: 1 addition & 5 deletions ...0/src/main/java/datadog/trace/instrumentation/liberty23/ParsePostDataInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
t = new BlockingException("Blocked request (for SRTServletRequest/parsePostData)");
reqCtx.getTraceSegment().effectivelyBlocked();
}
Expand Down
6 changes: 1 addition & 5 deletions ...ain/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,7 @@ static void after(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction brf = requestContext.getBlockResponseFunction();
if (brf != null) {
brf.tryCommitBlockingResponse(
requestContext.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
brf.tryCommitBlockingResponse(requestContext.getTraceSegment(), rba);
}
thr = new BlockingException("Blocked request (multipart/urlencoded post data)");
}
Expand Down
6 changes: 1 addition & 5 deletions ...ttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,7 @@ private <P extends HttpClientPayload> void publish(
BlockResponseFunction brf = ctx.getBlockResponseFunction();
if (brf != null) {
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
brf.tryCommitBlockingResponse(
ctx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
}
throw new BlockingException("Blocked request (for http downstream request)");
}
Expand Down
6 changes: 1 addition & 5 deletions ...ttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,7 @@ private <P extends HttpClientPayload> void publish(
BlockResponseFunction brf = ctx.getBlockResponseFunction();
if (brf != null) {
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
brf.tryCommitBlockingResponse(
ctx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba);
}
throw new BlockingException("Blocked request (for http downstream request)");
}
Expand Down
6 changes: 1 addition & 5 deletions ...4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/BodyParserHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,7 @@ private static void executeCallback(
BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction();
if (blockResponseFunction != null) {
boolean success =
blockResponseFunction.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
if (success) {
throw new BlockingException("Blocked request (for " + details + ")");
}
Expand Down
6 changes: 1 addition & 5 deletions ...c/main/java_play25/datadog/trace/instrumentation/play25/appsec/PathExtractionHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ private static BlockingException doCallRequestPathParamsCallback(
Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action;
BlockResponseFunction brf = reqCtx.getBlockResponseFunction();
if (brf != null) {
brf.tryCommitBlockingResponse(
reqCtx.getTraceSegment(),
rba.getStatusCode(),
rba.getBlockingContentType(),
rba.getExtraHeaders());
brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba);
}
return new BlockingException("Blocked request (for " + origin + ")");
}
Expand Down
Loading