Skip to content

Commit 4dd742c

Browse files
committed
revert ConditionalOnMissingBean
1 parent 77e4485 commit 4dd742c

File tree

2 files changed

+0
-23
lines changed

2 files changed

+0
-23
lines changed

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ public ResourceProvider otelDistroVersionResourceProvider() {
100100
}
101101

102102
@Bean
103-
@ConditionalOnMissingBean
104103
public AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk(
105104
Environment env,
106105
OtlpExporterProperties otlpExporterProperties,

instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfigurationTest.java

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import io.opentelemetry.api.OpenTelemetry;
1313
import io.opentelemetry.exporter.otlp.internal.OtlpSpanExporterProvider;
1414
import io.opentelemetry.sdk.OpenTelemetrySdk;
15-
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
1615
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1716
import io.opentelemetry.sdk.autoconfigure.spi.internal.AutoConfigureListener;
1817
import io.opentelemetry.sdk.trace.export.SpanExporter;
@@ -59,27 +58,6 @@ void customOpenTelemetry() {
5958
.hasBean("otelProperties"));
6059
}
6160

62-
private static class CustomAutoConfiguredSdkConfiguration {
63-
@Bean
64-
public AutoConfiguredOpenTelemetrySdk customAutoConfiguredSdk() {
65-
return AutoConfiguredOpenTelemetrySdk.builder().build();
66-
}
67-
}
68-
69-
@Test
70-
@DisplayName(
71-
"when Application Context contains AutoConfiguredOpenTelemetrySdk bean should NOT use default")
72-
void customAutoConfiguredOpenTelemetrySdk() {
73-
this.contextRunner
74-
.withUserConfiguration(CustomAutoConfiguredSdkConfiguration.class)
75-
.withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class))
76-
.run(
77-
context ->
78-
assertThat(context)
79-
.hasBean("customAutoConfiguredSdk")
80-
.doesNotHaveBean("autoConfiguredOpenTelemetrySdk"));
81-
}
82-
8361
@Test
8462
@DisplayName(
8563
"when Application Context DOES NOT contain OpenTelemetry bean should initialize openTelemetry")

0 commit comments

Comments
 (0)