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

Set resource name in a way that doesn't need to reference DDSpanBuilder

This commit is contained in:
Laplie Anderson 2019-07-19 12:26:17 -04:00
parent d101bea085
commit cad2a3d4a4
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java
View File

@ -2,7 +2,7 @@ package datadog.trace.instrumentation.trace_annotation;
import static datadog.trace.instrumentation.trace_annotation.TraceDecorator.DECORATE;
import datadog.opentracing.DDTracer;
import datadog.trace.api.DDTags;
import datadog.trace.api.Trace;
import io.opentracing.Scope;
import io.opentracing.Tracer;
@ -23,10 +23,8 @@ public class TraceAdvice {
Tracer.SpanBuilder spanBuilder = GlobalTracer.get().buildSpan(operationName);
final String resourceName = traceAnnotation == null ? null : traceAnnotation.resourceName();
if (resourceName != null
&& !resourceName.isEmpty()
&& spanBuilder instanceof DDTracer.DDSpanBuilder) {
spanBuilder = ((DDTracer.DDSpanBuilder) spanBuilder).withResourceName(resourceName);
if (resourceName != null && !resourceName.isEmpty()) {
spanBuilder = spanBuilder.withTag(DDTags.RESOURCE_NAME, resourceName);
}
return DECORATE.afterStart(spanBuilder.startActive(true));

4
dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java
View File

@ -85,9 +85,7 @@ public final class TraceAnnotationsInstrumentation extends Instrumenter.Default
@Override
public String[] helperClassNames() {
return new String[] {
"datadog.trace.agent.decorator.BaseDecorator",
"datadog.opentracing.DDTracer$DDSpanBuilder",
packageName + ".TraceDecorator",
"datadog.trace.agent.decorator.BaseDecorator", packageName + ".TraceDecorator",
};
}

4
dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java
View File

@ -123,9 +123,7 @@ public class TraceConfigInstrumentation implements Instrumenter {
@Override
public String[] helperClassNames() {
return new String[] {
"datadog.trace.agent.decorator.BaseDecorator",
"datadog.opentracing.DDTracer$DDSpanBuilder",
packageName + ".TraceDecorator",
"datadog.trace.agent.decorator.BaseDecorator", packageName + ".TraceDecorator",
};
}