From 95109381203944c6b15bc74fe7952fb116ce08fc Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Wed, 30 Dec 2015 18:00:49 +0000
Subject: [PATCH] Make springIntegrationPublicMetrics conditional on bean by
 name not type

By type is too restrictive and surprising for users who wanted to add their
own MetricReaderPublicMetrics for other reasons.
---
 .../actuate/autoconfigure/PublicMetricsAutoConfiguration.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java
index 7b268cec25..003d372c17 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java
@@ -142,7 +142,7 @@ public class PublicMetricsAutoConfiguration {
 	static class IntegrationMetricsConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean
+		@ConditionalOnMissingBean(name = "springIntegrationPublicMetrics")
 		public MetricReaderPublicMetrics springIntegrationPublicMetrics(
 				IntegrationMBeanExporter exporter) {
 			return new MetricReaderPublicMetrics(