more deferred stuff

Author: jaydeluca

instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/HandlerAdapterInstrumentation.java

@@ -73,6 +73,11 @@ public static AdviceScope enter(HttpServletRequest request, Object handler) {
         }
 
         Context parentContext = Context.current();
+        // TODO: Handle async context propagation for DeferredResult
+        // Context storedAsyncContext = WebAsyncManagerInstrumentation.getAsyncContext(request);
+        // if (storedAsyncContext != null) {
+        //   parentContext = storedAsyncContext;
+        // }
 
         // don't start a new top-level span
         if (!Span.fromContext(parentContext).getSpanContext().isValid()) {

instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcInstrumentationModule.java

@@ -51,7 +51,10 @@ public String getModuleGroup() {
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return asList(new DispatcherServletInstrumentation(), new HandlerAdapterInstrumentation());
+    return asList(
+        new DispatcherServletInstrumentation(),
+        new HandlerAdapterInstrumentation());
+        // new WebAsyncManagerInstrumentation());
   }
 
   @Override

instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/WebAsyncManagerInstrumentation.java

@@ -14,6 +14,7 @@
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
@@ -50,19 +51,8 @@ public static void onEnter() {
       // This is the context that includes the async work (e.g., the async-call-child span)
       // and should be used when the handler is redispatched
       Context currentContext = Java8BytecodeBridge.currentContext();
-      WebAsyncManagerContext.setViaRequestContextHolder(currentContext);
-    }
-  }
-
-  // Helper class to store and retrieve context for async processing
-  public static class WebAsyncManagerContext {
-    public static final String CONTEXT_ATTRIBUTE =
-        "io.opentelemetry.javaagent.spring.webmvc.async.Context";
 
-    private WebAsyncManagerContext() {}
-
-    static void setViaRequestContextHolder(Context context) {
-      // Use Spring's RequestContextHolder to access the current request and store the context
+      // Store context in request attributes via Spring's RequestContextHolder
       try {
         Class<?> requestContextHolderClass =
             Class.forName("org.springframework.web.context.request.RequestContextHolder");
@@ -72,25 +62,30 @@ static void setViaRequestContextHolder(Context context) {
           requestAttributes
               .getClass()
               .getMethod("setAttribute", String.class, Object.class, int.class)
-              .invoke(requestAttributes, CONTEXT_ATTRIBUTE, context, 0); // 0 = REQUEST_SCOPE
+              .invoke(
+                  requestAttributes,
+                  "io.opentelemetry.javaagent.spring.webmvc.async.Context",
+                  currentContext,
+                  0); // 0 = REQUEST_SCOPE
         }
       } catch (Exception e) {
         // Ignore - best effort
       }
     }
+  }
 
-    @Nullable
-    public static Context getFromRequest(Object request) {
-      try {
-        return (Context)
-            request
-                .getClass()
-                .getMethod("getAttribute", String.class)
-                .invoke(request, CONTEXT_ATTRIBUTE);
-      } catch (Exception e) {
-        // Ignore - best effort
-        return null;
-      }
+  // Helper method to retrieve the stored async context from the request
+  @Nullable
+  public static Context getAsyncContext(HttpServletRequest request) {
+    try {
+      return (Context)
+          request
+              .getClass()
+              .getMethod("getAttribute", String.class)
+              .invoke(request, "io.opentelemetry.javaagent.spring.webmvc.async.Context");
+    } catch (Exception e) {
+      // Ignore - best effort
+      return null;
     }
   }
 }