Merge pull request #12127 from jkschneider:micrometer-449

* pr/12127:
  Polish "Consistent prefix for datasource pool metrics"
  Consistent prefix for datasource pool metrics
pull/12135/head
Stephane Nicoll 7 years ago
commit 4c41aa35da

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

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

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

Loading…
Cancel
Save