Fixed issue where the application would not start when zipkin is disabled (#1192)

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

@@ -58,7 +58,7 @@ import org.springframework.util.Assert;
  * @deprecated
  */
 @Configuration
-@ConditionalOnProperty(value = { "spring.sleuth.enabled" }, matchIfMissing = true)
+@ConditionalOnProperty(value = { "spring.sleuth.enabled", "spring.zipkin.enabled" }, matchIfMissing = true)
 @AutoConfigureBefore(ZipkinAutoConfiguration.class)
 @Deprecated
 public class ZipkinBackwardsCompatibilityAutoConfiguration {

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

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.sleuth.zipkin2;
+
+import org.junit.Test;
+import zipkin2.codec.BytesEncoder;
+import zipkin2.reporter.Reporter;
+import zipkin2.reporter.ReporterMetrics;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Tim Ysewyn
+ */
+public class ZipkinBackwardsCompatibilityAutoConfigurationTests {
+
+	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(
+					ZipkinBackwardsCompatibilityAutoConfiguration.class,
+					ZipkinAutoConfiguration.class,
+					TraceAutoConfiguration.class));
+
+	@Test
+	public void shouldLoadBeans() {
+		this.contextRunner.run(context -> {
+			assertThat(context.getBean(ZipkinProperties.class)).isNotNull();
+			assertThat(context.getBean(Reporter.class)).isNotNull();
+			assertThat(context.getBean(BytesEncoder.class)).isNotNull();
+			assertThat(context.getBean(ReporterMetrics.class)).isNotNull();
+		});
+	}
+
+	@Test
+	public void shouldNotLoadBackwardsCompatibilityConfigWhenZipkinDisabled() {
+		this.contextRunner
+				.withPropertyValues("spring.zipkin.enabled=false")
+				.run(context -> {
+				assertThat(context.getBeansOfType(ZipkinProperties.class)).isEmpty();
+				assertThat(context.getBeansOfType(BytesEncoder.class)).isEmpty();
+				assertThat(context.getBean(ReporterMetrics.class)).isNotNull(); // TraceAutoConfiguration
+				assertThat(context.getBean(Reporter.class)).isNotNull(); // noOpSpanReporter
+		});
+	}
+
+	@Test
+	public void shouldNotLoadBackwardsCompatibilityConfigWhenSleuthDisabled() {
+		this.contextRunner
+				.withPropertyValues("spring.sleuth.enabled=false")
+				.run(context -> {
+				assertThat(context.getBeansOfType(ZipkinProperties.class)).isEmpty();
+				assertThat(context.getBeansOfType(BytesEncoder.class)).isEmpty();
+				assertThat(context.getBeansOfType(ReporterMetrics.class)).isEmpty();
+				assertThat(context.getBeansOfType(Reporter.class)).isEmpty();
+		});
+	}
+
+}