Skip to content

Commit 4d6b1cd

Browse files
authored
Use more @ConditionalOnEnabledInstrumentation (#11665)
1 parent ec02fb5 commit 4d6b1cd

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,18 @@
88
import com.mongodb.MongoClientSettings;
99
import io.opentelemetry.api.OpenTelemetry;
1010
import io.opentelemetry.instrumentation.mongo.v3_1.MongoTelemetry;
11+
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
1112
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.InstrumentationConfigUtil;
12-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
1313
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1414
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1515
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
16-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
1716
import org.springframework.boot.autoconfigure.mongo.MongoClientSettingsBuilderCustomizer;
1817
import org.springframework.context.annotation.Bean;
19-
import org.springframework.context.annotation.Conditional;
2018
import org.springframework.context.annotation.Configuration;
2119

2220
@ConditionalOnBean(OpenTelemetry.class)
2321
@ConditionalOnClass(MongoClientSettings.class)
24-
@ConditionalOnProperty(name = "otel.instrumentation.mongo.enabled", matchIfMissing = true)
25-
@Conditional(SdkEnabled.class)
22+
@ConditionalOnEnabledInstrumentation(module = "mongo")
2623
@Configuration
2724
public class MongoClientInstrumentationAutoConfiguration {
2825

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,18 @@
66
package io.opentelemetry.instrumentation.spring.autoconfigure.instrumentation.r2dbc;
77

88
import io.opentelemetry.api.OpenTelemetry;
9-
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.SdkEnabled;
9+
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
1010
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1111
import io.r2dbc.spi.ConnectionFactory;
1212
import org.springframework.beans.factory.ObjectProvider;
1313
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1414
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
15-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
1615
import org.springframework.context.annotation.Bean;
17-
import org.springframework.context.annotation.Conditional;
1816
import org.springframework.context.annotation.Configuration;
1917

2018
@ConditionalOnBean(OpenTelemetry.class)
2119
@ConditionalOnClass(ConnectionFactory.class)
22-
@ConditionalOnProperty(name = "otel.instrumentation.r2dbc.enabled", matchIfMissing = true)
23-
@Conditional(SdkEnabled.class)
20+
@ConditionalOnEnabledInstrumentation(module = "r2dbc")
2421
@Configuration(proxyBeanMethods = false)
2522
public class R2dbcInstrumentationAutoConfiguration {
2623

0 commit comments

Comments
 (0)