Skip to content

Commit 849f65a

Browse files
committed
Revert "Apply filter order to ServerHttpObservationFilter"
This reverts commit efcc65b.
1 parent 6055341 commit 849f65a

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.springframework.boot.web.servlet.FilterRegistrationBean;
4141
import org.springframework.context.annotation.Bean;
4242
import org.springframework.context.annotation.Configuration;
43+
import org.springframework.core.Ordered;
4344
import org.springframework.core.annotation.Order;
4445
import org.springframework.http.server.observation.DefaultServerRequestObservationConvention;
4546
import org.springframework.http.server.observation.ServerRequestObservationConvention;
@@ -53,7 +54,6 @@
5354
* @author Brian Clozel
5455
* @author Jon Schneider
5556
* @author Dmytro Nosan
56-
* @author Moritz Halbritter
5757
* @since 3.0.0
5858
*/
5959
@AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class,
@@ -74,7 +74,7 @@ public FilterRegistrationBean<ServerHttpObservationFilter> webMvcObservationFilt
7474
.getIfAvailable(() -> new DefaultServerRequestObservationConvention(name));
7575
ServerHttpObservationFilter filter = new ServerHttpObservationFilter(registry, convention);
7676
FilterRegistrationBean<ServerHttpObservationFilter> registration = new FilterRegistrationBean<>(filter);
77-
registration.setOrder(observationProperties.getHttp().getServer().getFilter().getOrder());
77+
registration.setOrder(Ordered.HIGHEST_PRECEDENCE + 1);
7878
registration.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.ASYNC);
7979
return registration;
8080
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
* @author Tadaya Tsuyukubo
5858
* @author Madhura Bhave
5959
* @author Chanhyeong LEE
60-
* @author Moritz Halbritter
6160
*/
6261
@ExtendWith(OutputCaptureExtension.class)
6362
class WebMvcObservationAutoConfigurationTests {
@@ -101,15 +100,6 @@ void filterRegistrationHasExpectedDispatcherTypesAndOrder() {
101100
});
102101
}
103102

104-
@Test
105-
void filterRegistrationOrderCanBeOverridden() {
106-
this.contextRunner.withPropertyValues("management.observations.http.server.filter.order=1000")
107-
.run((context) -> {
108-
FilterRegistrationBean<?> registration = context.getBean(FilterRegistrationBean.class);
109-
assertThat(registration.getOrder()).isEqualTo(1000);
110-
});
111-
}
112-
113103
@Test
114104
void filterRegistrationBacksOffWithAnotherServerHttpObservationFilterRegistration() {
115105
this.contextRunner.withUserConfiguration(TestServerHttpObservationFilterRegistrationConfiguration.class)

0 commit comments

Comments
 (0)