Skip to content

Commit 77726ad

Browse files
committed
config bridge
1 parent 7610037 commit 77726ad

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.opentelemetry.instrumentation.spring.autoconfigure;
77

88
import io.opentelemetry.api.OpenTelemetry;
9-
import io.opentelemetry.api.incubator.config.ConfigProvider;
109
import io.opentelemetry.api.incubator.config.GlobalConfigProvider;
1110
import io.opentelemetry.api.trace.TracerProvider;
1211
import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
@@ -132,6 +131,12 @@ public OpenTelemetry openTelemetry(
132131
return autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk();
133132
}
134133

134+
@Bean
135+
public InstrumentationConfig instrumentationConfig(
136+
ConfigProperties properties) {
137+
return new ConfigPropertiesBridge(properties);
138+
}
139+
135140
/**
136141
* Expose the {@link ConfigProperties} bean for use in other auto-configurations.
137142
*
@@ -180,15 +185,10 @@ public OpenTelemetry openTelemetry(
180185
return null;
181186
}
182187

183-
@Bean
184-
public ConfigProvider configProvider(OpenTelemetryConfigurationModel model) {
185-
return SdkConfigProvider.create(model);
186-
}
187-
188188
@Bean
189189
public InstrumentationConfig instrumentationConfig(
190-
ConfigProperties properties, ConfigProvider configProvider) {
191-
return new ConfigPropertiesBridge(properties, configProvider);
190+
ConfigProperties properties, OpenTelemetryConfigurationModel model) {
191+
return new ConfigPropertiesBridge(properties, SdkConfigProvider.create(model));
192192
}
193193

194194
/**

0 commit comments

Comments
 (0)