Moved more beans to the conditional on backward compatibility autoconfig; fixes gh-1555

spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java

@@ -64,6 +64,23 @@ import org.springframework.util.Assert;
 @Deprecated
 public class ZipkinBackwardsCompatibilityAutoConfiguration {
 
+	/**
+	 * Only used for creating a reporter bean with the method below.
+	 * @param zipkinProperties zipkin properties
+	 * @return bytes encoder
+	 * @deprecated left for backwards compatibility
+	 */
+	@Bean
+	@ConditionalOnMissingBean
+	@Deprecated
+	BytesEncoder<Span> spanBytesEncoder(ZipkinProperties zipkinProperties) {
+		return zipkinProperties.getEncoder();
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@Conditional(BackwardsCompatibilityCondition.class)
+	static class BackwardsCompatibilityConfiguration {
+
 		/**
 		 * Reporter that is depending on a {@link Sender} bean which is created in another
 		 * auto-configuration than {@link ZipkinAutoConfiguration}.
@@ -75,10 +92,10 @@ public class ZipkinBackwardsCompatibilityAutoConfiguration {
 		 * @deprecated left for backwards compatibility
 		 */
 		@Bean
-	@Conditional(BackwardsCompatibilityCondition.class)
 		@Deprecated
 		Reporter<Span> reporter(ReporterMetrics reporterMetrics, ZipkinProperties zipkin,
-			BytesEncoder<Span> spanBytesEncoder, DefaultListableBeanFactory beanFactory) {
+				BytesEncoder<Span> spanBytesEncoder,
+				DefaultListableBeanFactory beanFactory) {
 			List<String> beanNames = new ArrayList<>(
 					Arrays.asList(beanFactory.getBeanNamesForType(Sender.class)));
 			beanNames.remove(ZipkinAutoConfiguration.SENDER_BEAN_NAME);
@@ -89,19 +106,6 @@ public class ZipkinBackwardsCompatibilityAutoConfiguration {
 					.metrics(reporterMetrics).build(spanBytesEncoder);
 		}
 
-	/**
-	 * Only used for creating a reporter bean with the method above.
-	 * @param zipkinProperties zipkin properties
-	 * @return bytes encoder
-	 * @deprecated left for backwards compatibility
-	 */
-	@Bean
-	@ConditionalOnMissingBean
-	@Deprecated
-	BytesEncoder<Span> spanBytesEncoder(ZipkinProperties zipkinProperties) {
-		return zipkinProperties.getEncoder();
-	}
-
 		/**
 		 * Deprecated because this is moved to {@link TraceAutoConfiguration}. Left for
 		 * backwards compatibility reasons.
@@ -115,6 +119,8 @@ public class ZipkinBackwardsCompatibilityAutoConfiguration {
 			return new InMemoryReporterMetrics();
 		}
 
+	}
+
 	/**
 	 * Old approach: - one sender - one reporter
 	 *

spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfigurationTests.java

@@ -18,6 +18,7 @@ package org.springframework.cloud.sleuth.zipkin2;
 
 import org.junit.Test;
 import zipkin2.codec.BytesEncoder;
+import zipkin2.reporter.InMemoryReporterMetrics;
 import zipkin2.reporter.Reporter;
 import zipkin2.reporter.ReporterMetrics;
 
@@ -43,7 +44,8 @@ public class ZipkinBackwardsCompatibilityAutoConfigurationTests {
 			assertThat(context.getBean(ZipkinProperties.class)).isNotNull();
 			assertThat(context.getBean(Reporter.class)).isNotNull();
 			assertThat(context.getBean(BytesEncoder.class)).isNotNull();
-			assertThat(context.getBean(ReporterMetrics.class)).isNotNull();
+			assertThat(context.getBean(ReporterMetrics.class))
+					.isInstanceOf(InMemoryReporterMetrics.class);
 		});
 	}