more attempts

Author: jaydeluca

instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts

@@ -37,11 +37,6 @@ dependencies {
   testLibrary("org.springframework.boot:spring-boot-starter-test:3.0.0")
   testLibrary("org.springframework.boot:spring-boot-starter-web:3.0.0")
   testLibrary("org.springframework.boot:spring-boot-starter-security:3.0.0")
-
-//  // tests don't work with spring boot 4 yet
-//  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.+") // documented limitation
-//  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-web:3.+") // documented limitation
-//  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-security:3.+") // documented limitation
 }
 
 // spring 6 requires java 17

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

@@ -73,11 +73,31 @@ 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;
-        // }
+
+        // During async redispatches (e.g., after DeferredResult completes), we want to use
+        // the context stored in the request attribute (which includes async work spans)
+        // instead of the current context. We detect async redispatches using the servlet
+        // DispatcherType.
+        if (request.getDispatcherType() == jakarta.servlet.DispatcherType.ASYNC) {
+          Object storedContext =
+              request.getAttribute(
+                  "io.opentelemetry.javaagent.instrumentation.servlet.ServletHelper.Context");
+          if (storedContext instanceof Context context) {
+            parentContext = context;
+            // The stored context was created in a different thread/phase, so we need to
+            // re-initialize the ServletContextPath for this request to ensure the span
+            // name includes the correct context path.
+            //            parentContext =
+            //                io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath.init(
+            //                    parentContext,
+            //                    req -> {
+            //                      String contextPath = req.getContextPath();
+            //                      return (contextPath == null || contextPath.isEmpty()) ? null :
+            // contextPath;
+            //                    },
+            //                    request);
+          }
+        }
 
         // 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,10 +51,7 @@ public String getModuleGroup() {
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return asList(
-        new DispatcherServletInstrumentation(),
-        new HandlerAdapterInstrumentation());
-        // new WebAsyncManagerInstrumentation());
+    return asList(new DispatcherServletInstrumentation(), new HandlerAdapterInstrumentation());
   }
 
   @Override

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

@@ -50,8 +50,13 @@ protected Class<?> filterConfigClass() {
   protected ConfigurableApplicationContext setupServer() {
     SpringApplication app =
         new SpringApplication(FilteredAppConfig.class, securityConfigClass(), filterConfigClass());
+
     app.setDefaultProperties(
-        Map.of("server.port", port, "spring.web.error.include-message", "always"));
+        Map.of(
+            "server.port",
+            port,
+            testLatestDeps ? "spring.web.error.include-message" : "server.error.include-message",
+            "always"));
     return app.run();
   }