Skip to content

WebFluxTags performs unnecessary Pattern compilation when ignoring trailing slashes #24147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

WebFluxTags performs unnecessary Pattern compilation when ignoring trailing slashes #24147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions ...c/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/WebFluxTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public final class WebFluxTags {

private static final Tag EXCEPTION_NONE = Tag.of("exception", "None");

private static final Pattern TRAILING_SLASH_PATTERN = Pattern.compile("/$");
private static final Pattern FORWARD_SLASHES_PATTERN = Pattern.compile("//+");

private WebFluxTags() {
}
Expand Down Expand Up @@ -108,7 +108,7 @@ public static Tag uri(ServerWebExchange exchange, boolean ignoreTrailingSlash) {
if (pathPattern != null) {
String patternString = pathPattern.getPatternString();
if (ignoreTrailingSlash && patternString.length() > 1) {
patternString = TRAILING_SLASH_PATTERN.matcher(patternString).replaceAll("");
patternString = removeTrailingSlash(patternString);
}
if (patternString.isEmpty()) {
return URI_ROOT;
Expand All @@ -131,10 +131,18 @@ public static Tag uri(ServerWebExchange exchange, boolean ignoreTrailingSlash) {
return URI_UNKNOWN;
}

private static String removeTrailingSlash(String text) {
if (!StringUtils.hasLength(text)) {
return text;
}
return text.endsWith("/") ? text.substring(0, text.length() - 1) : text;
}

private static String getPathInfo(ServerWebExchange exchange) {
String path = exchange.getRequest().getPath().value();
String uri = StringUtils.hasText(path) ? path : "/";
return uri.replaceAll("//+", "/").replaceAll("/$", "");
String singleSlashes = FORWARD_SLASHES_PATTERN.matcher(uri).replaceAll("/");
return removeTrailingSlash(singleSlashes);
}

/**
Expand Down