root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Apply filter order to ServerHttpObservationFilter" 

This reverts commit efcc65bc5b.
This commit is contained in:
Moritz Halbritter 2023-06-30 13:47:04 +02:00
parent 60553415d0
commit 849f65a0de
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/WebMvcObservationAutoConfiguration.java
View File

@ -40,6 +40,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.http.server.observation.DefaultServerRequestObservationConvention; import org.springframework.http.server.observation.DefaultServerRequestObservationConvention;
import org.springframework.http.server.observation.ServerRequestObservationConvention; import org.springframework.http.server.observation.ServerRequestObservationConvention;
@ -53,7 +54,6 @@ import org.springframework.web.servlet.DispatcherServlet;
* @author Brian Clozel * @author Brian Clozel
* @author Jon Schneider * @author Jon Schneider
* @author Dmytro Nosan * @author Dmytro Nosan
* @author Moritz Halbritter
* @since 3.0.0 * @since 3.0.0
*/ */
@AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class, @AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class,
@ -74,7 +74,7 @@ public class WebMvcObservationAutoConfiguration {
.getIfAvailable(() -> new DefaultServerRequestObservationConvention(name)); .getIfAvailable(() -> new DefaultServerRequestObservationConvention(name));
ServerHttpObservationFilter filter = new ServerHttpObservationFilter(registry, convention); ServerHttpObservationFilter filter = new ServerHttpObservationFilter(registry, convention);
FilterRegistrationBean<ServerHttpObservationFilter> registration = new FilterRegistrationBean<>(filter); FilterRegistrationBean<ServerHttpObservationFilter> registration = new FilterRegistrationBean<>(filter);
registration.setOrder(observationProperties.getHttp().getServer().getFilter().getOrder()); registration.setOrder(Ordered.HIGHEST_PRECEDENCE + 1);
registration.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.ASYNC); registration.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.ASYNC);
return registration; return registration;
} }

10
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/WebMvcObservationAutoConfigurationTests.java
View File

@ -57,7 +57,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
* @author Tadaya Tsuyukubo * @author Tadaya Tsuyukubo
* @author Madhura Bhave * @author Madhura Bhave
* @author Chanhyeong LEE * @author Chanhyeong LEE
* @author Moritz Halbritter
*/ */
@ExtendWith(OutputCaptureExtension.class) @ExtendWith(OutputCaptureExtension.class)
class WebMvcObservationAutoConfigurationTests { class WebMvcObservationAutoConfigurationTests {
@ -101,15 +100,6 @@ class WebMvcObservationAutoConfigurationTests {
}); });
} }
@Test
void filterRegistrationOrderCanBeOverridden() {
this.contextRunner.withPropertyValues("management.observations.http.server.filter.order=1000")
.run((context) -> {
FilterRegistrationBean<?> registration = context.getBean(FilterRegistrationBean.class);
assertThat(registration.getOrder()).isEqualTo(1000);
});
}
@Test @Test
void filterRegistrationBacksOffWithAnotherServerHttpObservationFilterRegistration() { void filterRegistrationBacksOffWithAnotherServerHttpObservationFilterRegistration() {
this.contextRunner.withUserConfiguration(TestServerHttpObservationFilterRegistrationConfiguration.class) this.contextRunner.withUserConfiguration(TestServerHttpObservationFilterRegistrationConfiguration.class)