Move HTTP exchange auto-config into appropriate modules

Author: wilkinsona

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

@@ -6,20 +6,6 @@
       "type": "java.lang.Boolean",
       "description": "Whether to enable SSL certificate health check.",
       "defaultValue": true
-    },
-	{
-      "name": "management.httpexchanges.recording.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether to enable HTTP request-response exchange recording.",
-      "defaultValue": true
-    },
-    {
-      "name": "management.httpexchanges.recording.include",
-      "defaultValue": [
-        "request-headers",
-        "response-headers",
-        "errors"
-      ]
     },
     {
       "name": "management.otlp.tracing.export.enabled",

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -12,5 +12,3 @@ org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoC
 org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.tracing.prometheus.PrometheusExemplarsAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinTracingAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesEndpointAutoConfiguration

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

@@ -26,7 +26,6 @@
 import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoConfiguration;
 import org.springframework.boot.actuate.endpoint.annotation.DeleteOperation;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
@@ -47,8 +46,7 @@ class JmxEndpointAccessIntegrationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(JmxAutoConfiguration.class, EndpointAutoConfiguration.class,
-				JmxEndpointAutoConfiguration.class, HealthContributorAutoConfiguration.class,
-				HttpExchangesAutoConfiguration.class))
+				JmxEndpointAutoConfiguration.class, HealthContributorAutoConfiguration.class))
 		.withUserConfiguration(CustomJmxEndpoint.class)
 		.withPropertyValues("spring.jmx.enabled=true")
 		.withConfiguration(AutoConfigurations.of(EndpointAutoConfigurationClasses.ALL));

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

@@ -31,7 +31,6 @@
 import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoConfiguration;
 import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
@@ -52,8 +51,7 @@ class JmxEndpointIntegrationTests {
 
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(JmxAutoConfiguration.class, EndpointAutoConfiguration.class,
-				JmxEndpointAutoConfiguration.class, HealthContributorAutoConfiguration.class,
-				HttpExchangesAutoConfiguration.class))
+				JmxEndpointAutoConfiguration.class, HealthContributorAutoConfiguration.class))
 		.withUserConfiguration(HttpExchangeRepositoryConfiguration.class, AuditEventRepositoryConfiguration.class)
 		.withPropertyValues("spring.jmx.enabled=true")
 		.withConfiguration(AutoConfigurations.of(EndpointAutoConfigurationClasses.ALL));

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

@@ -30,13 +30,13 @@
 import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
 import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
 import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
 import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
+import org.springframework.boot.servlet.actuate.autoconfigure.exchanges.ServletHttpExchangesAutoConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
@@ -70,7 +70,7 @@ class WebMvcEndpointExposureIntegrationTests {
 				JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
 				WebMvcAutoConfiguration.class, EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
 				ManagementContextAutoConfiguration.class, ManagementContextAutoConfiguration.class,
-				ServletManagementContextAutoConfiguration.class, HttpExchangesAutoConfiguration.class,
+				ServletManagementContextAutoConfiguration.class, ServletHttpExchangesAutoConfiguration.class,
 				HealthContributorAutoConfiguration.class))
 		.withConfiguration(AutoConfigurations.of(EndpointAutoConfigurationClasses.ALL))
 		.withUserConfiguration(CustomMvcEndpoint.class, CustomServletEndpoint.class,

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesAutoConfigurationTests.java

@@ -32,7 +32,7 @@
  * @author Phillip Webb
  * @since 3.0.0
  */
-@AutoConfiguration(after = HttpExchangesAutoConfiguration.class)
+@AutoConfiguration
 @ConditionalOnAvailableEndpoint(HttpExchangesEndpoint.class)
 public class HttpExchangesEndpointAutoConfiguration {
 

…pExchangesEndpointAutoConfiguration.java …pExchangesEndpointAutoConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesEndpointAutoConfiguration.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesEndpointAutoConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesEndpointAutoConfiguration.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesEndpointAutoConfiguration.java

@@ -138,6 +138,20 @@
       "description": "Whether to enable readiness state health check.",
       "defaultValue": false
     },
+    {
+      "name": "management.httpexchanges.recording.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable HTTP request-response exchange recording.",
+      "defaultValue": true
+    },
+    {
+      "name": "management.httpexchanges.recording.include",
+      "defaultValue": [
+        "request-headers",
+        "response-headers",
+        "errors"
+      ]
+    },
     {
       "name": "management.info.build.enabled",
       "type": "java.lang.Boolean",