review

Author: laurit

instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioAsyncInstrumentation.java

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.twilio;
 
-import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.instrumentation.twilio.TwilioSingletons.instrumenter;
@@ -85,7 +84,7 @@ private AdviceScope(Context context, Scope scope, String spanName) {
 
       @Nullable
       public static AdviceScope start(Object target, String methodName) {
-        Context parentContext = currentContext();
+        Context parentContext = Context.current();
         String spanName = spanName(target, methodName);
         if (!instrumenter().shouldStart(parentContext, spanName)) {
           return null;

instrumentation/twilio-6.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/twilio/TwilioSyncInstrumentation.java

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.twilio;
 
-import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.instrumentation.twilio.TwilioSingletons.instrumenter;
@@ -77,7 +76,7 @@ private AdviceScope(Context context, Scope scope, String spanName) {
 
       @Nullable
       public static AdviceScope start(Object target, String methodName) {
-        Context parentContext = currentContext();
+        Context parentContext = Context.current();
         String spanName = TwilioSingletons.spanName(target, methodName);
         if (!instrumenter().shouldStart(parentContext, spanName)
             || TwilioAsyncMarker.isMarkedAsync(parentContext)) {