root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Upgrade to Micrometer 1.0.0-rc.1

Browse Source 
Closes gh-10300
pull/10304/merge
Phillip Webb 7 years ago
parent 324a00fd6d
commit 86926bf0e5
6 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File

14
spring-boot-actuator-autoconfigure/pom.xml
Unescape Escape View File

@ -94,37 +94,37 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-atlas-starter</artifactId> <artifactId>micrometer-registry-atlas</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-datadog-starter</artifactId> <artifactId>micrometer-registry-datadog</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-ganglia-starter</artifactId> <artifactId>micrometer-registry-ganglia</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-graphite-starter</artifactId> <artifactId>micrometer-registry-graphite</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-influx-starter</artifactId> <artifactId>micrometer-registry-influx</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-jmx-starter</artifactId> <artifactId>micrometer-registry-jmx</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-prometheus-starter</artifactId> <artifactId>micrometer-registry-prometheus</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>

2
spring-boot-actuator/pom.xml
Unescape Escape View File

@ -53,7 +53,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-prometheus-starter</artifactId> <artifactId>micrometer-registry-prometheus</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java
Unescape Escape View File

@ -27,6 +27,7 @@ import java.util.stream.StreamSupport;
import io.micrometer.core.instrument.Measurement; import io.micrometer.core.instrument.Measurement;
import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.NamingConvention;
import io.micrometer.core.instrument.Statistic; import io.micrometer.core.instrument.Statistic;
import io.micrometer.core.instrument.util.HierarchicalNameMapper; import io.micrometer.core.instrument.util.HierarchicalNameMapper;
@ -75,7 +76,8 @@ public class MetricsEndpoint {
} }
private String getHierarchicalName(Meter meter) { private String getHierarchicalName(Meter meter) {
return HierarchicalNameMapper.DEFAULT.toHierarchicalName(meter.getId()); return HierarchicalNameMapper.DEFAULT.toHierarchicalName(meter.getId(),
NamingConvention.camelCase);
} }
private <T> Stream<T> stream(Iterable<T> measure) { private <T> Stream<T> stream(Iterable<T> measure) {

4
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java
Unescape Escape View File

@ -62,8 +62,8 @@ public class MetricsEndpointWebIntegrationTests {
MetricsEndpointWebIntegrationTests.client.get() MetricsEndpointWebIntegrationTests.client.get()
.uri("/application/metrics/jvm.memory.used").exchange().expectStatus() .uri("/application/metrics/jvm.memory.used").exchange().expectStatus()
.isOk().expectBody() .isOk().expectBody()
.jsonPath("['jvm_memory_used.area.nonheap.id.Compressed Class Space']") .jsonPath("['jvmMemoryUsed.area.nonheap.id.Compressed_Class_Space']")
.exists().jsonPath("['jvm_memory_used.area.heap.id.PS Old Gen']"); .exists().jsonPath("['jvmMemoryUsed.area.heap.id.PS_Old_Gen']");
} }
@Configuration @Configuration

17
spring-boot-dependencies/pom.xml
Unescape Escape View File

@ -132,7 +132,7 @@
<logback.version>1.2.3</logback.version> <logback.version>1.2.3</logback.version>
<lombok.version>1.16.18</lombok.version> <lombok.version>1.16.18</lombok.version>
<mariadb.version>2.1.1</mariadb.version> <mariadb.version>2.1.1</mariadb.version>
<micrometer.version>0.11.0.RELEASE</micrometer.version> <micrometer.version>1.0.0-rc.1</micrometer.version>
<mssql-jdbc.version>6.2.1.jre8</mssql-jdbc.version> <mssql-jdbc.version>6.2.1.jre8</mssql-jdbc.version>
<mockito.version>2.9.0</mockito.version> <mockito.version>2.9.0</mockito.version>
<mongo-driver-reactivestreams.version>1.5.0</mongo-driver-reactivestreams.version> <mongo-driver-reactivestreams.version>1.5.0</mongo-driver-reactivestreams.version>
@ -568,7 +568,6 @@
<artifactId>spring-boot-starter-web-services</artifactId> <artifactId>spring-boot-starter-web-services</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version> <version>2.0.0.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<!-- Third Party --> <!-- Third Party -->
<dependency> <dependency>
<groupId>antlr</groupId> <groupId>antlr</groupId>
@ -842,37 +841,37 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-atlas-starter</artifactId> <artifactId>micrometer-registry-atlas</artifactId>
<version>${micrometer.version}</version> <version>${micrometer.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-datadog-starter</artifactId> <artifactId>micrometer-registry-datadog</artifactId>
<version>${micrometer.version}</version> <version>${micrometer.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-influx-starter</artifactId> <artifactId>micrometer-registry-influx</artifactId>
<version>${micrometer.version}</version> <version>${micrometer.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-ganglia-starter</artifactId> <artifactId>micrometer-registry-ganglia</artifactId>
<version>${micrometer.version}</version> <version>${micrometer.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-graphite-starter</artifactId> <artifactId>micrometer-registry-graphite</artifactId>
<version>${micrometer.version}</version> <version>${micrometer.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-jmx-starter</artifactId> <artifactId>micrometer-registry-jmx</artifactId>
<version>${micrometer.version}</version> <version>${micrometer.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-prometheus-starter</artifactId> <artifactId>micrometer-registry-prometheus</artifactId>
<version>${micrometer.version}</version> <version>${micrometer.version}</version>
</dependency> </dependency>
<dependency> <dependency>

16
spring-boot-docs/pom.xml
Unescape Escape View File

@ -188,42 +188,42 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-atlas-starter</artifactId> <artifactId>micrometer-core</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId> <artifactId>micrometer-registry-atlas</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-datadog-starter</artifactId> <artifactId>micrometer-registry-datadog</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-ganglia-starter</artifactId> <artifactId>micrometer-registry-ganglia</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-graphite-starter</artifactId> <artifactId>micrometer-registry-graphite</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-influx-starter</artifactId> <artifactId>micrometer-registry-influx</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-jmx-starter</artifactId> <artifactId>micrometer-registry-jmx</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-prometheus-starter</artifactId> <artifactId>micrometer-registry-prometheus</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>

Write Preview
Loading…
Cancel
Save