Remove BaseTracer#startScope() method (#2224)

* Remove BaseTracer#startScope() method

* fix compilation failure

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/BaseTracer.java

@@ -13,7 +13,6 @@ import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.ContextKey;
-import io.opentelemetry.context.Scope;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.instrumentation.api.InstrumentationVersion;
@@ -21,12 +20,8 @@ import io.opentelemetry.instrumentation.api.context.ContextPropagationDebug;
 import java.lang.reflect.Method;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public abstract class BaseTracer {
-  private static final Logger log = LoggerFactory.getLogger(HttpServerTracer.class);
-
   // Keeps track of the server span for the current trace.
   // TODO(anuraaga): Should probably be renamed to local root key since it could be a consumer span
   // or other non-server root.
@@ -88,10 +83,6 @@ public abstract class BaseTracer {
     return parentContext.with(span).with(CONTEXT_SERVER_SPAN_KEY, span);
   }
 
-  public Scope startScope(Span span) {
-    return Context.current().with(span).makeCurrent();
-  }
-
   protected final boolean shouldStartSpan(SpanKind proposedKind, Context context) {
     switch (proposedKind) {
       case CLIENT:

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpClientTracer.java

@@ -99,7 +99,7 @@ public abstract class HttpClientTracer<REQUEST, CARRIER, RESPONSE> extends BaseT
     Setter<CARRIER> setter = getSetter();
     if (setter == null) {
       throw new IllegalStateException(
-          "getSetter() not defined but calling startScope(), either getSetter must be implemented or the scope should be setup manually");
+          "getSetter() not defined but calling inject(), either getSetter must be implemented or the scope should be setup manually");
     }
     propagators.getTextMapPropagator().inject(context, carrier, setter);
   }

instrumentation/apache-camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/ActiveSpanManager.java

@@ -97,7 +97,7 @@ class ActiveSpanManager {
       if (isClientSpan(spanKind)) {
         scope = CamelTracer.TRACER.startClientScope(span);
       } else {
-        scope = CamelTracer.TRACER.startScope(span);
+        scope = span.makeCurrent();
       }
 
       return new SpanWithScope(parent, span, scope);

instrumentation/geode-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/geode/GeodeInstrumentationModule.java

@@ -91,7 +91,7 @@ public class GeodeInstrumentationModule extends InstrumentationModule {
         return;
       }
       span = tracer().startSpan(method.getName(), thiz, null);
-      scope = tracer().startScope(span);
+      scope = span.makeCurrent();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
@@ -125,7 +125,7 @@ public class GeodeInstrumentationModule extends InstrumentationModule {
         return;
       }
       span = tracer().startSpan(method.getName(), thiz, query);
-      scope = tracer().startScope(span);
+      scope = span.makeCurrent();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/DefaultRequestContextInstrumentation.java

@@ -47,7 +47,7 @@ public class DefaultRequestContextInstrumentation extends AbstractRequestContext
         }
 
         span = tracer().startSpan(filterClass, method);
-        scope = tracer().startScope(span);
+        scope = span.makeCurrent();
       }
     }
 

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsAnnotationsInstrumentation.java

@@ -103,7 +103,7 @@ public class JaxRsAnnotationsInstrumentation implements TypeInstrumentation {
         contextStore.put(asyncResponse, span);
       }
 
-      scope = tracer().startScope(span);
+      scope = span.makeCurrent();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfRequestContextInstrumentation.java

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
 
-import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxRsAnnotationsTracer.tracer;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -80,7 +79,7 @@ public class CxfRequestContextInstrumentation implements TypeInstrumentation {
             RequestContextHelper.createOrUpdateAbortSpan(
                 (ContainerRequestContext) context, resourceClass, method);
         if (span != null) {
-          scope = tracer().startScope(span);
+          scope = span.makeCurrent();
         }
       }
     }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseyRequestContextInstrumentation.java

@@ -5,8 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
 
-import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxRsAnnotationsTracer.tracer;
-
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Scope;
 import java.lang.reflect.Method;
@@ -48,7 +46,7 @@ public class JerseyRequestContextInstrumentation extends AbstractRequestContextI
 
         span = RequestContextHelper.createOrUpdateAbortSpan(context, resourceClass, method);
         if (span != null) {
-          scope = tracer().startScope(span);
+          scope = span.makeCurrent();
         }
       }
     }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy30RequestContextInstrumentation.java

@@ -5,8 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
 
-import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxRsAnnotationsTracer.tracer;
-
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Scope;
 import java.lang.reflect.Method;
@@ -48,7 +46,7 @@ public class Resteasy30RequestContextInstrumentation extends AbstractRequestCont
 
         span = RequestContextHelper.createOrUpdateAbortSpan(context, resourceClass, method);
         if (span != null) {
-          scope = tracer().startScope(span);
+          scope = span.makeCurrent();
         }
       }
     }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/Resteasy31RequestContextInstrumentation.java

@@ -5,8 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
 
-import static io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0.JaxRsAnnotationsTracer.tracer;
-
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Scope;
 import java.lang.reflect.Method;
@@ -48,7 +46,7 @@ public class Resteasy31RequestContextInstrumentation extends AbstractRequestCont
 
         span = RequestContextHelper.createOrUpdateAbortSpan(context, resourceClass, method);
         if (span != null) {
-          scope = tracer().startScope(span);
+          scope = span.makeCurrent();
         }
       }
     }

instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageListenerInstrumentation.java

@@ -53,7 +53,7 @@ public class JmsMessageListenerInstrumentation implements TypeInstrumentation {
       MessageDestination destination = tracer().extractDestination(message, null);
       span =
           tracer().startConsumerSpan(destination, "process", message, System.currentTimeMillis());
-      scope = tracer().startScope(span);
+      scope = span.makeCurrent();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

instrumentation/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageProducerInstrumentation.java

@@ -114,7 +114,7 @@ public class JmsMessageProducerInstrumentation implements TypeInstrumentation {
 
       MessageDestination messageDestination = tracer().extractDestination(message, destination);
       span = tracer().startProducerSpan(messageDestination, message);
-      scope = tracer().startScope(span);
+      scope = span.makeCurrent();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/ActionListenerImplInstrumentation.java

@@ -42,7 +42,7 @@ public class ActionListenerImplInstrumentation implements TypeInstrumentation {
         @Advice.Local("otelScope") Scope scope) {
       span = tracer().startSpan(event);
       if (span != null) {
-        scope = tracer().startScope(span);
+        scope = span.makeCurrent();
       }
     }
 

instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/ActionListenerImplInstrumentation.java

@@ -42,7 +42,7 @@ public class ActionListenerImplInstrumentation implements TypeInstrumentation {
         @Advice.Local("otelScope") Scope scope) {
       span = tracer().startSpan(event);
       if (span != null) {
-        scope = tracer().startScope(span);
+        scope = span.makeCurrent();
       }
     }
 

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitChannelInstrumentation.java

@@ -100,7 +100,7 @@ public class RabbitChannelInstrumentation implements TypeInstrumentation {
 
       span = tracer().startSpan(method, channel.getConnection());
       CURRENT_RABBIT_SPAN.set(span);
-      scope = tracer().startScope(span);
+      scope = span.makeCurrent();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/TracedDelegatingConsumer.java

@@ -66,7 +66,7 @@ public class TracedDelegatingConsumer implements Consumer {
     Scope scope = null;
     try {
       span = tracer().startDeliverySpan(queue, envelope, properties, body);
-      scope = tracer().startScope(span);
+      scope = span.makeCurrent();
 
     } catch (Exception e) {
       log.debug("Instrumentation error in tracing consumer", e);

instrumentation/rxjava-1.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/TracedOnSubscribe.java

@@ -40,7 +40,7 @@ public class TracedOnSubscribe<T> implements Observable.OnSubscribe<T> {
     try (Scope ignored = parentContext.makeCurrent()) {
       Span span = tracer.startSpan(operationName, spanKind);
       decorateSpan(span);
-      try (Scope ignored1 = tracer.startScope(span)) {
+      try (Scope ignored1 = span.makeCurrent()) {
         delegate.call(new TracedSubscriber<>(Context.current(), subscriber, tracer));
       }
     }

instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentationModule.java

@@ -127,7 +127,7 @@ public class RequestDispatcherInstrumentationModule extends InstrumentationModul
         Context newContext = Java8BytecodeBridge.currentContext().with(span);
         request.setAttribute(CONTEXT_ATTRIBUTE, newContext);
       }
-      scope = tracer().startScope(span);
+      scope = span.makeCurrent();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)

instrumentation/struts-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/struts2/ActionInvocationAdvice.java

@@ -21,7 +21,7 @@ public class ActionInvocationAdvice {
       @Advice.Local("otelSpan") Span span,
       @Advice.Local("otelScope") Scope scope) {
     span = tracer().startSpan(actionInvocation);
-    scope = tracer().startScope(span);
+    scope = span.makeCurrent();
 
     tracer()
         .updateServerSpanName(Java8BytecodeBridge.currentContext(), actionInvocation.getProxy());