fix rebase

Author: zeitlinger

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

@@ -445,12 +445,12 @@ public AutoConfiguredOpenTelemetrySdk build() {
   }
 
   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 @@ private AutoConfiguredOpenTelemetrySdk buildImpl() {
       return fromFileConfiguration;
     }
 
+    SpiHelper spiHelper = SpiHelper.create(componentLoader);
     if (!customized) {
       customized = true;
       mergeSdkTracerProviderConfigurer();