Skip to content

Ensure all response body advices are OnMethodEnter #9046

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
manuel-alvarez-alvarez merged 1 commit into from
Jul 4, 2025
Merged

Ensure all response body advices are OnMethodEnter #9046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...ain/java_play25/datadog/trace/instrumentation/play25/appsec/ResultsStatusApplyAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
public class ResultsStatusApplyAdvice {

@Advice.OnMethodEnter(suppress = Throwable.class)
static void after(
@Advice.Argument(0) final Object content, @ActiveRequestContext RequestContext reqCtx) {
static void before(
@Advice.Argument(0) final Object content, @ActiveRequestContext final RequestContext reqCtx) {

if (!(content instanceof JsValue)) {
return;
Expand Down
16 changes: 8 additions & 8 deletions ...n/java_play25/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,10 @@
public class StatusHeaderSendJsonAdvice {

@Advice.OnMethodEnter(suppress = Throwable.class)
static void before() {
CallDepthThreadLocalMap.incrementCallDepth(StatusHeader.class);
}
static void before(
@Advice.Argument(0) final JsonNode json, @ActiveRequestContext final RequestContext reqCtx) {

@Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
static void after(
@Advice.Argument(0) final JsonNode json, @ActiveRequestContext RequestContext reqCtx) {
final int depth = CallDepthThreadLocalMap.decrementCallDepth(StatusHeader.class);
if (depth > 0) {
if (CallDepthThreadLocalMap.incrementCallDepth(StatusHeader.class) > 0) {
return;
}

Expand Down Expand Up @@ -64,4 +59,9 @@ static void after(
throw new BlockingException("Blocked request (for StatusHeader/sendJson)");
}
}

@Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
static void after() {
CallDepthThreadLocalMap.decrementCallDepth(StatusHeader.class);
}
}
17 changes: 9 additions & 8 deletions ...rc/main/java/datadog/trace/instrumentation/play26/appsec/StatusHeaderInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,11 @@ public void methodAdvice(MethodTransformer transformer) {
public static class StatusHeaderSendJsonAdvice {

@Advice.OnMethodEnter(suppress = Throwable.class)
static void before() {
CallDepthThreadLocalMap.incrementCallDepth(StatusHeader.class);
}
static void before(
@Advice.Argument(0) final JsonNode json,
@ActiveRequestContext final RequestContext reqCtx) {

@Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
static void after(
@Advice.Argument(0) final JsonNode json, @ActiveRequestContext RequestContext reqCtx) {
final int depth = CallDepthThreadLocalMap.decrementCallDepth(StatusHeader.class);
if (depth > 0) {
if (CallDepthThreadLocalMap.incrementCallDepth(StatusHeader.class) > 0) {
return;
}

Expand Down Expand Up @@ -102,4 +98,9 @@ static void after(
}
}
}

@Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
static void after() {
CallDepthThreadLocalMap.decrementCallDepth(StatusHeader.class);
}
}