fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make auto-configured BatchSpanProcessor back off when the user defines their own

Browse Source 
Closes gh-44601
This commit is contained in:
Moritz Halbritter 2025-03-06 13:34:08 +01:00
parent 00b2fe7d95
commit 3fc07644ee
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryTracingAutoConfiguration.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2024 the original author or authors. * Copyright 2012-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -115,6 +115,7 @@ public class OpenTelemetryTracingAutoConfiguration {
} }
@Bean @Bean
@ConditionalOnMissingBean
BatchSpanProcessor otelSpanProcessor(SpanExporters spanExporters, BatchSpanProcessor otelSpanProcessor(SpanExporters spanExporters,
ObjectProvider<SpanExportingPredicate> spanExportingPredicates, ObjectProvider<SpanReporter> spanReporters, ObjectProvider<SpanExportingPredicate> spanExportingPredicates, ObjectProvider<SpanReporter> spanReporters,
ObjectProvider<SpanFilter> spanFilters, ObjectProvider<MeterProvider> meterProvider) { ObjectProvider<SpanFilter> spanFilters, ObjectProvider<MeterProvider> meterProvider) {

10
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryTracingAutoConfigurationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2024 the original author or authors. * Copyright 2012-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -51,6 +51,7 @@ import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.SpanLimits; import io.opentelemetry.sdk.trace.SpanLimits;
import io.opentelemetry.sdk.trace.SpanProcessor; import io.opentelemetry.sdk.trace.SpanProcessor;
import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData;
import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
import io.opentelemetry.sdk.trace.export.SpanExporter; import io.opentelemetry.sdk.trace.export.SpanExporter;
import io.opentelemetry.sdk.trace.samplers.Sampler; import io.opentelemetry.sdk.trace.samplers.Sampler;
import org.assertj.core.api.InstanceOfAssertFactories; import org.assertj.core.api.InstanceOfAssertFactories;
@ -172,6 +173,8 @@ class OpenTelemetryTracingAutoConfigurationTests {
assertThat(context).hasSingleBean(SpanProcessors.class); assertThat(context).hasSingleBean(SpanProcessors.class);
assertThat(context).hasBean("customSpanExporters"); assertThat(context).hasBean("customSpanExporters");
assertThat(context).hasSingleBean(SpanExporters.class); assertThat(context).hasSingleBean(SpanExporters.class);
assertThat(context).hasBean("customBatchSpanProcessor");
assertThat(context).hasSingleBean(BatchSpanProcessor.class);
}); });
} }
@ -401,6 +404,11 @@ class OpenTelemetryTracingAutoConfigurationTests {
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
private static final class CustomConfiguration { private static final class CustomConfiguration {
@Bean
BatchSpanProcessor customBatchSpanProcessor() {
return mock(BatchSpanProcessor.class);
}
@Bean @Bean
SpanProcessors customSpanProcessors() { SpanProcessors customSpanProcessors() {
return SpanProcessors.of(mock(SpanProcessor.class)); return SpanProcessors.of(mock(SpanProcessor.class));