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

Remove unused method and finish comment 

Also adjust naming slightly.
This commit is contained in:
Tyler Benson 2019-08-30 13:52:54 -04:00
parent 0b0d75bcf2
commit aec22640f3
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,15 +37,15 @@ public class JaxRsAnnotationsDecorator extends BaseDecorator {
return "jax-rs-controller"; return "jax-rs-controller";
} }
public void updateScope(final Scope scope, final Scope parent, final Method method) { public void onControllerStart(final Scope scope, final Scope parent, final Method method) {
String resourceName = getResourceName(method); final String resourceName = getPathResourceName(method);
updateParent(parent, resourceName); updateParent(parent, resourceName);
final Span span = scope.span(); final Span span = scope.span();
span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.HTTP_SERVER); span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.HTTP_SERVER);
// When jax-rs is the root scope, then we // When jax-rs is the root, we want to name using the path, otherwise use the class/method.
boolean isRootScope = parent == null; final boolean isRootScope = parent == null;
if (isRootScope && !resourceName.isEmpty()) { if (isRootScope && !resourceName.isEmpty()) {
span.setTag(DDTags.RESOURCE_NAME, resourceName); span.setTag(DDTags.RESOURCE_NAME, resourceName);
} else { } else {
@ -65,25 +65,13 @@ public class JaxRsAnnotationsDecorator extends BaseDecorator {
} }
} }
public void updateCurrentScope(final Scope scope, final Method method, boolean isRootScope) {
final Span span = scope.span();
span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.HTTP_SERVER);
if (isRootScope) {
String resourceName = getResourceName(method);
if (!resourceName.isEmpty()) {
span.setTag(DDTags.RESOURCE_NAME, resourceName);
}
}
}
/** /**
* Returns the resource name given a JaxRS annotated method. Results are cached so this method can * Returns the resource name given a JaxRS annotated method. Results are cached so this method can
* be called multiple times without significantly impacting performance. * be called multiple times without significantly impacting performance.
* *
* @return The result can be an empty string but will never be {@code null}. * @return The result can be an empty string but will never be {@code null}.
*/ */
private String getResourceName(final Method method) { private String getPathResourceName(final Method method) {
final Class<?> target = method.getDeclaringClass(); final Class<?> target = method.getDeclaringClass();
Map<Method, String> classMap = resourceNames.get(target); Map<Method, String> classMap = resourceNames.get(target);

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

@ -60,11 +60,11 @@ public final class JaxRsAnnotationsInstrumentation extends Instrumenter.Default
@Advice.OnMethodEnter(suppress = Throwable.class) @Advice.OnMethodEnter(suppress = Throwable.class)
public static Scope nameSpan(@Advice.Origin final Method method) { public static Scope nameSpan(@Advice.Origin final Method method) {
Tracer tracer = GlobalTracer.get(); final Tracer tracer = GlobalTracer.get();
// Rename the parent span according to the path represented by these annotations. // Rename the parent span according to the path represented by these annotations.
final Scope parent = tracer.scopeManager().active(); final Scope parent = tracer.scopeManager().active();
Scope scope = tracer.buildSpan(JAX_ENDPOINT_OPERATION_NAME).startActive(true); final Scope scope = tracer.buildSpan(JAX_ENDPOINT_OPERATION_NAME).startActive(true);
DECORATE.updateScope(scope, parent, method); DECORATE.onControllerStart(scope, parent, method);
return DECORATE.afterStart(scope); return DECORATE.afterStart(scope);
} }