Skip to content

Commit 0f3a878

Browse files
committed
add ExtendedOpenTelemetry
1 parent 74a6a55 commit 0f3a878

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

instrumentation/opentelemetry-api/opentelemetry-api-1.55/javaagent/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,9 @@ dependencies {
1616

1717
testImplementation("io.opentelemetry:opentelemetry-api-incubator")
1818
}
19+
20+
tasks.withType<Test>().configureEach {
21+
jvmArgs(
22+
"-Dotel.experimental.config.file=$projectDir/src/test/resources/declarative-config.yaml"
23+
)
24+
}

instrumentation/opentelemetry-api/opentelemetry-api-1.55/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_55/incubator/ExtendedOpenTelemetryTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import static org.assertj.core.api.Assertions.assertThat;
99

1010
import io.opentelemetry.api.GlobalOpenTelemetry;
11+
import io.opentelemetry.api.OpenTelemetry;
1112
import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
1213
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
1314
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
@@ -19,17 +20,19 @@ class ExtendedOpenTelemetryTest {
1920
@RegisterExtension
2021
static final AgentInstrumentationExtension testing = AgentInstrumentationExtension.create();
2122

22-
private ExtendedOpenTelemetry extendedOpenTelemetry;
23+
private OpenTelemetry openTelemetry;
2324

2425
@BeforeEach
2526
void setup() {
26-
extendedOpenTelemetry = (ExtendedOpenTelemetry) GlobalOpenTelemetry.get();
27+
openTelemetry = GlobalOpenTelemetry.get();
2728
}
2829

2930
@Test
3031
void getConfig() {
32+
assertThat(openTelemetry).isInstanceOf(ExtendedOpenTelemetry.class);
33+
3134
DeclarativeConfigProperties instrumentationConfig =
32-
extendedOpenTelemetry.getConfigProvider().getInstrumentationConfig();
33-
assertThat(instrumentationConfig).isNull();
35+
((ExtendedOpenTelemetry) openTelemetry).getConfigProvider().getInstrumentationConfig();
36+
assertThat(instrumentationConfig).isNotNull();
3437
}
3538
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
file_format: 1.0-rc.1
2+
3+
tracer_provider:
4+
processors:
5+
- simple:
6+
exporter:
7+
console:

0 commit comments

Comments
 (0)