open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix rebase

This commit is contained in:
Gregor Zeitlinger 2025-07-23 11:28:20 +02:00
parent d435823710
commit 13d0243597
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java
View File

@ -445,12 +445,12 @@ public final class AutoConfiguredOpenTelemetrySdkBuilder implements AutoConfigur
}
private AutoConfiguredOpenTelemetrySdk buildImpl() {
SpiHelper spiHelper = SpiHelper.create(componentLoader);
ConfigProperties configProperties =
this.config != null ? this.config : DefaultConfigProperties.create(Collections.emptyMap());
AutoConfiguredOpenTelemetrySdk fromFileConfiguration =
maybeConfigureFromFile(configProperties, componentLoader);
maybeConfigureFromFile(
this.config != null
? this.config
: DefaultConfigProperties.create(Collections.emptyMap(), componentLoader),
componentLoader);
if (fromFileConfiguration != null) {
maybeRegisterShutdownHook(fromFileConfiguration.getOpenTelemetrySdk());
Object configProvider = fromFileConfiguration.getConfigProvider();
@ -460,6 +460,7 @@ public final class AutoConfiguredOpenTelemetrySdkBuilder implements AutoConfigur
return fromFileConfiguration;
}
SpiHelper spiHelper = SpiHelper.create(componentLoader);
if (!customized) {
customized = true;
mergeSdkTracerProviderConfigurer();