Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Auto-detect observability beans in WebHttpHandlerBuilder

Browse Source 
This commit ensures that both `ObservationRegsitry` and
`ServerRequestObservationConvention` beans are automatically detected in
the application context if they are unique. This aligns with the
existing behavior for all other builder methods.

Closes gh-31205
This commit is contained in:
Brian Clozel
2023-09-11 21:17:14 +02:00
parent dfd631e662
commit 19588d413d
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web/src/main/java/org/springframework/web/server/adapter/WebHttpHandlerBuilder.java
View File

@@ -162,6 +162,10 @@ public final class WebHttpHandlerBuilder {
* ordered.
* <li>{@link HttpHandlerDecoratorFactory} [0..N] -- detected by type and
* ordered.
* <li>{@link ObservationRegistry} -- detected by type and
* configured if unique.
* <li>{@link ServerRequestObservationConvention} -- detected by type and
* configured if unique.
* <li>{@link WebSessionManager} [0..1] -- looked up by the name
* {@link #WEB_SESSION_MANAGER_BEAN_NAME}.
* <li>{@link ServerCodecConfigurer} [0..1] -- looked up by the name
@@ -193,6 +197,9 @@ public final class WebHttpHandlerBuilder {
.orderedStream()
.forEach(builder::httpHandlerDecorator);
context.getBeanProvider(ObservationRegistry.class).ifUnique(builder::observationRegistry);
context.getBeanProvider(ServerRequestObservationConvention.class).ifUnique(builder::observationConvention);
try {
builder.sessionManager(
context.getBean(WEB_SESSION_MANAGER_BEAN_NAME, WebSessionManager.class));