Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12127 from jkschneider:micrometer-449

Browse Source 
* pr/12127:
  Polish "Consistent prefix for datasource pool metrics"
  Consistent prefix for datasource pool metrics
This commit is contained in:
Stephane Nicoll
2018-02-20 10:07:25 +01:00
parent 8ffa146660 f19b43bacc
commit 4c41aa35da
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java
View File

@@ -57,7 +57,7 @@ public class DataSourcePoolMetricsAutoConfigurationTests {
.run((context) -> {
context.getBean(DataSource.class).getConnection().getMetaData();
MeterRegistry registry = context.getBean(MeterRegistry.class);
registry.get("jdbc.max.connections").tags("name", "dataSource")
registry.get("jdbc.connections.max").tags("name", "dataSource")
.meter();
});
}
@@ -72,7 +72,7 @@ public class DataSourcePoolMetricsAutoConfigurationTests {
.run((context) -> {
context.getBean(DataSource.class).getConnection().getMetaData();
MeterRegistry registry = context.getBean(MeterRegistry.class);
assertThat(registry.find("jdbc.max.connections")
assertThat(registry.find("jdbc.connections.max")
.tags("name", "dataSource").meter()).isNull();
});
}
@@ -88,8 +88,8 @@ public class DataSourcePoolMetricsAutoConfigurationTests {
context.getBean("secondOne", DataSource.class).getConnection()
.getMetaData();
MeterRegistry registry = context.getBean(MeterRegistry.class);
registry.get("jdbc.max.connections").tags("name", "first").meter();
registry.get("jdbc.max.connections").tags("name", "secondOne")
registry.get("jdbc.connections.max").tags("name", "first").meter();
registry.get("jdbc.connections.max").tags("name", "secondOne")
.meter();
});
}

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourcePoolMetrics.java
View File

@@ -84,7 +84,7 @@ public class DataSourcePoolMetrics implements MeterBinder {
private <N extends Number> void bindDataSource(MeterRegistry registry,
String metricName, Function<DataSource, N> function) {
if (function.apply(this.dataSource) != null) {
registry.gauge("jdbc." + metricName + ".connections", this.tags,
registry.gauge("jdbc.connections." + metricName, this.tags,
this.dataSource, (m) -> function.apply(m).doubleValue());
}
}

2
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/DataSourcePoolMetricsTests.java
View File

@@ -50,7 +50,7 @@ public class DataSourcePoolMetricsTests {
"metrics.use-global-registry=false")
.run((context) -> {
context.getBean(DataSource.class).getConnection().getMetaData();
context.getBean(MeterRegistry.class).get("jdbc.max.connections")
context.getBean(MeterRegistry.class).get("jdbc.connections.max")
.meter();
});
}