From 12b87896575a03ba290dcea624e0ae42a2bb1549 Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Mon, 25 Nov 2019 15:57:05 -0800 Subject: [PATCH 1/3] Added some useful text into exception. --- .../java/com/azure/core/http/policy/HttpLoggingPolicy.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java index 78916a4b2072..c403ca87b5d8 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java @@ -88,7 +88,8 @@ private Mono logRequest(final ClientLogger logger, final HttpRequest reque requestUrl.setQuery(getAllowedQueryString(request.getUrl().getQuery())); logger.info("--> {} {}", request.getHttpMethod(), requestUrl.toUrl()); } catch (MalformedURLException ex) { - return Mono.error(logger.logExceptionAsWarning(new IllegalStateException("Invalid request URL."))); + return Mono.error(logger.logExceptionAsWarning(new IllegalStateException("Invalid request URL. URL: " + + request.getUrl()))); } } From 5bbec292c398f882a5a5cefc4790aa106a3adb9d Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 26 Nov 2019 09:48:32 -0800 Subject: [PATCH 2/3] Make some changes to log and hide the secret info from log. --- .../core/http/policy/HttpLoggingPolicy.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java index c403ca87b5d8..906492e62b1b 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java @@ -83,14 +83,9 @@ public Mono process(HttpPipelineCallContext context, HttpPipelineN private Mono logRequest(final ClientLogger logger, final HttpRequest request) { final HttpLogDetailLevel httpLogLevel = httpLogOptions.getLogLevel(); if (httpLogLevel.shouldLogUrl()) { - try { - UrlBuilder requestUrl = UrlBuilder.parse(request.getUrl()); - requestUrl.setQuery(getAllowedQueryString(request.getUrl().getQuery())); - logger.info("--> {} {}", request.getHttpMethod(), requestUrl.toUrl()); - } catch (MalformedURLException ex) { - return Mono.error(logger.logExceptionAsWarning(new IllegalStateException("Invalid request URL. URL: " - + request.getUrl()))); - } + UrlBuilder requestUrl = UrlBuilder.parse(request.getUrl()); + requestUrl.setQuery(getAllowedQueryString(request.getUrl().getQuery())); + logger.info("--> {} {}", request.getHttpMethod(), requestUrl.toString()); } if (httpLogLevel.shouldLogHeaders()) { @@ -197,9 +192,10 @@ private Function> logResponseDelegate(final Cli bodySize = contentLengthString + "-byte"; } HttpLogDetailLevel httpLogLevel = httpLogOptions.getLogLevel(); - // HttpResponseStatus responseStatus = HttpResponseStatus.valueOf(response.statusCode()); if (httpLogLevel.shouldLogUrl()) { - logger.info("<-- {} {} ({} ms, {} body)", response.getStatusCode(), url, tookMs, bodySize); + UrlBuilder requestUrl = UrlBuilder.parse(url); + requestUrl.setQuery(getAllowedQueryString(url.getQuery())); + logger.info("<-- {} {} ({} ms, {} body)", response.getStatusCode(), requestUrl.toString(), tookMs, bodySize); } if (httpLogLevel.shouldLogHeaders()) { From 984ab45ce1ebee47bd1bc76767db5ba0e4a8249f Mon Sep 17 00:00:00 2001 From: Sima Zhu Date: Tue, 26 Nov 2019 11:02:41 -0800 Subject: [PATCH 3/3] Fix linting --- .../java/com/azure/core/http/policy/HttpLoggingPolicy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java index 906492e62b1b..958a88324356 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.databind.SerializationFeature; import reactor.core.publisher.Mono; -import java.net.MalformedURLException; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.Locale; @@ -195,7 +194,8 @@ private Function> logResponseDelegate(final Cli if (httpLogLevel.shouldLogUrl()) { UrlBuilder requestUrl = UrlBuilder.parse(url); requestUrl.setQuery(getAllowedQueryString(url.getQuery())); - logger.info("<-- {} {} ({} ms, {} body)", response.getStatusCode(), requestUrl.toString(), tookMs, bodySize); + logger.info("<-- {} {} ({} ms, {} body)", response.getStatusCode(), requestUrl.toString(), tookMs, + bodySize); } if (httpLogLevel.shouldLogHeaders()) {