Skip to content

Commit 029f57e

Browse files
authored
Remove redundant @ConditionalOnBean(OpenTelemetry.class) (#15016)
1 parent 63c3813 commit 029f57e

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/mongo/MongoClientInstrumentationAutoConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
1212
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.InstrumentationConfigUtil;
1313
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
14-
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1514
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
1615
import org.springframework.boot.autoconfigure.mongo.MongoClientSettingsBuilderCustomizer;
1716
import org.springframework.context.annotation.Bean;
@@ -21,7 +20,6 @@
2120
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
2221
* any time.
2322
*/
24-
@ConditionalOnBean(OpenTelemetry.class)
2523
@ConditionalOnClass({MongoClientSettings.class, MongoClientSettingsBuilderCustomizer.class})
2624
@ConditionalOnEnabledInstrumentation(module = "mongo")
2725
@Configuration

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/r2dbc/R2dbcInstrumentationAutoConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1111
import io.r2dbc.spi.ConnectionFactory;
1212
import org.springframework.beans.factory.ObjectProvider;
13-
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1413
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
1514
import org.springframework.context.annotation.Bean;
1615
import org.springframework.context.annotation.Configuration;
@@ -19,7 +18,6 @@
1918
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
2019
* any time.
2120
*/
22-
@ConditionalOnBean(OpenTelemetry.class)
2321
@ConditionalOnClass(ConnectionFactory.class)
2422
@ConditionalOnEnabledInstrumentation(module = "r2dbc")
2523
@Configuration(proxyBeanMethods = false)

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/scheduling/SpringSchedulingInstrumentationAutoConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
1010
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1111
import org.aspectj.lang.annotation.Aspect;
12-
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1312
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
1413
import org.springframework.context.annotation.Bean;
1514
import org.springframework.context.annotation.Configuration;
@@ -21,7 +20,6 @@
2120
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
2221
* at any time.
2322
*/
24-
@ConditionalOnBean(OpenTelemetry.class)
2523
@ConditionalOnEnabledInstrumentation(module = "spring-scheduling")
2624
@ConditionalOnClass({Scheduled.class, Aspect.class})
2725
@Configuration

0 commit comments

Comments
 (0)