Merge branch '3.x'

cloudfoundry · Jun 16, 2020 · f6121c0 · f6121c0
2 parents 138c3d9 + e787600
commit f6121c0
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/RequestLogger.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/RequestLogger.java
@@ -47,9 +47,19 @@ public void response(HttpClientResponse response) {
         List<String> warnings = response.responseHeaders().getAll(CF_WARNINGS);
 
         if (warnings.isEmpty()) {
-            RESPONSE_LOGGER.debug("{}    {} ({})", response.status().code(), response.uri(), elapsed);
+            if (RESPONSE_LOGGER.isTraceEnabled()) {
+                RESPONSE_LOGGER.debug("{}    {} ({}, {})", response.status().code(), response.uri(), elapsed, response.responseHeaders().get("X-Vcap-Request-Id"));
+            } else {
+                RESPONSE_LOGGER.debug("{}    {} ({})", response.status().code(), response.uri(), elapsed);
+            }
         } else {
-            RESPONSE_LOGGER.warn("{}    {} ({}) [{}]", response.status().code(), response.uri(), elapsed, String.join(", ", warnings));
+            if (RESPONSE_LOGGER.isTraceEnabled()) {
+                RESPONSE_LOGGER.warn("{}    {} ({}, {}) [{}]", response.status().code(), response.uri(), elapsed, response.responseHeaders().get("X-Vcap-Request-Id"),
+                    String.join(", ", warnings));
+            } else {
+                RESPONSE_LOGGER.warn("{}    {} ({}) [{}]", response.status().code(), response.uri(), elapsed, String.join(", ", warnings));
+
+            }
         }
     }