From cad2a3d4a410551f2593ddfbd39be6777a9f1c46 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Fri, 19 Jul 2019 12:26:17 -0400 Subject: [PATCH] Set resource name in a way that doesn't need to reference DDSpanBuilder --- .../instrumentation/trace_annotation/TraceAdvice.java | 8 +++----- .../trace_annotation/TraceAnnotationsInstrumentation.java | 4 +--- .../trace_annotation/TraceConfigInstrumentation.java | 4 +--- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java index 5a8a2d8f55..ed4d2ffb30 100644 --- a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java +++ b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java @@ -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)); diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java index de849c4529..f2c1516957 100644 --- a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAnnotationsInstrumentation.java @@ -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", }; } diff --git a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java index 9600f54b5f..2365b54782 100644 --- a/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java +++ b/dd-java-agent/instrumentation/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceConfigInstrumentation.java @@ -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", }; }