diff --git a/spring-boot-actuator-autoconfigure/pom.xml b/spring-boot-actuator-autoconfigure/pom.xml index 784ef3805a..aaa39aa479 100644 --- a/spring-boot-actuator-autoconfigure/pom.xml +++ b/spring-boot-actuator-autoconfigure/pom.xml @@ -94,37 +94,37 @@ io.micrometer - micrometer-atlas-starter + micrometer-registry-atlas true io.micrometer - micrometer-datadog-starter + micrometer-registry-datadog true io.micrometer - micrometer-ganglia-starter + micrometer-registry-ganglia true io.micrometer - micrometer-graphite-starter + micrometer-registry-graphite true io.micrometer - micrometer-influx-starter + micrometer-registry-influx true io.micrometer - micrometer-jmx-starter + micrometer-registry-jmx true io.micrometer - micrometer-prometheus-starter + micrometer-registry-prometheus true diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml index 2e69117a8a..3be8e5d812 100644 --- a/spring-boot-actuator/pom.xml +++ b/spring-boot-actuator/pom.xml @@ -53,7 +53,7 @@ io.micrometer - micrometer-prometheus-starter + micrometer-registry-prometheus true diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java index 6572573482..43e03443e7 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java @@ -27,6 +27,7 @@ import java.util.stream.StreamSupport; import io.micrometer.core.instrument.Measurement; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.MeterRegistry; +import io.micrometer.core.instrument.NamingConvention; import io.micrometer.core.instrument.Statistic; import io.micrometer.core.instrument.util.HierarchicalNameMapper; @@ -75,7 +76,8 @@ public class MetricsEndpoint { } private String getHierarchicalName(Meter meter) { - return HierarchicalNameMapper.DEFAULT.toHierarchicalName(meter.getId()); + return HierarchicalNameMapper.DEFAULT.toHierarchicalName(meter.getId(), + NamingConvention.camelCase); } private Stream stream(Iterable measure) { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java index d39e0ab408..f07f121169 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java @@ -62,8 +62,8 @@ public class MetricsEndpointWebIntegrationTests { MetricsEndpointWebIntegrationTests.client.get() .uri("/application/metrics/jvm.memory.used").exchange().expectStatus() .isOk().expectBody() - .jsonPath("['jvm_memory_used.area.nonheap.id.Compressed Class Space']") - .exists().jsonPath("['jvm_memory_used.area.heap.id.PS Old Gen']"); + .jsonPath("['jvmMemoryUsed.area.nonheap.id.Compressed_Class_Space']") + .exists().jsonPath("['jvmMemoryUsed.area.heap.id.PS_Old_Gen']"); } @Configuration diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 411ed77fe2..3a70e4d9b9 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -132,7 +132,7 @@ 1.2.3 1.16.18 2.1.1 - 0.11.0.RELEASE + 1.0.0-rc.1 6.2.1.jre8 2.9.0 1.5.0 @@ -568,7 +568,6 @@ spring-boot-starter-web-services 2.0.0.BUILD-SNAPSHOT - antlr @@ -842,37 +841,37 @@ io.micrometer - micrometer-atlas-starter + micrometer-registry-atlas ${micrometer.version} io.micrometer - micrometer-datadog-starter + micrometer-registry-datadog ${micrometer.version} io.micrometer - micrometer-influx-starter + micrometer-registry-influx ${micrometer.version} io.micrometer - micrometer-ganglia-starter + micrometer-registry-ganglia ${micrometer.version} io.micrometer - micrometer-graphite-starter + micrometer-registry-graphite ${micrometer.version} io.micrometer - micrometer-jmx-starter + micrometer-registry-jmx ${micrometer.version} io.micrometer - micrometer-prometheus-starter + micrometer-registry-prometheus ${micrometer.version} @@ -2008,7 +2007,7 @@ ${mongodb.version} - org.mongodb + org.mongodb mongodb-driver-reactivestreams ${mongo-driver-reactivestreams.version} diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml index bd5cc6d136..956cba4925 100644 --- a/spring-boot-docs/pom.xml +++ b/spring-boot-docs/pom.xml @@ -186,11 +186,6 @@ lettuce-core true - - io.micrometer - micrometer-atlas-starter - true - io.micrometer micrometer-core @@ -198,32 +193,37 @@ io.micrometer - micrometer-datadog-starter + micrometer-registry-atlas true io.micrometer - micrometer-ganglia-starter + micrometer-registry-datadog true io.micrometer - micrometer-graphite-starter + micrometer-registry-ganglia true io.micrometer - micrometer-influx-starter + micrometer-registry-graphite true io.micrometer - micrometer-jmx-starter + micrometer-registry-influx true io.micrometer - micrometer-prometheus-starter + micrometer-registry-jmx + true + + + io.micrometer + micrometer-registry-prometheus true