Skip to content

Commit 2043d77

Browse files
committed
Remove redundant .or(named("getParts")) from ExtractContentParametersAdvice matcher
ExtractContentParametersAdvice applied to getParts() is always a no-op: it increments/decrements CallDepthThreadLocalMap but never fires since _contentParameters is always null at that point. GetFilenamesAdvice and GetFilenamesFromMultiPartAdvice handle getParts() exclusively.
1 parent 5a85e01 commit 2043d77

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestExtractContentParametersInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public String[] helperClassNames() {
4949
@Override
5050
public void methodAdvice(MethodTransformer transformer) {
5151
transformer.applyAdvice(
52-
named("extractContentParameters").and(takesArguments(0)).or(named("getParts")),
52+
named("extractContentParameters").and(takesArguments(0)),
5353
getClass().getName() + "$ExtractContentParametersAdvice");
5454
transformer.applyAdvice(
5555
named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");

dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public String[] helperClassNames() {
4949
@Override
5050
public void methodAdvice(MethodTransformer transformer) {
5151
transformer.applyAdvice(
52-
named("extractContentParameters").and(takesArguments(0)).or(named("getParts")),
52+
named("extractContentParameters").and(takesArguments(0)),
5353
getClass().getName() + "$ExtractContentParametersAdvice");
5454
transformer.applyAdvice(
5555
named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");

dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/src/main/java/datadog/trace/instrumentation/jetty94/RequestExtractContentParametersInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public String[] helperClassNames() {
4949
@Override
5050
public void methodAdvice(MethodTransformer transformer) {
5151
transformer.applyAdvice(
52-
named("extractContentParameters").and(takesArguments(0)).or(named("getParts")),
52+
named("extractContentParameters").and(takesArguments(0)),
5353
getClass().getName() + "$ExtractContentParametersAdvice");
5454
transformer.applyAdvice(
5555
named("getParts").and(takesArguments(0)), getClass().getName() + "$GetFilenamesAdvice");

0 commit comments

Comments
 (0)