diff --git a/web/src/main/java/org/springframework/security/web/ObservationFilterChainDecorator.java b/web/src/main/java/org/springframework/security/web/ObservationFilterChainDecorator.java index e4dc43dddfe..6586bb7521e 100644 --- a/web/src/main/java/org/springframework/security/web/ObservationFilterChainDecorator.java +++ b/web/src/main/java/org/springframework/security/web/ObservationFilterChainDecorator.java @@ -37,6 +37,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.core.log.LogMessage; +import org.springframework.util.StringUtils; /** * A {@link org.springframework.security.web.FilterChainProxy.FilterChainDecorator} that @@ -519,8 +520,8 @@ public KeyValues getLowCardinalityKeyValues(FilterChainObservationContext contex return KeyValues.of(CHAIN_SIZE_NAME, String.valueOf(context.getChainSize())) .and(CHAIN_POSITION_NAME, String.valueOf(context.getChainPosition())) .and(FILTER_SECTION_NAME, context.getFilterSection()) - .and(FILTER_NAME, (context.getFilterName() != null && !context.getFilterName().isEmpty()) - ? context.getFilterName() : KeyValue.NONE_VALUE); + .and(FILTER_NAME, (StringUtils.hasText(context.getFilterName())) ? context.getFilterName() + : KeyValue.NONE_VALUE); } @Override diff --git a/web/src/main/java/org/springframework/security/web/server/ObservationWebFilterChainDecorator.java b/web/src/main/java/org/springframework/security/web/server/ObservationWebFilterChainDecorator.java index fca2092e77c..7d947722405 100644 --- a/web/src/main/java/org/springframework/security/web/server/ObservationWebFilterChainDecorator.java +++ b/web/src/main/java/org/springframework/security/web/server/ObservationWebFilterChainDecorator.java @@ -34,6 +34,7 @@ import org.springframework.lang.Nullable; import org.springframework.util.Assert; +import org.springframework.util.StringUtils; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; @@ -689,8 +690,8 @@ public KeyValues getLowCardinalityKeyValues(WebFilterChainObservationContext con return KeyValues.of(CHAIN_SIZE_NAME, String.valueOf(context.getChainSize())) .and(CHAIN_POSITION_NAME, String.valueOf(context.getChainPosition())) .and(FILTER_SECTION_NAME, context.getFilterSection()) - .and(FILTER_NAME, (context.getFilterName() != null && !context.getFilterName().isEmpty()) - ? context.getFilterName() : KeyValue.NONE_VALUE); + .and(FILTER_NAME, (StringUtils.hasText(context.getFilterName())) ? context.getFilterName() + : KeyValue.NONE_VALUE); } @Override