Skip to content

Commit 99826d3

Browse files
committed
UT fix
1 parent d45b6a8 commit 99826d3

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ void configFile_fileNotFound() {
113113

114114
@Test
115115
void configFile_Valid() {
116+
Resource expectedResource = Resource.getDefault().toBuilder().put("service.name", "test").build();
116117
ConfigProperties config =
117118
DefaultConfigProperties.createFromMap(
118119
Collections.singletonMap("otel.experimental.config.file", configFilePath.toString()));
119120
OpenTelemetrySdk expectedSdk =
120121
OpenTelemetrySdk.builder()
121122
.setTracerProvider(
122123
SdkTracerProvider.builder()
123-
.setResource(
124-
Resource.getDefault().toBuilder().put("service.name", "test").build())
124+
.setResource(expectedResource)
125125
.addSpanProcessor(SimpleSpanProcessor.create(LoggingSpanExporter.create()))
126126
.build())
127127
.build();
@@ -136,10 +136,8 @@ void configFile_Valid() {
136136

137137
Assertions.assertThat(autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk().toString())
138138
.isEqualTo(expectedSdk.toString());
139-
// AutoConfiguredOpenTelemetrySdk#getResource() is set to a dummy value when configuring from
140-
// file
141139
Assertions.assertThat(autoConfiguredOpenTelemetrySdk.getResource())
142-
.isEqualTo(Resource.getDefault());
140+
.isEqualTo(expectedResource);
143141
verify(builder, times(1)).shutdownHook(autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk());
144142
Assertions.assertThat(Runtime.getRuntime().removeShutdownHook(thread)).isTrue();
145143
logCapturer.assertContains("Autoconfiguring from configuration file: " + configFilePath);

0 commit comments

Comments
 (0)