Commit c2315f2e authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #13286 from izeye:tag-constants

* pr/13286:
  Use more Tag constants
parents cdcb37be bd2053aa
...@@ -37,6 +37,12 @@ public final class WebFluxTags { ...@@ -37,6 +37,12 @@ public final class WebFluxTags {
private static final Tag URI_REDIRECTION = Tag.of("uri", "REDIRECTION"); private static final Tag URI_REDIRECTION = Tag.of("uri", "REDIRECTION");
private static final Tag URI_ROOT = Tag.of("uri", "root");
private static final Tag URI_UNKNOWN = Tag.of("uri", "UNKNOWN");
private static final Tag EXCEPTION_NONE = Tag.of("exception", "None");
private WebFluxTags() { private WebFluxTags() {
} }
...@@ -87,9 +93,12 @@ public final class WebFluxTags { ...@@ -87,9 +93,12 @@ public final class WebFluxTags {
return URI_NOT_FOUND; return URI_NOT_FOUND;
} }
String path = exchange.getRequest().getPath().value(); String path = exchange.getRequest().getPath().value();
return Tag.of("uri", path.isEmpty() ? "root" : path); if (path.isEmpty()) {
return URI_ROOT;
}
return Tag.of("uri", path);
} }
return Tag.of("uri", "UNKNOWN"); return URI_UNKNOWN;
} }
/** /**
...@@ -102,7 +111,7 @@ public final class WebFluxTags { ...@@ -102,7 +111,7 @@ public final class WebFluxTags {
if (exception != null) { if (exception != null) {
return Tag.of("exception", exception.getClass().getSimpleName()); return Tag.of("exception", exception.getClass().getSimpleName());
} }
return Tag.of("exception", "none"); return EXCEPTION_NONE;
} }
} }
...@@ -40,6 +40,8 @@ public final class WebMvcTags { ...@@ -40,6 +40,8 @@ public final class WebMvcTags {
private static final Tag URI_REDIRECTION = Tag.of("uri", "REDIRECTION"); private static final Tag URI_REDIRECTION = Tag.of("uri", "REDIRECTION");
private static final Tag URI_ROOT = Tag.of("uri", "root");
private static final Tag URI_UNKNOWN = Tag.of("uri", "UNKNOWN"); private static final Tag URI_UNKNOWN = Tag.of("uri", "UNKNOWN");
private static final Tag EXCEPTION_NONE = Tag.of("exception", "None"); private static final Tag EXCEPTION_NONE = Tag.of("exception", "None");
...@@ -97,7 +99,10 @@ public final class WebMvcTags { ...@@ -97,7 +99,10 @@ public final class WebMvcTags {
} }
} }
String pathInfo = getPathInfo(request); String pathInfo = getPathInfo(request);
return Tag.of("uri", pathInfo.isEmpty() ? "root" : pathInfo); if (pathInfo.isEmpty()) {
return URI_ROOT;
}
return Tag.of("uri", pathInfo);
} }
return URI_UNKNOWN; return URI_UNKNOWN;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment