File tree Expand file tree Collapse file tree 3 files changed +21
-5
lines changed
instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure
smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig
java/io/opentelemetry/spring/smoketest Expand file tree Collapse file tree 3 files changed +21
-5
lines changed Original file line number Diff line number Diff line change 77
88import io .opentelemetry .api .GlobalOpenTelemetry ;
99import io .opentelemetry .api .OpenTelemetry ;
10+ import io .opentelemetry .api .incubator .config .DeclarativeConfigProperties ;
1011import io .opentelemetry .api .trace .TracerProvider ;
1112import io .opentelemetry .instrumentation .api .incubator .config .internal .InstrumentationConfig ;
1213import io .opentelemetry .instrumentation .api .internal .EmbeddedInstrumentationProperties ;
@@ -183,8 +184,11 @@ public InstrumentationConfig instrumentationConfig(
183184 */
184185 @ Bean
185186 public ConfigProperties otelProperties (OpenTelemetryConfigurationModel model ) {
187+ SdkConfigProvider provider = SdkConfigProvider .create (model );
188+ DeclarativeConfigProperties instrumentationConfig = provider .getInstrumentationConfig ();
189+
186190 return DeclarativeConfigPropertiesBridge .create (
187- DeclarativeConfiguration . toConfigProperties ( model ) );
191+ instrumentationConfig );
188192 }
189193 }
190194 }
Original file line number Diff line number Diff line change 1010import org .junit .jupiter .api .Test ;
1111import org .springframework .beans .factory .annotation .Autowired ;
1212import org .springframework .beans .factory .annotation .Value ;
13+ import org .springframework .boot .autoconfigure .EnableAutoConfiguration ;
14+ import org .springframework .boot .autoconfigure .data .mongo .MongoDataAutoConfiguration ;
15+ import org .springframework .boot .autoconfigure .mongo .MongoAutoConfiguration ;
1316import org .springframework .boot .test .context .SpringBootTest ;
1417import org .springframework .boot .web .client .RestTemplateBuilder ;
1518
2023 SpringSmokeOtelConfiguration .class
2124 },
2225 webEnvironment = SpringBootTest .WebEnvironment .RANDOM_PORT )
26+ @ EnableAutoConfiguration (exclude ={MongoAutoConfiguration .class , MongoDataAutoConfiguration .class })
2327class OtelSpringStarterSmokeTest extends AbstractSpringStarterSmokeTest {
2428
2529 @ Autowired private RestTemplateBuilder restTemplateBuilder ;
Original file line number Diff line number Diff line change 2525 exporter :
2626 test_bridge :
2727
28- resource :
29- attributes :
30- - name : foo
31- value : bar
28+ propagator :
29+ composite :
30+ - tracecontext :
31+ - baggage :
32+
33+ instrumentation/development :
34+ java :
35+ runtime-telemetry :
36+ emit-experimental-telemetry : true
37+ http :
38+ client :
39+ emit-experimental-telemetry : true
You can’t perform that action at this time.
0 commit comments