From 13d02435974b31956a32f9d3fcdfb0d5193324ff Mon Sep 17 00:00:00 2001
From: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Date: Wed, 23 Jul 2025 11:28:20 +0200
Subject: [PATCH] fix rebase

---
 .../AutoConfiguredOpenTelemetrySdkBuilder.java        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java
index 0c90318ae6..9211df6f12 100644
--- a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java
+++ b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java
@@ -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();