root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.0.x' 

Closes gh-35546
This commit is contained in:
Phillip Webb 2023-05-17 16:42:38 -07:00
parent 59a4018cbe d6a1a3d71a
commit 0743da4987
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurations.java
View File

@ -127,7 +127,7 @@ class ZipkinConfigurations {
static class ReporterConfiguration { static class ReporterConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean(Reporter.class)
@ConditionalOnBean(Sender.class) @ConditionalOnBean(Sender.class)
AsyncReporter<Span> spanReporter(Sender sender, BytesEncoder<Span> encoder) { AsyncReporter<Span> spanReporter(Sender sender, BytesEncoder<Span> encoder) {
return AsyncReporter.builder(sender).build(encoder); return AsyncReporter.builder(sender).build(encoder);

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurationsReporterConfigurationTests.java
View File

@ -56,7 +56,8 @@ class ZipkinConfigurationsReporterConfigurationTests {
@Test @Test
void shouldBackOffOnCustomBeans() { void shouldBackOffOnCustomBeans() {
this.contextRunner.withUserConfiguration(CustomConfiguration.class).run((context) -> { this.contextRunner.withUserConfiguration(SenderConfiguration.class, CustomConfiguration.class)
.run((context) -> {
assertThat(context).hasBean("customReporter"); assertThat(context).hasBean("customReporter");
assertThat(context).hasSingleBean(Reporter.class); assertThat(context).hasSingleBean(Reporter.class);
}); });