Merge branch '2.7.x'

Author: mhalbritter

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,11 @@
 @ConfigurationProperties(prefix = "management.metrics.export.jmx")
 public class JmxProperties {
 
+	/**
+	 * Whether exporting of metrics to this backend is enabled.
+	 */
+	private boolean enabled = true;
+
 	/**
 	 * Metrics JMX domain name.
 	 */
@@ -57,4 +62,12 @@ public void setStep(Duration step) {
 		this.step = step;
 	}
 
+	public boolean isEnabled() {
+		return this.enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
 }

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,6 +36,11 @@
 @ConfigurationProperties(prefix = "management.metrics.export.prometheus")
 public class PrometheusProperties {
 
+	/**
+	 * Whether exporting of metrics to this backend is enabled.
+	 */
+	private boolean enabled = true;
+
 	/**
 	 * Whether to enable publishing descriptions as part of the scrape payload to
 	 * Prometheus. Turn this off to minimize the amount of data sent on each scrape.
@@ -82,6 +87,14 @@ public void setStep(Duration step) {
 		this.step = step;
 	}
 
+	public boolean isEnabled() {
+		return this.enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
 	public Pushgateway getPushgateway() {
 		return this.pushgateway;
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,11 @@
 @ConfigurationProperties(prefix = "management.metrics.export.simple")
 public class SimpleProperties {
 
+	/**
+	 * Whether exporting of metrics to this backend is enabled.
+	 */
+	private boolean enabled = true;
+
 	/**
 	 * Step size (i.e. reporting frequency) to use.
 	 */
@@ -44,6 +49,14 @@ public class SimpleProperties {
 	 */
 	private CountingMode mode = CountingMode.CUMULATIVE;
 
+	public boolean isEnabled() {
+		return this.enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
 	public Duration getStep() {
 		return this.step;
 	}

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

@@ -433,12 +433,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "management.metrics.export.jmx.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether exporting of metrics to JMX is enabled.",
-      "defaultValue": true
-    },
     {
       "name": "management.metrics.export.kairos.num-threads",
       "type": "java.lang.Integer",
@@ -456,12 +450,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "management.metrics.export.prometheus.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether exporting of metrics to Prometheus is enabled.",
-      "defaultValue": true
-    },
     {
       "name": "management.metrics.export.prometheus.histogram-flavor",
       "defaultValue": "prometheus"
@@ -479,12 +467,6 @@
         "level": "error"
       }
     },
-    {
-      "name": "management.metrics.export.simple.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether, in the absence of any other exporter, exporting of metrics to an in-memory backend is enabled.",
-      "defaultValue": true
-    },
     {
       "name": "management.metrics.export.simple.mode",
       "defaultValue": "cumulative"