From 75d1278bde0e3308e7a957492222fcba094514d6 Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Tue, 7 Nov 2023 16:24:01 +0000 Subject: [PATCH 1/2] Include port when logging URI in DefaultWebClient Closes gh-30519 --- .../web/reactive/function/client/DefaultWebClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java index 854cba139e8..b459f5ec3f6 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java @@ -698,7 +698,7 @@ final class DefaultWebClient implements WebClient { private static URI getUriToLog(URI uri) { if (StringUtils.hasText(uri.getQuery())) { try { - uri = new URI(uri.getScheme(), uri.getHost(), uri.getPath(), null); + uri = new URI(uri.getScheme(), null, uri.getHost(), uri.getPort(), uri.getPath(), null, null); } catch (URISyntaxException ex) { // ignore From 77141109400941aa30f6619511dcc229ed291f47 Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Tue, 7 Nov 2023 16:35:23 +0000 Subject: [PATCH 2/2] Polishing in DefaultWebClient --- .../web/reactive/function/client/DefaultWebClient.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java index b459f5ec3f6..84a738c316e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java @@ -79,7 +79,9 @@ final class DefaultWebClient implements WebClient { private static final Mono NO_HTTP_CLIENT_RESPONSE_ERROR = Mono.error( () -> new IllegalStateException("The underlying HTTP client completed without emitting a response.")); - private static final DefaultClientRequestObservationConvention DEFAULT_OBSERVATION_CONVENTION = new DefaultClientRequestObservationConvention(); + private static final DefaultClientRequestObservationConvention DEFAULT_OBSERVATION_CONVENTION = + new DefaultClientRequestObservationConvention(); + private final ExchangeFunction exchangeFunction; @@ -119,10 +121,10 @@ final class DefaultWebClient implements WebClient { this.uriBuilderFactory = uriBuilderFactory; this.defaultHeaders = defaultHeaders; this.defaultCookies = defaultCookies; - this.observationRegistry = observationRegistry; - this.observationConvention = observationConvention; this.defaultRequest = defaultRequest; this.defaultStatusHandlers = initStatusHandlers(statusHandlerMap); + this.observationRegistry = observationRegistry; + this.observationConvention = observationConvention; this.builder = builder; }