open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #500 from DataDog/tyler/jax-paths 

Add slashes if missing from annotation values
This commit is contained in:
Tyler Benson 2018-09-18 11:09:35 +10:00 committed by GitHub
parent c1ab82663d 955b97da9e
commit 152a3619c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dd-java-agent/instrumentation/jax-rs-annotations/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsAnnotationsInstrumentation.java
View File

@ -61,16 +61,19 @@ public final class JaxRsAnnotationsInstrumentation extends Instrumenter.Default
public static Scope nameSpan(@Advice.Origin final Method method) { public static Scope nameSpan(@Advice.Origin final Method method) {
// TODO: do we need caching for this? // TODO: do we need caching for this?
final LinkedList<Path> classPaths = new LinkedList<>(); final LinkedList<Path> paths = new LinkedList<>();
Class<?> target = method.getDeclaringClass(); Class<?> target = method.getDeclaringClass();
while (target != Object.class) { while (target != Object.class) {
final Path annotation = target.getAnnotation(Path.class); final Path annotation = target.getAnnotation(Path.class);
if (annotation != null) { if (annotation != null) {
classPaths.push(annotation); paths.push(annotation);
} }
target = target.getSuperclass(); target = target.getSuperclass();
} }
final Path methodPath = method.getAnnotation(Path.class); final Path methodPath = method.getAnnotation(Path.class);
if (methodPath != null) {
paths.add(methodPath);
}
String httpMethod = null; String httpMethod = null;
for (final Annotation ann : method.getDeclaredAnnotations()) { for (final Annotation ann : method.getDeclaredAnnotations()) {
if (ann.annotationType().getAnnotation(HttpMethod.class) != null) { if (ann.annotationType().getAnnotation(HttpMethod.class) != null) {
@ -83,11 +86,15 @@ public final class JaxRsAnnotationsInstrumentation extends Instrumenter.Default
resourceNameBuilder.append(httpMethod); resourceNameBuilder.append(httpMethod);
resourceNameBuilder.append(" "); resourceNameBuilder.append(" ");
} }
for (final Path classPath : classPaths) { Path last = null;
resourceNameBuilder.append(classPath.value()); for (final Path path : paths) {
if (path.value().startsWith("/") || (last != null && last.value().endsWith("/"))) {
resourceNameBuilder.append(path.value());
} else {
resourceNameBuilder.append("/");
resourceNameBuilder.append(path.value());
} }
if (methodPath != null) { last = path;
resourceNameBuilder.append(methodPath.value());
} }
final String resourceName = resourceNameBuilder.toString().trim(); final String resourceName = resourceNameBuilder.toString().trim();

5
dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy
View File

@ -82,7 +82,7 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner {
@DELETE @DELETE
void call() {} void call() {}
} }
"POST /abstract/child" | new ChildClassWithPath() "POST /abstract/child/call" | new ChildClassWithPath()
className = getName(obj.class) className = getName(obj.class)
} }
@ -138,8 +138,9 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner {
abstract void call() abstract void call()
} }
@Path("/child") @Path("child")
class ChildClassWithPath extends AbstractClassWithPath { class ChildClassWithPath extends AbstractClassWithPath {
@Path("call")
@POST @POST
void call() {} void call() {}
} }