From 377df7b789fff25c82de36f95330b7f6738c507e Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Sat, 19 Oct 2019 11:57:49 -0700
Subject: [PATCH] Update trace-annotation to new agent api

---
 .../trace_annotation/TraceAdvice.java         | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 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 c77ab4e10f..45d1fbe5fc 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
@@ -1,13 +1,13 @@
 package datadog.trace.instrumentation.trace_annotation;
 
+import static datadog.trace.instrumentation.api.AgentTracer.activateSpan;
+import static datadog.trace.instrumentation.api.AgentTracer.startSpan;
 import static datadog.trace.instrumentation.trace_annotation.TraceDecorator.DECORATE;
 
 import datadog.trace.api.DDTags;
 import datadog.trace.api.Trace;
-import datadog.trace.context.TraceScope;
-import io.opentracing.Scope;
-import io.opentracing.Tracer;
-import io.opentracing.util.GlobalTracer;
+import datadog.trace.instrumentation.api.AgentScope;
+import datadog.trace.instrumentation.api.AgentSpan;
 import java.lang.reflect.Method;
 import net.bytebuddy.asm.Advice;
 
@@ -15,33 +15,30 @@ public class TraceAdvice {
   private static final String DEFAULT_OPERATION_NAME = "trace.annotation";
 
   @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static Scope startSpan(@Advice.Origin final Method method) {
+  public static AgentScope onEnter(@Advice.Origin final Method method) {
     final Trace traceAnnotation = method.getAnnotation(Trace.class);
     String operationName = traceAnnotation == null ? null : traceAnnotation.operationName();
     if (operationName == null || operationName.isEmpty()) {
       operationName = DEFAULT_OPERATION_NAME;
     }
 
-    Tracer.SpanBuilder spanBuilder = GlobalTracer.get().buildSpan(operationName);
+    final AgentSpan span = startSpan(operationName);
 
     String resourceName = traceAnnotation == null ? null : traceAnnotation.resourceName();
     if (resourceName == null || resourceName.isEmpty()) {
       resourceName = DECORATE.spanNameForMethod(method);
     }
-    spanBuilder = spanBuilder.withTag(DDTags.RESOURCE_NAME, resourceName);
-
-    final Scope scope = DECORATE.afterStart(spanBuilder.startActive(true));
-
-    if (scope instanceof TraceScope) {
-      ((TraceScope) scope).setAsyncPropagation(true);
-    }
+    span.setTag(DDTags.RESOURCE_NAME, resourceName);
+    DECORATE.afterStart(span);
 
+    final AgentScope scope = activateSpan(span, true);
+    scope.setAsyncPropagation(true);
     return scope;
   }
 
   @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
   public static void stopSpan(
-      @Advice.Enter final Scope scope, @Advice.Thrown final Throwable throwable) {
+      @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) {
     DECORATE.onError(scope, throwable);
     DECORATE.beforeFinish(scope);
     scope.close();