Rename trace to httptrace

Closes gh-11806

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/endpoints/httptrace.adoc

@@ -0,0 +1,29 @@
+[[http-trace]]
+= HTTP Trace (`httptrace`)
+
+The `httptrace` endpoint provides information about HTTP request-response exchanges.
+
+
+
+[[http-trace-retrieving]]
+== Retrieving the Traces
+
+To retrieve the traces, make a `GET` request to `/actuator/httptrace`, as shown in the
+following curl-based example:
+
+include::{snippets}httptrace/curl-request.adoc[]
+
+The resulting response is similar to the following:
+
+include::{snippets}httptrace/http-response.adoc[]
+
+
+
+[[http-trace-retrieving-response-structure]]
+=== Response Structure
+
+The response contains details of the traced HTTP request-response exchanges. The
+following table describes the structure of the response:
+
+[cols="2,1,3"]
+include::{snippets}httptrace/response-fields.adoc[]

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/endpoints/trace.adoc

@@ -1,29 +0,0 @@
-[[trace]]
-= Trace (`trace`)
-
-The `trace` endpoint provides information about HTTP request-response exchanges.
-
-
-
-[[trace-retrieving]]
-== Retrieving the Traces
-
-To retrieve the traces, make a `GET` request to `/actuator/trace`, as shown in the
-following curl-based example:
-
-include::{snippets}trace/curl-request.adoc[]
-
-The resulting response is similar to the following:
-
-include::{snippets}trace/http-response.adoc[]
-
-
-
-[[trace-retrieving-response-structure]]
-=== Response Structure
-
-The response contains details of the traced HTTP request-response exchanges. The
-following table describes the structure of the response:
-
-[cols="2,1,3"]
-include::{snippets}trace/response-fields.adoc[]

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/index.adoc

@@ -57,6 +57,7 @@ include::endpoints/env.adoc[leveloffset=+1]
 include::endpoints/flyway.adoc[leveloffset=+1]
 include::endpoints/health.adoc[leveloffset=+1]
 include::endpoints/heapdump.adoc[leveloffset=+1]
+include::endpoints/httptrace.adoc[leveloffset=+1]
 include::endpoints/info.adoc[leveloffset=+1]
 include::endpoints/liquibase.adoc[leveloffset=+1]
 include::endpoints/logfile.adoc[leveloffset=+1]
@@ -68,4 +69,3 @@ include::endpoints/scheduledtasks.adoc[leveloffset=+1]
 include::endpoints/sessions.adoc[leveloffset=+1]
 include::endpoints/shutdown.adoc[leveloffset=+1]
 include::endpoints/threaddump.adoc[leveloffset=+1]
-include::endpoints/trace.adoc[leveloffset=+1]

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceAutoConfiguration.java

@@ -38,9 +38,9 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 @ConditionalOnWebApplication
-@ConditionalOnProperty(prefix = "management.trace", name = "enabled", matchIfMissing = true)
-@EnableConfigurationProperties(TraceProperties.class)
-public class TraceAutoConfiguration {
+@ConditionalOnProperty(prefix = "management.httptrace", name = "enabled", matchIfMissing = true)
+@EnableConfigurationProperties(HttpTraceProperties.class)
+public class HttpTraceAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(HttpTraceRepository.class)
@@ -50,7 +50,7 @@ public class TraceAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public HttpExchangeTracer httpExchangeTracer(TraceProperties traceProperties) {
+	public HttpExchangeTracer httpExchangeTracer(HttpTraceProperties traceProperties) {
 		return new HttpExchangeTracer(traceProperties.getInclude());
 	}
 
@@ -72,7 +72,7 @@ public class TraceAutoConfiguration {
 		@Bean
 		@ConditionalOnMissingBean
 		public HttpTraceWebFilter httpTraceWebFilter(HttpTraceRepository repository,
-				HttpExchangeTracer tracer, TraceProperties traceProperties) {
+				HttpExchangeTracer tracer, HttpTraceProperties traceProperties) {
 			return new HttpTraceWebFilter(repository, tracer,
 					traceProperties.getInclude());
 		}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceEndpointAutoConfiguration.java

@@ -33,14 +33,14 @@ import org.springframework.context.annotation.Configuration;
  * @since 2.0.0
  */
 @Configuration
-@AutoConfigureAfter(TraceAutoConfiguration.class)
-public class TraceEndpointAutoConfiguration {
+@AutoConfigureAfter(HttpTraceAutoConfiguration.class)
+public class HttpTraceEndpointAutoConfiguration {
 
 	@Bean
 	@ConditionalOnBean(HttpTraceRepository.class)
 	@ConditionalOnMissingBean
 	@ConditionalOnEnabledEndpoint
-	public HttpTraceEndpoint traceEndpoint(HttpTraceRepository traceRepository) {
+	public HttpTraceEndpoint httpTraceEndpoint(HttpTraceRepository traceRepository) {
 		return new HttpTraceEndpoint(traceRepository);
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceProperties.java

@@ -23,7 +23,7 @@ import org.springframework.boot.actuate.web.trace.Include;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * Configuration properties for tracing.
+ * Configuration properties for HTTP tracing.
  *
  * @author Wallace Wadge
  * @author Phillip Webb
@@ -32,8 +32,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @author Stephane Nicoll
  * @since 2.0.0
  */
-@ConfigurationProperties(prefix = "management.trace")
-public class TraceProperties {
+@ConfigurationProperties(prefix = "management.httptrace")
+public class HttpTraceProperties {
 
 	/**
 	 * Items to be included in the trace. Defaults to request headers (excluding

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -222,7 +222,7 @@
       "defaultValue": true
     },
     {
-      "name": "management.trace.enabled",
+      "name": "management.httptrace.enabled",
       "type": "java.lang.Boolean",
       "description": "Whether to enable HTTP request-response tracing.",
       "defaultValue": true
@@ -232,7 +232,7 @@
       "type": "java.lang.Boolean",
       "description": "Whether to enable the trace servlet filter.",
       "deprecation": {
-        "replacement": "management.trace.enabled",
+        "replacement": "management.httptrace.enabled",
         "level": "error"
       }
     },

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -43,8 +43,8 @@ org.springframework.boot.actuate.autoconfigure.web.mappings.MappingsEndpointAuto
 org.springframework.boot.actuate.autoconfigure.web.reactive.ReactiveManagementContextAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration,\
-org.springframework.boot.actuate.autoconfigure.web.trace.TraceAutoConfiguration,\
-org.springframework.boot.actuate.autoconfigure.web.trace.TraceEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.web.trace.HttpTraceAutoConfiguration,\
+org.springframework.boot.actuate.autoconfigure.web.trace.HttpTraceEndpointAutoConfiguration
 
 org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration=\
 org.springframework.boot.actuate.autoconfigure.endpoint.web.ServletEndpointManagementContextConfiguration,\

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HttpTraceEndpointDocumentationTests.java

@@ -76,8 +76,8 @@ public class HttpTraceEndpointDocumentationTests
 		tracer.sendingResponse(trace, response, () -> principal,
 				() -> UUID.randomUUID().toString());
 		given(this.repository.findAll()).willReturn(Arrays.asList(trace));
-		this.mockMvc.perform(get("/actuator/trace")).andExpect(status().isOk())
-				.andDo(document("trace",
+		this.mockMvc.perform(get("/actuator/httptrace")).andExpect(status().isOk())
+				.andDo(document("httptrace",
 						responseFields(
 								fieldWithPath("traces").description(
 										"An array of traced HTTP request-response exchanges."),

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/EndpointAutoConfigurationClasses.java

@@ -29,7 +29,7 @@ import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoC
 import org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.management.ThreadDumpEndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.web.mappings.MappingsEndpointAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.web.trace.TraceEndpointAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.web.trace.HttpTraceEndpointAutoConfiguration;
 
 /**
  * A list of all endpoint auto-configuration classes for use in tests.
@@ -49,7 +49,7 @@ final class EndpointAutoConfigurationClasses {
 		all.add(HealthEndpointAutoConfiguration.class);
 		all.add(InfoEndpointAutoConfiguration.class);
 		all.add(ThreadDumpEndpointAutoConfiguration.class);
-		all.add(TraceEndpointAutoConfiguration.class);
+		all.add(HttpTraceEndpointAutoConfiguration.class);
 		all.add(MappingsEndpointAutoConfiguration.class);
 		ALL = all.toArray(new Class<?>[] {});
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JmxEndpointIntegrationTests.java

@@ -28,7 +28,7 @@ import org.junit.Test;
 
 import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.web.trace.TraceAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.web.trace.HttpTraceAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
@@ -47,7 +47,7 @@ public class JmxEndpointIntegrationTests {
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(JmxAutoConfiguration.class,
 					EndpointAutoConfiguration.class, JmxEndpointAutoConfiguration.class,
-					TraceAutoConfiguration.class))
+					HttpTraceAutoConfiguration.class))
 			.withConfiguration(
 					AutoConfigurations.of(EndpointAutoConfigurationClasses.ALL));
 
@@ -57,7 +57,7 @@ public class JmxEndpointIntegrationTests {
 			MBeanServer mBeanServer = context.getBean(MBeanServer.class);
 			checkEndpointMBeans(mBeanServer,
 					new String[] { "beans", "conditions", "configprops", "env", "health",
-							"info", "mappings", "threaddump", "trace" },
+							"info", "mappings", "threaddump", "httptrace" },
 					new String[] { "shutdown" });
 		});
 	}
@@ -70,7 +70,7 @@ public class JmxEndpointIntegrationTests {
 					checkEndpointMBeans(mBeanServer, new String[0],
 							new String[] { "beans", "conditions", "configprops", "env",
 									"health", "mappings", "shutdown", "threaddump",
-									"trace" });
+									"httptrace" });
 
 				});
 	}
@@ -82,7 +82,7 @@ public class JmxEndpointIntegrationTests {
 					MBeanServer mBeanServer = context.getBean(MBeanServer.class);
 					checkEndpointMBeans(mBeanServer, new String[] { "beans" },
 							new String[] { "conditions", "configprops", "env", "health",
-									"mappings", "shutdown", "threaddump", "trace" });
+									"mappings", "shutdown", "threaddump", "httptrace" });
 				});
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebMvcEndpointExposureIntegrationTests.java

@@ -22,7 +22,7 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfi
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.web.trace.TraceAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.web.trace.HttpTraceAutoConfiguration;
 import org.springframework.boot.actuate.endpoint.web.annotation.RestControllerEndpoint;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
@@ -61,7 +61,7 @@ public class WebMvcEndpointExposureIntegrationTests {
 					ServletManagementContextAutoConfiguration.class,
 					ManagementContextAutoConfiguration.class,
 					ServletManagementContextAutoConfiguration.class,
-					TraceAutoConfiguration.class))
+					HttpTraceAutoConfiguration.class))
 			.withConfiguration(
 					AutoConfigurations.of(EndpointAutoConfigurationClasses.ALL))
 			.withUserConfiguration(CustomMvcEndpoint.class);
@@ -80,7 +80,7 @@ public class WebMvcEndpointExposureIntegrationTests {
 			assertThat(isExposed(mvc, HttpMethod.GET, "mappings")).isFalse();
 			assertThat(isExposed(mvc, HttpMethod.POST, "shutdown")).isFalse();
 			assertThat(isExposed(mvc, HttpMethod.GET, "threaddump")).isFalse();
-			assertThat(isExposed(mvc, HttpMethod.GET, "trace")).isFalse();
+			assertThat(isExposed(mvc, HttpMethod.GET, "httptrace")).isFalse();
 		});
 	}
 
@@ -100,7 +100,7 @@ public class WebMvcEndpointExposureIntegrationTests {
 			assertThat(isExposed(mvc, HttpMethod.GET, "mappings")).isTrue();
 			assertThat(isExposed(mvc, HttpMethod.POST, "shutdown")).isFalse();
 			assertThat(isExposed(mvc, HttpMethod.GET, "threaddump")).isTrue();
-			assertThat(isExposed(mvc, HttpMethod.GET, "trace")).isTrue();
+			assertThat(isExposed(mvc, HttpMethod.GET, "httptrace")).isTrue();
 		});
 	}
 
@@ -120,7 +120,7 @@ public class WebMvcEndpointExposureIntegrationTests {
 			assertThat(isExposed(mvc, HttpMethod.GET, "mappings")).isFalse();
 			assertThat(isExposed(mvc, HttpMethod.POST, "shutdown")).isFalse();
 			assertThat(isExposed(mvc, HttpMethod.GET, "threaddump")).isFalse();
-			assertThat(isExposed(mvc, HttpMethod.GET, "trace")).isFalse();
+			assertThat(isExposed(mvc, HttpMethod.GET, "httptrace")).isFalse();
 		});
 	}
 
@@ -141,7 +141,7 @@ public class WebMvcEndpointExposureIntegrationTests {
 			assertThat(isExposed(mvc, HttpMethod.GET, "mappings")).isTrue();
 			assertThat(isExposed(mvc, HttpMethod.POST, "shutdown")).isFalse();
 			assertThat(isExposed(mvc, HttpMethod.GET, "threaddump")).isTrue();
-			assertThat(isExposed(mvc, HttpMethod.GET, "trace")).isTrue();
+			assertThat(isExposed(mvc, HttpMethod.GET, "httptrace")).isTrue();
 		});
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceAutoConfigurationTests.java

@@ -37,16 +37,17 @@ import org.springframework.context.annotation.Configuration;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link TraceAutoConfiguration}.
+ * Tests for {@link HttpTraceAutoConfiguration}.
  *
  * @author Andy Wilkinson
  */
-public class TraceAutoConfigurationTests {
+public class HttpTraceAutoConfigurationTests {
 
 	@Test
 	public void configuresRepository() {
 		new WebApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(TraceAutoConfiguration.class))
+				.withConfiguration(
+						AutoConfigurations.of(HttpTraceAutoConfiguration.class))
 				.run((context) -> assertThat(context)
 						.hasSingleBean(InMemoryHttpTraceRepository.class));
 	}
@@ -54,7 +55,8 @@ public class TraceAutoConfigurationTests {
 	@Test
 	public void usesUserProvidedRepository() {
 		new WebApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(TraceAutoConfiguration.class))
+				.withConfiguration(
+						AutoConfigurations.of(HttpTraceAutoConfiguration.class))
 				.withUserConfiguration(CustomRepositoryConfiguration.class)
 				.run((context) -> {
 					assertThat(context).hasSingleBean(HttpTraceRepository.class);
@@ -66,7 +68,8 @@ public class TraceAutoConfigurationTests {
 	@Test
 	public void configuresTracer() {
 		new WebApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(TraceAutoConfiguration.class))
+				.withConfiguration(
+						AutoConfigurations.of(HttpTraceAutoConfiguration.class))
 				.run((context) -> assertThat(context)
 						.hasSingleBean(HttpExchangeTracer.class));
 	}
@@ -74,7 +77,8 @@ public class TraceAutoConfigurationTests {
 	@Test
 	public void usesUserProvidedTracer() {
 		new WebApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(TraceAutoConfiguration.class))
+				.withConfiguration(
+						AutoConfigurations.of(HttpTraceAutoConfiguration.class))
 				.withUserConfiguration(CustomTracerConfiguration.class).run((context) -> {
 					assertThat(context).hasSingleBean(HttpExchangeTracer.class);
 					assertThat(context.getBean(HttpExchangeTracer.class))
@@ -85,7 +89,8 @@ public class TraceAutoConfigurationTests {
 	@Test
 	public void configuresWebFilter() {
 		new ReactiveWebApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(TraceAutoConfiguration.class))
+				.withConfiguration(
+						AutoConfigurations.of(HttpTraceAutoConfiguration.class))
 				.run((context) -> assertThat(context)
 						.hasSingleBean(HttpTraceWebFilter.class));
 	}
@@ -93,7 +98,8 @@ public class TraceAutoConfigurationTests {
 	@Test
 	public void usesUserProvidedWebFilter() {
 		new ReactiveWebApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(TraceAutoConfiguration.class))
+				.withConfiguration(
+						AutoConfigurations.of(HttpTraceAutoConfiguration.class))
 				.withUserConfiguration(CustomWebFilterConfiguration.class)
 				.run((context) -> {
 					assertThat(context).hasSingleBean(HttpTraceWebFilter.class);
@@ -105,7 +111,8 @@ public class TraceAutoConfigurationTests {
 	@Test
 	public void configuresServletFilter() {
 		new WebApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(TraceAutoConfiguration.class))
+				.withConfiguration(
+						AutoConfigurations.of(HttpTraceAutoConfiguration.class))
 				.run((context) -> assertThat(context)
 						.hasSingleBean(HttpTraceFilter.class));
 	}
@@ -113,7 +120,8 @@ public class TraceAutoConfigurationTests {
 	@Test
 	public void usesUserProvidedServletFilter() {
 		new WebApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(TraceAutoConfiguration.class))
+				.withConfiguration(
+						AutoConfigurations.of(HttpTraceAutoConfiguration.class))
 				.withUserConfiguration(CustomFilterConfiguration.class).run((context) -> {
 					assertThat(context).hasSingleBean(HttpTraceFilter.class);
 					assertThat(context.getBean(HttpTraceFilter.class))
@@ -124,8 +132,9 @@ public class TraceAutoConfigurationTests {
 	@Test
 	public void backsOffWhenDisabled() {
 		new WebApplicationContextRunner()
-				.withConfiguration(AutoConfigurations.of(TraceAutoConfiguration.class))
-				.withPropertyValues("management.trace.enabled=false")
+				.withConfiguration(
+						AutoConfigurations.of(HttpTraceAutoConfiguration.class))
+				.withPropertyValues("management.httptrace.enabled=false")
 				.run((context) -> assertThat(context)
 						.doesNotHaveBean(InMemoryHttpTraceRepository.class)
 						.doesNotHaveBean(HttpExchangeTracer.class)
@@ -168,7 +177,7 @@ public class TraceAutoConfigurationTests {
 	static class CustomTracerConfiguration {
 
 		@Bean
-		public CustomHttpExchangeTracer customTracer(TraceProperties properties) {
+		public CustomHttpExchangeTracer customTracer(HttpTraceProperties properties) {
 			return new CustomHttpExchangeTracer(properties.getInclude());
 		}
 
@@ -188,7 +197,7 @@ public class TraceAutoConfigurationTests {
 
 		@Bean
 		public CustomHttpTraceWebFilter customWebFilter(HttpTraceRepository repository,
-				HttpExchangeTracer tracer, TraceProperties properties) {
+				HttpExchangeTracer tracer, HttpTraceProperties properties) {
 			return new CustomHttpTraceWebFilter(repository, tracer,
 					properties.getInclude());
 		}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/trace/HttpTraceEndpointAutoConfigurationTests.java

@@ -25,15 +25,15 @@ import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link TraceEndpointAutoConfiguration}.
+ * Tests for {@link HttpTraceEndpointAutoConfiguration}.
  *
  * @author Phillip Webb
  */
-public class TraceEndpointAutoConfigurationTests {
+public class HttpTraceEndpointAutoConfigurationTests {
 
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(TraceAutoConfiguration.class,
-					TraceEndpointAutoConfiguration.class));
+			.withConfiguration(AutoConfigurations.of(HttpTraceAutoConfiguration.class,
+					HttpTraceEndpointAutoConfiguration.class));
 
 	@Test
 	public void runShouldHaveEndpointBean() {
@@ -43,14 +43,15 @@ public class TraceEndpointAutoConfigurationTests {
 
 	@Test
 	public void runWhenEnabledPropertyIsFalseShouldNotHaveEndpointBean() {
-		this.contextRunner.withPropertyValues("management.endpoint.trace.enabled:false")
+		this.contextRunner
+				.withPropertyValues("management.endpoint.httptrace.enabled:false")
 				.run((context) -> assertThat(context)
 						.doesNotHaveBean(HttpTraceEndpoint.class));
 	}
 
 	@Test
 	public void endpointBacksOffWhenRepositoryIsNotAvailable() {
-		this.contextRunner.withPropertyValues("management.trace.enabled:false")
+		this.contextRunner.withPropertyValues("management.httptrace.enabled:false")
 				.run((context) -> assertThat(context)
 						.doesNotHaveBean(HttpTraceEndpoint.class));
 	}

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/trace/HttpExchangeTracer.java

@@ -133,17 +133,18 @@ public class HttpExchangeTracer {
 		@Override
 		public Map<String, List<String>> getHeaders() {
 			return getHeadersIfIncluded(Include.REQUEST_HEADERS,
-					this.delegate::getHeaders, (name) -> {
-						if (name.equalsIgnoreCase(HttpHeaders.COOKIE)) {
-							return HttpExchangeTracer.this.includes
-									.contains(Include.COOKIE_HEADERS);
-						}
-						if (name.equalsIgnoreCase(HttpHeaders.AUTHORIZATION)) {
-							return HttpExchangeTracer.this.includes
-									.contains(Include.AUTHORIZATION_HEADER);
-						}
-						return true;
-					});
+					this.delegate::getHeaders, this::includedHeader);
+		}
+
+		private boolean includedHeader(String name) {
+			if (name.equalsIgnoreCase(HttpHeaders.COOKIE)) {
+				return HttpExchangeTracer.this.includes.contains(Include.COOKIE_HEADERS);
+			}
+			if (name.equalsIgnoreCase(HttpHeaders.AUTHORIZATION)) {
+				return HttpExchangeTracer.this.includes
+						.contains(Include.AUTHORIZATION_HEADER);
+			}
+			return true;
 		}
 
 		@Override
@@ -169,13 +170,14 @@ public class HttpExchangeTracer {
 		@Override
 		public Map<String, List<String>> getHeaders() {
 			return getHeadersIfIncluded(Include.RESPONSE_HEADERS,
-					this.delegate::getHeaders, (name) -> {
-						if (name.equalsIgnoreCase(HttpHeaders.SET_COOKIE)) {
-							return HttpExchangeTracer.this.includes
-									.contains(Include.COOKIE_HEADERS);
-						}
-						return true;
-					});
+					this.delegate::getHeaders, this::includedHeader);
+		}
+
+		private boolean includedHeader(String name) {
+			if (name.equalsIgnoreCase(HttpHeaders.SET_COOKIE)) {
+				return HttpExchangeTracer.this.includes.contains(Include.COOKIE_HEADERS);
+			}
+			return true;
 		}
 
 	}

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/trace/HttpTraceEndpoint.java

@@ -26,9 +26,10 @@ import org.springframework.util.Assert;
  * {@link Endpoint} to expose {@link HttpTrace} information.
  *
  * @author Dave Syer
+ * @author Andy Wilkinson
  * @since 2.0.0
  */
-@Endpoint(id = "trace")
+@Endpoint(id = "httptrace")
 public class HttpTraceEndpoint {
 
 	private final HttpTraceRepository repository;
@@ -43,19 +44,19 @@ public class HttpTraceEndpoint {
 	}
 
 	@ReadOperation
-	public TraceDescriptor traces() {
-		return new TraceDescriptor(this.repository.findAll());
+	public HttpTraceDescriptor traces() {
+		return new HttpTraceDescriptor(this.repository.findAll());
 	}
 
 	/**
 	 * A description of an application's {@link HttpTrace} entries. Primarily intended for
 	 * serialization to JSON.
 	 */
-	public static final class TraceDescriptor {
+	public static final class HttpTraceDescriptor {
 
 		private final List<HttpTrace> traces;
 
-		private TraceDescriptor(List<HttpTrace> traces) {
+		private HttpTraceDescriptor(List<HttpTrace> traces) {
 			this.traces = traces;
 		}
 

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -1206,6 +1206,10 @@ content into your application. Rather, pick only the properties that you need.
 	management.endpoint.heapdump.cache.time-to-live=0ms # Maximum time that a response can be cached.
 	management.endpoint.heapdump.enabled= # Whether to enable the heapdump endpoint.
 
+	# HTTP TRACE ENDPOINT ({sc-spring-boot-actuator}/web/trace/HttpTraceEndpoint.{sc-ext}[HttpTraceEndpoint])
+	management.endpoint.httptrace.cache.time-to-live=0ms # Maximum time that a response can be cached.
+	management.endpoint.httptrace.enabled= # Whether to enable the HTTP trace endpoint.
+
 	# INFO ENDPOINT ({sc-spring-boot-actuator}/info/InfoEndpoint.{sc-ext}[InfoEndpoint])
 	info= # Arbitrary properties to add to the info endpoint.
 	management.endpoint.info.cache.time-to-live=0ms # Maximum time that a response can be cached.
@@ -1250,10 +1254,6 @@ 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}/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.
-
 	# JOLOKIA ENDPOINT ({sc-spring-boot-actuator-autoconfigure}/jolokia/JolokiaProperties.{sc-ext}[JolokiaProperties])
 	management.endpoint.jolokia.config.*= # Jolokia settings. See the Jolokia manual for details.
 	management.endpoint.jolokia.enabled=true # Whether to enable Jolokia.
@@ -1281,6 +1281,10 @@ content into your application. Rather, pick only the properties that you need.
 	management.health.status.http-mapping= # Mapping of health statuses to HTTP status codes. By default, registered health statuses map to sensible defaults (for example, UP maps to 200).
 	management.health.status.order=DOWN, OUT_OF_SERVICE, UP, UNKNOWN # Comma-separated list of health statuses in order of severity.
 
+	# HTTP TRACING ({sc-spring-boot-actuator-autoconfigure}/web/trace/HttpTraceProperties.{sc-ext}[HttpTraceProperties])
+	management.httptrace.enabled=true # Whether to enable HTTP request-response tracing.
+	management.httptrace.include=request-headers,response-headers,cookies,errors # Items to be included in the trace.
+
 	# INFO CONTRIBUTORS ({sc-spring-boot-actuator-autoconfigure}/info/InfoContributorProperties.{sc-ext}[InfoContributorProperties])
 	management.info.build.enabled=true # Whether to enable build info.
 	management.info.defaults.enabled=true # Whether to enable default info contributors.
@@ -1375,10 +1379,6 @@ 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}/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.
-
 
 	# ----------------------------------------
 	# DEVTOOLS PROPERTIES

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

@@ -96,6 +96,11 @@ classes and the reasons why they did or did not match.
 |Shows application health information.
 |Yes
 
+|`httptrace`
+|Displays HTTP trace information (by default, the last 100 HTTP request-response
+exchanges).
+|Yes
+
 |`info`
 |Displays arbitrary application info.
 |Yes
@@ -133,10 +138,6 @@ store. Not available when using Spring Session's support for reactive web applic
 |Performs a thread dump.
 |Yes
 
-|`trace`
-|Displays HTTP trace information (by default, the last 100 HTTP requests).
-|Yes
-
 |===
 
 If your application is a web application (Spring MVC, Spring WebFlux, or Jersey), you can
@@ -243,6 +244,10 @@ endpoints:
 |N/A
 |No
 
+|`httptrace`
+|Yes
+|No
+
 |`info`
 |Yes
 |Yes
@@ -291,10 +296,6 @@ endpoints:
 |Yes
 |No
 
-|`trace`
-|Yes
-|No
-
 |===
 
 To change which endpoints are exposed, use the following technology-specific `expose` and
@@ -1309,22 +1310,22 @@ implementing `ApplicationEventPublisherAware`).
 
 
 
-[[production-ready-tracing]]
-== Tracing
-Tracing is automatically enabled for all HTTP requests. You can view the `trace` endpoint
-and obtain basic information about the last 100 requests.
+[[production-ready-http-tracing]]
+== HTTP Tracing
+Tracing is automatically enabled for all HTTP requests. You can view the `httptrace`
+endpoint and obtain basic information about the last 100 request-response exchanges.
 
 
 
-[[production-ready-custom-tracing]]
-=== Custom tracing
+[[production-ready-http-tracing-custom]]
+=== Custom HTTP tracing
 To customize the items that are included in each trace, use the
-`management.trace.include` configuration property.
+`management.httptrace.include` configuration property.
 
-By default, an `InMemoryTraceRepository` that stores the last 100 events is used. If you
-need to expand the capacity, you can define your own instance of the
-`InMemoryTraceRepository` bean. You can also create your own alternative
-`TraceRepository` implementation.
+By default, an `InMemoryHttpTraceRepository` that stores traces for the last 100
+request-response exchanges is used. If you need to expand the capacity, you can define
+your own instance of the `InMemoryHttpTraceRepository` bean. You can also create your own
+alternative `HttpTraceRepository` implementation.
 
 
 

spring-boot-samples/spring-boot-sample-actuator/src/main/resources/application.properties

@@ -18,4 +18,4 @@ spring.jmx.enabled=true
 
 spring.jackson.serialization.write_dates_as_timestamps=false
 
-management.trace.include=REQUEST_HEADERS,RESPONSE_HEADERS,PRINCIPAL,REMOTE_ADDRESS,SESSION_ID
+management.httptrace.include=REQUEST_HEADERS,RESPONSE_HEADERS,PRINCIPAL,REMOTE_ADDRESS,SESSION_ID