post-review changes

Author: SylvainJuge

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

@@ -10,7 +10,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 io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfRequest;
@@ -50,7 +49,7 @@ private AdviceScope(JsfRequest request, Context context, Scope scope) {
 
       @Nullable
       public static AdviceScope start(@Advice.Argument(0) ActionEvent event) {
-        Context parentContext = Java8BytecodeBridge.currentContext();
+        Context parentContext = Context.current();
         JsfRequest request = new JsfRequest(event);
         if (!request.shouldStartSpan() || !instrumenter().shouldStart(parentContext, request)) {
           return null;

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

@@ -10,7 +10,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 io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfRequest;
@@ -49,8 +48,8 @@ private AdviceScope(JsfRequest request, Context context, Scope scope) {
       }
 
       @Nullable
-      public static AdviceScope start(@Advice.Argument(0) ActionEvent event) {
-        Context parentContext = Java8BytecodeBridge.currentContext();
+      public static AdviceScope start(ActionEvent event) {
+        Context parentContext = Context.current();
         JsfRequest request = new JsfRequest(event);
         if (!request.shouldStartSpan() || !instrumenter().shouldStart(parentContext, request)) {
           return null;

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

@@ -10,7 +10,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 io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfRequest;
@@ -49,8 +48,8 @@ private AdviceScope(JsfRequest request, Context context, Scope scope) {
       }
 
       @Nullable
-      public static AdviceScope start(@Advice.Argument(0) ActionEvent event) {
-        Context parentContext = Java8BytecodeBridge.currentContext();
+      public static AdviceScope start(ActionEvent event) {
+        Context parentContext = Context.current();
         JsfRequest request = new JsfRequest(event);
         if (!request.shouldStartSpan() || !instrumenter().shouldStart(parentContext, request)) {
           return null;

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

@@ -10,7 +10,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 io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfRequest;
@@ -49,8 +48,8 @@ private AdviceScope(JsfRequest request, Context context, Scope scope) {
       }
 
       @Nullable
-      public static AdviceScope start(@Advice.Argument(0) ActionEvent event) {
-        Context parentContext = Java8BytecodeBridge.currentContext();
+      public static AdviceScope start(ActionEvent event) {
+        Context parentContext = Context.current();
         JsfRequest request = new JsfRequest(event);
         if (!request.shouldStartSpan() || !instrumenter().shouldStart(parentContext, request)) {
           return null;