don't use context customizer

Author: laurit

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationSingletons.java

@@ -9,7 +9,6 @@
 
 import application.io.opentelemetry.instrumentation.annotations.WithSpan;
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.annotation.support.MethodSpanAttributesExtractor;
@@ -67,7 +66,6 @@ private static Instrumenter<Method, Object> createInstrumenter() {
             INSTRUMENTATION_NAME,
             AnnotationSingletons::spanNameFromMethod)
         .addAttributesExtractor(CodeAttributesExtractor.create(MethodCodeAttributesGetter.INSTANCE))
-        .addContextCustomizer(AnnotationSingletons::inheritContextFromMethod)
         .buildInstrumenter(AnnotationSingletons::spanKindFromMethod);
   }
 
@@ -83,7 +81,6 @@ private static Instrumenter<MethodRequest, Object> createInstrumenterWithAttribu
                 MethodRequest::method,
                 WithSpanParameterAttributeNamesExtractor.INSTANCE,
                 MethodRequest::args))
-        .addContextCustomizer(AnnotationSingletons::inheritContextFromMethodRequest)
         .buildInstrumenter(AnnotationSingletons::spanKindFromMethodRequest);
   }
 
@@ -126,27 +123,23 @@ private static String spanNameFromMethod(Method method) {
     return spanName;
   }
 
-  private static Context inheritContextFromMethodRequest(
-      Context context, MethodRequest request, Attributes attributes) {
-    return inheritContextFromMethod(context, request.method(), attributes);
+  public static Context getContextForMethod(Method method) {
+    return inheritContextFromMethod(method) ? Context.current() : Context.root();
   }
 
-  private static Context inheritContextFromMethod(
-      Context context, Method method, Attributes attributes) {
+  private static boolean inheritContextFromMethod(Method method) {
     if (inheritContextMethodHandle == null) {
-      return context;
+      return true;
     }
 
     WithSpan annotation = method.getDeclaredAnnotation(WithSpan.class);
-
-    boolean inheritContext = true;
     try {
-      inheritContext = (boolean) inheritContextMethodHandle.invoke(annotation);
+      return (boolean) inheritContextMethodHandle.invoke(annotation);
     } catch (Throwable ignore) {
       // ignore
     }
 
-    return inheritContext ? context : Context.root();
+    return true;
   }
 
   private AnnotationSingletons() {}

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/WithSpanInstrumentation.java

@@ -19,7 +19,6 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndSupport;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.lang.reflect.Method;
@@ -91,7 +90,7 @@ public static void onEnter(
       method = originMethod;
 
       Instrumenter<Method, Object> instrumenter = instrumenter();
-      Context current = Java8BytecodeBridge.currentContext();
+      Context current = AnnotationSingletons.getContextForMethod(method);
 
       if (instrumenter.shouldStart(current, method)) {
         context = instrumenter.start(current, method);
@@ -134,7 +133,7 @@ public static void onEnter(
       method = originMethod;
 
       Instrumenter<MethodRequest, Object> instrumenter = instrumenterWithAttributes();
-      Context current = Java8BytecodeBridge.currentContext();
+      Context current = AnnotationSingletons.getContextForMethod(method);
       request = new MethodRequest(method, args);
 
       if (instrumenter.shouldStart(current, request)) {