Skip to content

Commit 224484d

Browse files
committed
add test
1 parent f24a8c6 commit 224484d

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import io.opentelemetry.api.OpenTelemetry;
10+
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
1011
import io.opentelemetry.api.trace.TracerProvider;
1112
import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
1213
import 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
}

smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
import org.junit.jupiter.api.Test;
1111
import org.springframework.beans.factory.annotation.Autowired;
1212
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;
1316
import org.springframework.boot.test.context.SpringBootTest;
1417
import org.springframework.boot.web.client.RestTemplateBuilder;
1518

@@ -20,6 +23,7 @@
2023
SpringSmokeOtelConfiguration.class
2124
},
2225
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
26+
@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
2327
class OtelSpringStarterSmokeTest extends AbstractSpringStarterSmokeTest {
2428

2529
@Autowired private RestTemplateBuilder restTemplateBuilder;

smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig/resources/application.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,15 @@ otel:
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

0 commit comments

Comments
 (0)