File tree 2 files changed +4
-10
lines changed
instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation
2 files changed +4
-10
lines changed Original file line number Diff line number Diff line change 8
8
import com .mongodb .MongoClientSettings ;
9
9
import io .opentelemetry .api .OpenTelemetry ;
10
10
import io .opentelemetry .instrumentation .mongo .v3_1 .MongoTelemetry ;
11
+ import io .opentelemetry .instrumentation .spring .autoconfigure .internal .ConditionalOnEnabledInstrumentation ;
11
12
import io .opentelemetry .instrumentation .spring .autoconfigure .internal .InstrumentationConfigUtil ;
12
- import io .opentelemetry .instrumentation .spring .autoconfigure .internal .SdkEnabled ;
13
13
import io .opentelemetry .sdk .autoconfigure .spi .ConfigProperties ;
14
14
import org .springframework .boot .autoconfigure .condition .ConditionalOnBean ;
15
15
import org .springframework .boot .autoconfigure .condition .ConditionalOnClass ;
16
- import org .springframework .boot .autoconfigure .condition .ConditionalOnProperty ;
17
16
import org .springframework .boot .autoconfigure .mongo .MongoClientSettingsBuilderCustomizer ;
18
17
import org .springframework .context .annotation .Bean ;
19
- import org .springframework .context .annotation .Conditional ;
20
18
import org .springframework .context .annotation .Configuration ;
21
19
22
20
@ ConditionalOnBean (OpenTelemetry .class )
23
21
@ ConditionalOnClass (MongoClientSettings .class )
24
- @ ConditionalOnProperty (name = "otel.instrumentation.mongo.enabled" , matchIfMissing = true )
25
- @ Conditional (SdkEnabled .class )
22
+ @ ConditionalOnEnabledInstrumentation (module = "mongo" )
26
23
@ Configuration
27
24
public class MongoClientInstrumentationAutoConfiguration {
28
25
Original file line number Diff line number Diff line change 6
6
package io .opentelemetry .instrumentation .spring .autoconfigure .instrumentation .r2dbc ;
7
7
8
8
import io .opentelemetry .api .OpenTelemetry ;
9
- import io .opentelemetry .instrumentation .spring .autoconfigure .internal .SdkEnabled ;
9
+ import io .opentelemetry .instrumentation .spring .autoconfigure .internal .ConditionalOnEnabledInstrumentation ;
10
10
import io .opentelemetry .sdk .autoconfigure .spi .ConfigProperties ;
11
11
import io .r2dbc .spi .ConnectionFactory ;
12
12
import org .springframework .beans .factory .ObjectProvider ;
13
13
import org .springframework .boot .autoconfigure .condition .ConditionalOnBean ;
14
14
import org .springframework .boot .autoconfigure .condition .ConditionalOnClass ;
15
- import org .springframework .boot .autoconfigure .condition .ConditionalOnProperty ;
16
15
import org .springframework .context .annotation .Bean ;
17
- import org .springframework .context .annotation .Conditional ;
18
16
import org .springframework .context .annotation .Configuration ;
19
17
20
18
@ ConditionalOnBean (OpenTelemetry .class )
21
19
@ ConditionalOnClass (ConnectionFactory .class )
22
- @ ConditionalOnProperty (name = "otel.instrumentation.r2dbc.enabled" , matchIfMissing = true )
23
- @ Conditional (SdkEnabled .class )
20
+ @ ConditionalOnEnabledInstrumentation (module = "r2dbc" )
24
21
@ Configuration (proxyBeanMethods = false )
25
22
public class R2dbcInstrumentationAutoConfiguration {
26
23
You can’t perform that action at this time.
0 commit comments