Temporarily substitute ObservationFilterChainDecorator with a patched version until spring-projects/spring-security#17134 will be merged

Author: nkonev

aaa/src/main/java/name/nkonev/aaa/AaaApplication.java

@@ -3,6 +3,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.security.web.ObservationFilterChainDecorator;
+
+import java.net.URL;
+import java.net.URLClassLoader;
 
 @EnableAsync
 @SpringBootApplication(
@@ -11,6 +15,9 @@
 public class AaaApplication {
 
     public static void main(String[] args) throws Exception {
+        Class<?> cl = Class.forName("org.springframework.security.web.ObservationFilterChainDecorator", true, AaaApplication.class.getClassLoader());
+        System.out.println(cl);
+
         SpringApplication.run(AaaApplication.class, args);
     }
 }

aaa/src/main/java/name/nkonev/aaa/controllers/AaaErrorController.java

@@ -1,6 +1,7 @@
 package name.nkonev.aaa.controllers;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.micrometer.tracing.Tracer;
 import name.nkonev.aaa.config.properties.AaaProperties;
 import name.nkonev.aaa.dto.AaaError;
 import jakarta.servlet.ServletException;
@@ -24,7 +25,6 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static name.nkonev.aaa.controllers.TracerHeaderWriteFilter.EXTERNAL_TRACE_ID_HEADER;
 import static name.nkonev.aaa.utils.ServletUtils.getAcceptHeaderValues;
 
 /**
@@ -42,6 +42,9 @@ public class AaaErrorController extends AbstractErrorController {
     @Autowired
     private AaaProperties aaaProperties;
 
+    @Autowired
+    private Tracer tracer;
+
     private static final Logger LOGGER = LoggerFactory.getLogger(AaaErrorController.class);
 
     public AaaErrorController(ErrorAttributes errorAttributes, List<ErrorViewResolver> errorViewResolvers) {
@@ -120,6 +123,16 @@ private Map<String, Object> getCustomErrorAttributes(HttpServletRequest request)
     }
 
     private String getTraceId(HttpServletResponse response) {
-        return response.getHeader(EXTERNAL_TRACE_ID_HEADER);
+        var currentSpan = this.tracer.currentSpan();
+        if (currentSpan == null) {
+            return null;
+        } else {
+            var context = currentSpan.context();
+            if (context != null) {
+                var traceId = context.traceId();
+                return traceId;
+            }
+            return null;
+        }
     }
 }