Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
* {@link DataSource datasources}.
*
* @author Stephane Nicoll
* @author Yanming Zhou
* @since 2.0.0
*/
@AutoConfiguration(after = { MetricsAutoConfiguration.class, DataSourceAutoConfiguration.class,
Expand Down Expand Up @@ -140,13 +141,13 @@ static class HikariDataSourceMeterBinder implements MeterBinder {

@Override
public void bindTo(MeterRegistry registry) {
for (DataSource dataSource : this.dataSources) {
this.dataSources.stream(ObjectProvider.UNFILTERED).forEach((dataSource) -> {
HikariDataSource hikariDataSource = DataSourceUnwrapper.unwrap(dataSource, HikariConfigMXBean.class,
HikariDataSource.class);
if (hikariDataSource != null) {
bindMetricsRegistryToHikariDataSource(hikariDataSource, registry);
}
}
});
}

private void bindMetricsRegistryToHikariDataSource(HikariDataSource hikari, MeterRegistry registry) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
* @author Stephane Nicoll
* @author Andy Wilkinson
* @author Tommy Ludwig
* @author Yanming Zhou
*/
class DataSourcePoolMetricsAutoConfigurationTests {

Expand Down Expand Up @@ -156,14 +157,15 @@ void hikariDataSourceInstrumentationCanBeDisabled() {

@Test
void allHikariDataSourcesCanBeInstrumented() {
this.contextRunner.withUserConfiguration(TwoHikariDataSourcesConfiguration.class)
this.contextRunner.withUserConfiguration(MultipleHikariDataSourcesConfiguration.class)
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
.run((context) -> {
context.getBean("firstDataSource", DataSource.class).getConnection();
context.getBean("secondOne", DataSource.class).getConnection();
context.getBean("standardDataSource", DataSource.class).getConnection();
context.getBean("nonDefault", DataSource.class).getConnection();
context.getBean("nonAutowire", DataSource.class).getConnection();
MeterRegistry registry = context.getBean(MeterRegistry.class);
registry.get("hikaricp.connections").tags("pool", "firstDataSource").meter();
registry.get("hikaricp.connections").tags("pool", "secondOne").meter();
assertThat(registry.find("hikaricp.connections").meters()).map((meter) -> meter.getId().getTag("pool"))
.containsOnly("standardDataSource", "nonDefault");
});
}

Expand All @@ -182,16 +184,17 @@ void someHikariDataSourcesCanBeInstrumented() {

@Test
void allHikariDataSourcesCanBeInstrumentedWhenUsingLazyInitialization() {
this.contextRunner.withUserConfiguration(TwoHikariDataSourcesConfiguration.class)
this.contextRunner.withUserConfiguration(MultipleHikariDataSourcesConfiguration.class)
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
.withInitializer(
(context) -> context.addBeanFactoryPostProcessor(new LazyInitializationBeanFactoryPostProcessor()))
.run((context) -> {
context.getBean("firstDataSource", DataSource.class).getConnection();
context.getBean("secondOne", DataSource.class).getConnection();
context.getBean("standardDataSource", DataSource.class).getConnection();
context.getBean("nonDefault", DataSource.class).getConnection();
context.getBean("nonAutowire", DataSource.class).getConnection();
MeterRegistry registry = context.getBean(MeterRegistry.class);
registry.get("hikaricp.connections").tags("pool", "firstDataSource").meter();
registry.get("hikaricp.connections").tags("pool", "secondOne").meter();
assertThat(registry.find("hikaricp.connections").meters()).map((meter) -> meter.getId().getTag("pool"))
.containsOnly("standardDataSource", "nonDefault");
});
}

Expand Down Expand Up @@ -257,16 +260,21 @@ private DataSource createDataSource() {
}

@Configuration(proxyBeanMethods = false)
static class TwoHikariDataSourcesConfiguration {
static class MultipleHikariDataSourcesConfiguration {

@Bean
DataSource firstDataSource() {
return createHikariDataSource("firstDataSource");
DataSource standardDataSource() {
return createHikariDataSource("standardDataSource");
}

@Bean
DataSource secondOne() {
return createHikariDataSource("secondOne");
@Bean(defaultCandidate = false)
DataSource nonDefault() {
return createHikariDataSource("nonDefault");
}

@Bean(autowireCandidate = false)
DataSource nonAutowire() {
return createHikariDataSource("nonAutowire");
}

}
Expand Down