From 21b645fba8d1080e6ef589297786f151a32e1641 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Thu, 14 Sep 2017 14:53:59 -0700
Subject: [PATCH] Add missing ObjectProvider for missing beans

Update `MetricsAutoConfiguration` to use an `ObjectProvider` to guard
against missing beans.

See gh-9970
---
 .../autoconfigure/metrics/MetricsAutoConfiguration.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java
index 069feee08dc..14562127991 100644
--- a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java
+++ b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfiguration.java
@@ -114,10 +114,12 @@ public class MetricsAutoConfiguration {
 
 		MeterRegistryConfigurationSupport(MeterRegistry registry,
 				ObjectProvider<Collection<MeterRegistryConfigurer>> configurers,
-				MetricsProperties config, Collection<MeterBinder> binders) {
+				MetricsProperties config,
+				ObjectProvider<Collection<MeterBinder>> binders) {
 			configurers.getIfAvailable(Collections::emptyList)
 					.forEach((configurer) -> configurer.configureRegistry(registry));
-			binders.forEach((binder) -> binder.bindTo(registry));
+			binders.getIfAvailable(Collections::emptyList)
+					.forEach((binder) -> binder.bindTo(registry));
 			if (config.isUseGlobalRegistry()) {
 				Metrics.addRegistry(registry);
 			}