Move code out of spring-boot-actuator-autoconfigure-all

Author: wilkinsona

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

@@ -1,27 +1,10 @@
-org.springframework.boot.actuate.autoconfigure.audit.AuditAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.audit.AuditEventsEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.availability.AvailabilityHealthContributorAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.availability.AvailabilityProbesAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.beans.BeansEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.cloudfoundry.reactive.ReactiveCloudFoundryActuatorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.cloudfoundry.servlet.CloudFoundryActuatorAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.condition.ConditionsReportEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.context.ShutdownEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.context.properties.ConfigurationPropertiesReportEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.endpoint.jackson.JacksonEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.management.HeapDumpWebEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.management.ThreadDumpEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.observability.ObservabilityAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.sbom.SbomEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.security.reactive.ReactiveManagementWebSecurityAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.ssl.SslHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.ssl.SslObservabilityAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.startup.StartupEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.tracing.NoopTracerAutoConfiguration

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

@@ -11,6 +11,9 @@ description = "Spring Boot Actuator AutoConfigure"
 dependencies {
 	api(project(":spring-boot-project:spring-boot-actuator"))
 	api(project(":spring-boot-project:spring-boot-autoconfigure"))
+	
+	implementation("com.fasterxml.jackson.core:jackson-databind")
+	implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
 
 	optional(project(":spring-boot-project:spring-boot-web-server"))
 

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/resources/org/springframework/boot/actuate/autoconfigure/flyway/V1__init.sql

@@ -1,6 +1,17 @@
 {
   "groups": [],
   "properties": [
+    {
+      "name": "info",
+      "type": "java.util.Map<java.lang.String,java.lang.Object>",
+      "description": "Arbitrary properties to add to the info endpoint."
+    },
+    {
+      "name": "management.auditevents.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable storage of audit events.",
+      "defaultValue": true
+    },
     {
       "name": "management.cloudfoundry.enabled",
       "type": "java.lang.Boolean",
@@ -59,11 +70,156 @@
         "since": "3.4.0"
       }
     },
+    {
+      "name": "management.endpoints.jackson.isolated-object-mapper",
+      "type": "java.lang.Boolean",
+      "description": "Whether to use an isolated object mapper to serialize endpoint JSON.",
+      "defaultValue": true
+    },
+    {
+      "name": "management.endpoints.jmx.domain",
+      "defaultValue": "org.springframework.boot"
+    },
+    {
+      "name": "management.endpoints.jmx.exposure.include",
+      "defaultValue": "health"
+    },
+    {
+      "name": "management.endpoints.jmx.unique-names",
+      "type": "java.lang.Boolean",
+      "description": "Whether unique runtime object names should be ensured.",
+      "deprecation": {
+        "replacement": "spring.jmx.unique-names",
+        "level": "error"
+      }
+    },
     {
       "name": "management.endpoints.web.exposure.include",
       "defaultValue": [
         "health"
       ]
+    },
+    {
+      "name": "management.health.defaults.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable default health indicators.",
+      "defaultValue": true
+    },
+    {
+      "name": "management.health.diskspace.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable disk space health check.",
+      "defaultValue": true
+    },
+    {
+      "name": "management.health.livenessstate.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable liveness state health check.",
+      "defaultValue": false
+    },
+    {
+      "name": "management.health.ping.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable ping health check.",
+      "defaultValue": true
+    },
+    {
+      "name": "management.health.probes.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable liveness and readiness probes.",
+      "defaultValue": false,
+      "deprecation": {
+        "replacement": "management.endpoint.health.probes.enabled"
+      }
+    },
+    {
+      "name": "management.health.readinessstate.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable readiness state health check.",
+      "defaultValue": false
+    },
+    {
+      "name": "management.info.build.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable build info.",
+      "defaultValue": true
+    },
+    {
+      "name": "management.info.defaults.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable default info contributors.",
+      "defaultValue": true
+    },
+    {
+      "name": "management.info.env.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable environment info.",
+      "defaultValue": false
+    },
+    {
+      "name": "management.info.git.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable git info.",
+      "defaultValue": true
+    },
+    {
+      "name": "management.info.java.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable Java info.",
+      "defaultValue": false
+    },
+    {
+      "name": "management.info.os.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable Operating System info.",
+      "defaultValue": false
+    },
+    {
+      "name": "management.info.process.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable process info.",
+      "defaultValue": false
+    },
+    {
+      "name": "management.info.ssl.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable SSL certificate info.",
+      "defaultValue": false
+    },
+    {
+      "name": "management.server.add-application-context-header",
+      "type": "java.lang.Boolean",
+      "description": "Add the \"X-Application-Context\" HTTP header in each response.",
+      "defaultValue": false
+    },
+    {
+      "name": "management.server.servlet.context-path",
+      "type": "java.lang.String",
+      "deprecation": {
+        "replacement": "management.server.base-path",
+        "level": "error"
+      }
+    },
+    {
+      "name": "management.trace.http.enabled",
+      "deprecation": {
+        "replacement": "management.httpexchanges.recording.enabled",
+        "level": "error"
+      }
+    },
+    {
+      "name": "management.trace.http.include",
+      "deprecation": {
+        "replacement": "management.httpexchanges.recording.include",
+        "level": "error"
+      }
+    },
+    {
+      "name": "management.trace.include",
+      "deprecation": {
+        "replacement": "management.httpexchanges.recording.include",
+        "level": "error"
+      }
     }
   ],
   "hints": [

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/resources/org/springframework/boot/actuate/autoconfigure/liquibase/db.changelog-master.yaml

@@ -1,9 +1,26 @@
+org.springframework.boot.actuate.autoconfigure.audit.AuditAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.audit.AuditEventsEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.availability.AvailabilityHealthContributorAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.availability.AvailabilityProbesAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.beans.BeansEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.condition.ConditionsReportEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.context.ShutdownEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.context.properties.ConfigurationPropertiesReportEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.endpoint.jackson.JacksonEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.info.InfoContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.logging.LogFileWebEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.logging.LoggersEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.management.HeapDumpWebEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.management.ThreadDumpEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.sbom.SbomEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.startup.StartupEndpointAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthContributorAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/resources/org/springframework/boot/actuate/autoconfigure/logging/sample.log

@@ -19,7 +19,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 
-import jakarta.annotation.PostConstruct;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.actuate.autoconfigure.condition.ConditionsReportEndpoint.ContextConditionsDescriptor;
@@ -66,10 +65,10 @@ static class Config {
 
 		Config(ConfigurableApplicationContext context) {
 			this.context = context;
+			setupAutoConfigurationReport();
 		}
 
-		@PostConstruct
-		void setupAutoConfigurationReport() {
+		private void setupAutoConfigurationReport() {
 			ConditionEvaluationReport report = ConditionEvaluationReport.get(this.context.getBeanFactory());
 			report.recordEvaluationCandidates(Arrays.asList("a", "b"));
 			report.recordConditionEvaluation("a", mock(Condition.class), mock(ConditionOutcome.class));

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/resources/org/springframework/boot/actuate/autoconfigure/logging/sample.log.2021-06-15.0.gz

@@ -1,6 +1,12 @@
 {
   "groups": [],
   "properties": [
+    {
+      "name": "management.health.rabbit.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable RabbitMQ health check.",
+      "defaultValue": true
+    },
     {
       "name": "spring.rabbitmq.dynamic",
       "type": "java.lang.Boolean",

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -1,4 +1,12 @@
 {
+  "properties": [
+    {
+      "name": "management.health.mongo.enabled",
+      "type": "java.lang.Boolean",
+      "description": "Whether to enable MongoDB health check.",
+      "defaultValue": true
+    }
+  ],
   "hints": [
     {
       "name": "spring.data.mongodb.field-naming-strategy",

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfiguration.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfiguration.java

@@ -1,6 +1,32 @@
 {
   "groups": [],
   "properties": [
+    {
+      "name": "management.metrics.graphql.autotime.enabled",
+      "description": "Whether to automatically time web client requests.",
+      "defaultValue": true,
+      "deprecation": {
+        "level": "error",
+        "reason": "Requests are timed automatically."
+      }
+    },
+    {
+      "name": "management.metrics.graphql.autotime.percentiles",
+      "description": "Computed non-aggregable percentiles to publish.",
+      "deprecation": {
+        "level": "error",
+        "reason": "Should be configured globally via management.metrics.distribution.percentiles."
+      }
+    },
+    {
+      "name": "management.metrics.graphql.autotime.percentiles-histogram",
+      "description": "Whether percentile histograms should be published.",
+      "defaultValue": false,
+      "deprecation": {
+        "level": "error",
+        "reason": "Should be configured globally via management.metrics.distribution.percentiles-histogram."
+      }
+    },
     {
       "name": "spring.graphql.schema.file-extensions",
       "defaultValue": ".graphqls,.gqls"

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfiguration.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfiguration.java

@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.web.jersey;
+package org.springframework.boot.jersey.actuate.autoconfigure.web;
 
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.servlet.ServletContainer;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.jersey.actuate.autoconfigure.web.JerseyChildManagementContextConfiguration;
-import org.springframework.boot.jersey.actuate.autoconfigure.web.JerseySameManagementContextConfiguration;
-import org.springframework.boot.jersey.actuate.autoconfigure.web.ManagementContextResourceConfigCustomizer;
 import org.springframework.boot.jersey.autoconfigure.JerseyApplicationPath;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;