Merge pull request #35455 from be-hase

* pr/35455: Polish "Fix invalid Zipkin Reporter back-off behavior" Fix invalid Zipkin Reporter back-off behavior Closes gh-35455
spring-projects · May 17, 2023 · d6a1a3d · d6a1a3d
2 parents 9245f3c + 4072588
commit d6a1a3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...a/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurations.java b/...a/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurations.java
@@ -118,7 +118,7 @@ ZipkinWebClientSender webClientSender(ZipkinProperties properties,
 	static class ReporterConfiguration {
 
 		@Bean
-		@ConditionalOnMissingBean
+		@ConditionalOnMissingBean(Reporter.class)
 		@ConditionalOnBean(Sender.class)
 		AsyncReporter<Span> spanReporter(Sender sender, BytesEncoder<Span> encoder) {
 			return AsyncReporter.builder(sender).build(encoder);

diff --git a/.../actuate/autoconfigure/tracing/zipkin/ZipkinConfigurationsReporterConfigurationTests.java b/.../actuate/autoconfigure/tracing/zipkin/ZipkinConfigurationsReporterConfigurationTests.java
@@ -56,10 +56,11 @@ void shouldNotSupplyReporterIfSenderIsMissing() {
 
 	@Test
 	void shouldBackOffOnCustomBeans() {
-		this.contextRunner.withUserConfiguration(CustomConfiguration.class).run((context) -> {
-			assertThat(context).hasBean("customReporter");
-			assertThat(context).hasSingleBean(Reporter.class);
-		});
+		this.contextRunner.withUserConfiguration(SenderConfiguration.class, CustomConfiguration.class)
+			.run((context) -> {
+				assertThat(context).hasBean("customReporter");
+				assertThat(context).hasSingleBean(Reporter.class);
+			});
 	}
 
 	@Configuration(proxyBeanMethods = false)