Using Context.current()

Author: LikeTheSalad

instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/ClientCallableRpcInstrumentation.java

@@ -11,7 +11,6 @@
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import javax.annotation.Nullable;
@@ -56,7 +55,7 @@ private InvokeMethodAdviceScope(
 
       @Nullable
       public static InvokeMethodAdviceScope start(Class<?> componentClass, String methodName) {
-        Context parentContext = Java8BytecodeBridge.currentContext();
+        Context parentContext = Context.current();
         VaadinClientCallableRequest request =
             VaadinClientCallableRequest.create(componentClass, methodName);
         if (!clientCallableInstrumenter().shouldStart(parentContext, request)) {

instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/RpcInvocationHandlerInstrumentation.java

@@ -15,7 +15,6 @@
 import elemental.json.JsonObject;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import javax.annotation.Nullable;
@@ -63,7 +62,7 @@ private HandleAdviceScope(VaadinRpcRequest request, Context context, Scope scope
       @Nullable
       public static HandleAdviceScope start(
           RpcInvocationHandler handler, String methodName, JsonObject jsonObject) {
-        Context parentContext = Java8BytecodeBridge.currentContext();
+        Context parentContext = Context.current();
         VaadinRpcRequest request = VaadinRpcRequest.create(handler, methodName, jsonObject);
         if (!rpcInstrumenter().shouldStart(parentContext, request)) {
           return null;