Remove workarounds now that there is auto-config for MVC

See spring-projects/spring-boot#32538

Author: shakuzen

micrometer-samples-boot3-database/src/main/java/io/micrometer/boot3/samples/db/PrometheusAndZipkinWithBraveAndDatabaseSample.java

@@ -17,17 +17,11 @@
 
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationHandler;
-import io.micrometer.observation.ObservationRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.web.filter.ServerHttpObservationFilter;
-
-import static jakarta.servlet.DispatcherType.*;
-import static org.springframework.core.Ordered.LOWEST_PRECEDENCE;
 
 @SpringBootApplication
 public class PrometheusAndZipkinWithBraveAndDatabaseSample {
@@ -36,16 +30,6 @@ public static void main(String[] args) {
         SpringApplication.run(PrometheusAndZipkinWithBraveAndDatabaseSample.class, args);
     }
 
-    // TODO: remove after Boot auto-configuration is added
-    @Bean
-    FilterRegistrationBean<ServerHttpObservationFilter> traceWebFilter(ObservationRegistry observationRegistry) {
-        var filterRegistrationBean = new FilterRegistrationBean<>(new ServerHttpObservationFilter(observationRegistry));
-        filterRegistrationBean.setDispatcherTypes(ASYNC, ERROR, FORWARD, INCLUDE, REQUEST);
-        filterRegistrationBean.setOrder(LOWEST_PRECEDENCE);
-
-        return filterRegistrationBean;
-    }
-
     @Bean
     ObservationHandler<Observation.Context> errorHandler() {
         return new ObservationHandler<Observation.Context>() {

micrometer-samples-boot3/src/main/java/io/micrometer/boot3/samples/PrometheusAndZipkinWithBraveSample.java

@@ -17,17 +17,11 @@
 
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationHandler;
-import io.micrometer.observation.ObservationRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.web.filter.ServerHttpObservationFilter;
-
-import static jakarta.servlet.DispatcherType.*;
-import static org.springframework.core.Ordered.LOWEST_PRECEDENCE;
 
 @SpringBootApplication
 public class PrometheusAndZipkinWithBraveSample {
@@ -36,16 +30,6 @@ public static void main(String[] args) {
         SpringApplication.run(PrometheusAndZipkinWithBraveSample.class, args);
     }
 
-    // TODO: remove after Boot auto-configuration is added
-    @Bean
-    FilterRegistrationBean<ServerHttpObservationFilter> traceWebFilter(ObservationRegistry observationRegistry) {
-        var filterRegistrationBean = new FilterRegistrationBean<>(new ServerHttpObservationFilter(observationRegistry));
-        filterRegistrationBean.setDispatcherTypes(ASYNC, ERROR, FORWARD, INCLUDE, REQUEST);
-        filterRegistrationBean.setOrder(LOWEST_PRECEDENCE);
-
-        return filterRegistrationBean;
-    }
-
     @Bean
     ObservationHandler<Observation.Context> errorHandler() {
         return new ObservationHandler<Observation.Context>() {

mvc/src/main/java/com/example/micrometer/MvcApplication.java

@@ -20,13 +20,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
-
 @SpringBootApplication
 public class MvcApplication {
 
@@ -47,19 +43,10 @@ class MvcController {
         this.tracer = tracer;
     }
 
-    // TODO: Uncomment this once Mvc gets instrumented in Framework
-    // @GetMapping("/")
-    // public String span() {
-    // String traceId = this.tracer.currentSpan().context().traceId();
-    // log.info("<ACCEPTANCE_TEST> <TRACE:{}> Hello from producer", traceId);
-    // return traceId;
-    // }
-
     @GetMapping("/")
-    public String span(@RequestHeader Map<String, String> headers) {
-        String traceId = headers.get("traceparent");
-        Assert.notNull(traceId, "traceparent must not be null");
-        log.info("<ACCEPTANCE_TEST> <TRACE:{}> Hello from producer", traceId.split("-")[1]);
+    public String span() {
+        String traceId = this.tracer.currentSpan().context().traceId();
+        log.info("<ACCEPTANCE_TEST> <TRACE:{}> Hello from producer", traceId);
         return traceId;
     }