Merge branch '1.5.x'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceProperties.java

@@ -142,7 +142,7 @@ public class TraceProperties {
 		REMOTE_USER,
 
 		/**
-		 * Include the time taken to service the request.
+		 * Include the time taken to service the request in milliseconds.
 		 */
 		TIME_TAKEN
 

spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

@@ -1346,6 +1346,28 @@ and obtain basic information about the last 100 requests:
 	}]
 ----
 
+The following are included in the trace by default:
+
+[cols="1,2"]
+|===
+|Name |Description
+
+|Request Headers
+|Headers from the request.
+
+|Response Headers
+|Headers from the response.
+
+|Cookies
+|`Cookie` from request headers and `Set-Cookie` from response headers.
+
+|Errors
+|The error attributes (if any).
+
+|Time Taken
+|The time taken to service the request in milliseconds.
+|===
+
 
 
 [[production-ready-custom-tracing]]