From 946593238efaa475ea5a69c909498448735ad8ab Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Fri, 26 Jan 2018 19:50:57 +0900 Subject: [PATCH] Align missed bits from trace endpoint changes Closes gh-11789 --- ...{TraceEndpointTests.java => HttpTraceEndpointTests.java} | 2 +- .../src/main/asciidoc/appendix-application-properties.adoc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/trace/{TraceEndpointTests.java => HttpTraceEndpointTests.java} (97%) diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/trace/TraceEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/trace/HttpTraceEndpointTests.java similarity index 97% rename from spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/trace/TraceEndpointTests.java rename to spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/trace/HttpTraceEndpointTests.java index 87d86fc72a..60b78fafca 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/trace/TraceEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/web/trace/HttpTraceEndpointTests.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.mock; * @author Phillip Webb * @author Andy Wilkinson */ -public class TraceEndpointTests { +public class HttpTraceEndpointTests { @Test public void trace() { diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 5c945cd984..f6b7c07382 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -1254,7 +1254,7 @@ content into your application. Rather, pick only the properties that you need. management.endpoint.threaddump.cache.time-to-live=0ms # Maximum time that a response can be cached. management.endpoint.threaddump.enabled= # Whether to enable the threaddump endpoint. - # TRACE ENDPOINT ({sc-spring-boot-actuator}/trace/TraceEndpoint.{sc-ext}[TraceEndpoint]) + # TRACE ENDPOINT ({sc-spring-boot-actuator}/web/trace/HttpTraceEndpoint.{sc-ext}[HttpTraceEndpoint]) management.endpoint.trace.cache.time-to-live=0ms # Maximum time that a response can be cached. management.endpoint.trace.enabled= # Whether to enable the trace endpoint. @@ -1378,8 +1378,8 @@ content into your application. Rather, pick only the properties that you need. management.metrics.web.server.record-request-percentiles=false # Whether instrumented requests record percentiles histogram buckets by default. management.metrics.web.server.requests-metric-name=http.server.requests # Name of the metric for received requests. - # TRACING ({sc-spring-boot-actuator-autoconfigure}/trace/TraceEndpointProperties.{sc-ext}[TraceEndpointProperties]) - management.trace.filter.enabled=true # Whether to enable the trace servlet filter. + # TRACING ({sc-spring-boot-actuator-autoconfigure}/web/trace/TraceProperties.{sc-ext}[TraceProperties]) + management.trace.enabled=true # Whether to enable HTTP request-response tracing. management.trace.include=request-headers,response-headers,cookies,errors # Items to be included in the trace.