Fix non-default candidate DataSources are not included in metrics

See spring-projects#43481 (comment)

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

Author: quaff

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java

@@ -54,6 +54,7 @@
  * {@link DataSource datasources}.
  *
  * @author Stephane Nicoll
+ * @author Yanming Zhou
  * @since 2.0.0
  */
 @AutoConfiguration(after = { MetricsAutoConfiguration.class, DataSourceAutoConfiguration.class,
@@ -90,7 +91,9 @@ static class DataSourcePoolMetadataMeterBinder implements MeterBinder {
 
 			@Override
 			public void bindTo(MeterRegistry registry) {
-				List<DataSourcePoolMetadataProvider> metadataProvidersList = this.metadataProviders.stream().toList();
+				List<DataSourcePoolMetadataProvider> metadataProvidersList = this.metadataProviders
+					.stream(ObjectProvider.UNFILTERED)
+					.toList();
 				this.dataSources.forEach((name, dataSource) -> bindDataSourceToRegistry(name, dataSource,
 						metadataProvidersList, registry));
 			}
@@ -140,13 +143,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) {

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

@@ -51,6 +51,7 @@
  * @author Stephane Nicoll
  * @author Andy Wilkinson
  * @author Tommy Ludwig
+ * @author Yanming Zhou
  */
 class DataSourcePoolMetricsAutoConfigurationTests {
 
@@ -219,6 +220,20 @@ void hikariDataSourceIsInstrumentedWithoutMetadataProvider() {
 		});
 	}
 
+	@Test
+	void nonDefaultHikariDataSourcesCanBeInstrumented() {
+		this.contextRunner.withUserConfiguration(NonDefaultHikariDataSourceConfiguration.class)
+			.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
+			.run((context) -> {
+				assertThat(context).getBeanNames(DataSource.class)
+					.containsExactlyInAnyOrder("dataSource", "nonDefaultHikariDataSource");
+				context.getBean("nonDefaultHikariDataSource", DataSource.class).getConnection();
+				MeterRegistry registry = context.getBean(MeterRegistry.class);
+				assertThat(registry.get("hikaricp.connections").meter().getId().getTags())
+					.containsExactly(Tag.of("pool", "nonDefaultHikariDataSource"));
+			});
+	}
+
 	private static HikariDataSource createHikariDataSource(String poolName) {
 		String url = "jdbc:hsqldb:mem:test-" + UUID.randomUUID();
 		HikariDataSource hikariDataSource = DataSourceBuilder.create().url(url).type(HikariDataSource.class).build();
@@ -271,6 +286,16 @@ DataSource secondOne() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class NonDefaultHikariDataSourceConfiguration {
+
+		@Bean(defaultCandidate = false)
+		DataSource nonDefaultHikariDataSource() {
+			return createHikariDataSource("nonDefaultHikariDataSource");
+		}
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class ProxiedHikariDataSourcesConfiguration {