From 02fb8d8888eb350251eae2b7e483e38b904c7d05 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Tue, 18 Feb 2020 18:34:32 -0500 Subject: [PATCH] Fix JaxRs matching Paranthesys was missplaced leading to more complicated matcher than needed --- .../instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java | 2 +- .../instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java index 856bab591f..8db418592c 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-annotations-1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java @@ -44,7 +44,7 @@ public final class JaxRsAnnotationsInstrumentation extends Instrumenter.Default public ElementMatcher typeMatcher() { return safeHasSuperType( isAnnotatedWith(named("javax.ws.rs.Path")) - .or(safeHasSuperType(declaresMethod(isAnnotatedWith(named("javax.ws.rs.Path")))))); + .or(declaresMethod(isAnnotatedWith(named("javax.ws.rs.Path"))))); } @Override diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java index 86fb8030f6..efdf692e70 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java @@ -43,7 +43,7 @@ public final class JaxRsAnnotationsInstrumentation extends Instrumenter.Default public ElementMatcher typeMatcher() { return safeHasSuperType( isAnnotatedWith(named("javax.ws.rs.Path")) - .or(safeHasSuperType(declaresMethod(isAnnotatedWith(named("javax.ws.rs.Path")))))); + .or(declaresMethod(isAnnotatedWith(named("javax.ws.rs.Path"))))); } @Override