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 7
7
8
8
import io .opentelemetry .api .GlobalOpenTelemetry ;
9
9
import io .opentelemetry .api .OpenTelemetry ;
10
+ import io .opentelemetry .api .incubator .config .DeclarativeConfigProperties ;
10
11
import io .opentelemetry .api .trace .TracerProvider ;
11
12
import io .opentelemetry .instrumentation .api .incubator .config .internal .InstrumentationConfig ;
12
13
import io .opentelemetry .instrumentation .api .internal .EmbeddedInstrumentationProperties ;
@@ -183,8 +184,11 @@ public InstrumentationConfig instrumentationConfig(
183
184
*/
184
185
@ Bean
185
186
public ConfigProperties otelProperties (OpenTelemetryConfigurationModel model ) {
187
+ SdkConfigProvider provider = SdkConfigProvider .create (model );
188
+ DeclarativeConfigProperties instrumentationConfig = provider .getInstrumentationConfig ();
189
+
186
190
return DeclarativeConfigPropertiesBridge .create (
187
- DeclarativeConfiguration . toConfigProperties ( model ) );
191
+ instrumentationConfig );
188
192
}
189
193
}
190
194
}
Original file line number Diff line number Diff line change 10
10
import org .junit .jupiter .api .Test ;
11
11
import org .springframework .beans .factory .annotation .Autowired ;
12
12
import 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 ;
13
16
import org .springframework .boot .test .context .SpringBootTest ;
14
17
import org .springframework .boot .web .client .RestTemplateBuilder ;
15
18
20
23
SpringSmokeOtelConfiguration .class
21
24
},
22
25
webEnvironment = SpringBootTest .WebEnvironment .RANDOM_PORT )
26
+ @ EnableAutoConfiguration (exclude ={MongoAutoConfiguration .class , MongoDataAutoConfiguration .class })
23
27
class OtelSpringStarterSmokeTest extends AbstractSpringStarterSmokeTest {
24
28
25
29
@ Autowired private RestTemplateBuilder restTemplateBuilder ;
Original file line number Diff line number Diff line change 25
25
exporter :
26
26
test_bridge :
27
27
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