Skip to content

Commit f86f89b

Browse files
committed
rebase
1 parent 7550915 commit f86f89b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfiguration.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import io.opentelemetry.common.ComponentLoader;
1515
import io.opentelemetry.sdk.OpenTelemetrySdk;
1616
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
17+
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
1718
import io.opentelemetry.sdk.autoconfigure.spi.internal.AutoConfigureListener;
1819
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
1920
import io.opentelemetry.sdk.extension.incubator.ExtendedOpenTelemetrySdk;
@@ -118,12 +119,13 @@ public static ExtendedOpenTelemetrySdk create(
118119
return create(configurationModel, DeclarativeConfigContext.create(componentLoader));
119120
}
120121

121-
private static OpenTelemetrySdk create(
122+
private static ExtendedOpenTelemetrySdk create(
122123
OpenTelemetryConfigurationModel configurationModel, DeclarativeConfigContext context) {
123124
DeclarativeConfigurationBuilder builder = new DeclarativeConfigurationBuilder();
124125

126+
SpiHelper spiHelper = context.getSpiHelper();
125127
for (DeclarativeConfigurationCustomizerProvider provider :
126-
context.getSpiHelper().loadOrdered(DeclarativeConfigurationCustomizerProvider.class)) {
128+
spiHelper.loadOrdered(DeclarativeConfigurationCustomizerProvider.class)) {
127129
provider.customize(builder);
128130
}
129131

0 commit comments

Comments
 (0)