remove AutoConfigureUtil.getConfigProvider

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeBuilder.java

@@ -8,7 +8,8 @@
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import io.opentelemetry.api.incubator.config.ConfigProvider;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
@@ -64,16 +65,18 @@ public DeclarativeConfigPropertiesBridgeBuilder addOverride(String propertyName,
 
   /** Build {@link ConfigProperties} from the {@code autoConfiguredOpenTelemetrySdk}. */
   public ConfigProperties build(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
+    OpenTelemetry openTelemetry = autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk();
+    if (openTelemetry instanceof ExtendedOpenTelemetry) {
+      return buildFromInstrumentationConfig(
+          ((ExtendedOpenTelemetry) openTelemetry).getConfigProvider().getInstrumentationConfig());
+    }
+
     ConfigProperties sdkConfigProperties =
         AutoConfigureUtil.getConfig(autoConfiguredOpenTelemetrySdk);
     if (sdkConfigProperties != null) {
       return sdkConfigProperties;
     }
-    ConfigProvider configProvider =
-        AutoConfigureUtil.getConfigProvider(autoConfiguredOpenTelemetrySdk);
-    if (configProvider != null) {
-      return buildFromInstrumentationConfig(configProvider.getInstrumentationConfig());
-    }
+
     // Should never happen
     throw new IllegalStateException(
         "AutoConfiguredOpenTelemetrySdk does not have ConfigProperties or DeclarativeConfigProperties. This is likely a programming error in opentelemetry-java");

declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeBuilderTest.java

@@ -15,6 +15,7 @@
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.extension.incubator.ExtendedOpenTelemetrySdk;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
@@ -52,13 +53,13 @@ void shouldUseConfigProviderForDeclarativeConfiguration() {
     when(configProviderMock.getInstrumentationConfig()).thenReturn(instrumentationConfigMock);
 
     AutoConfiguredOpenTelemetrySdk sdkMock = mock(AutoConfiguredOpenTelemetrySdk.class);
+    ExtendedOpenTelemetrySdk extendedOpenTelemetrySdk = mock(ExtendedOpenTelemetrySdk.class);
+    when(sdkMock.getOpenTelemetrySdk()).thenReturn(extendedOpenTelemetrySdk);
+    when(extendedOpenTelemetrySdk.getConfigProvider()).thenReturn(configProviderMock);
 
     try (MockedStatic<AutoConfigureUtil> autoConfigureUtilMock =
         Mockito.mockStatic(AutoConfigureUtil.class)) {
       autoConfigureUtilMock.when(() -> AutoConfigureUtil.getConfig(sdkMock)).thenReturn(null);
-      autoConfigureUtilMock
-          .when(() -> AutoConfigureUtil.getConfigProvider(sdkMock))
-          .thenReturn(configProviderMock);
 
       ConfigProperties configProperties =
           new DeclarativeConfigPropertiesBridgeBuilder().build(sdkMock);
@@ -70,15 +71,15 @@ void shouldUseConfigProviderForDeclarativeConfiguration() {
   @Test
   void shouldUseConfigProviderForDeclarativeConfiguration_noInstrumentationConfig() {
     AutoConfiguredOpenTelemetrySdk sdkMock = mock(AutoConfiguredOpenTelemetrySdk.class);
+    ExtendedOpenTelemetrySdk extendedOpenTelemetrySdk = mock(ExtendedOpenTelemetrySdk.class);
+    when(sdkMock.getOpenTelemetrySdk()).thenReturn(extendedOpenTelemetrySdk);
     ConfigProvider configProviderMock = mock(ConfigProvider.class);
+    when(extendedOpenTelemetrySdk.getConfigProvider()).thenReturn(configProviderMock);
     when(configProviderMock.getInstrumentationConfig()).thenReturn(null);
 
     try (MockedStatic<AutoConfigureUtil> autoConfigureUtilMock =
         Mockito.mockStatic(AutoConfigureUtil.class)) {
       autoConfigureUtilMock.when(() -> AutoConfigureUtil.getConfig(sdkMock)).thenReturn(null);
-      autoConfigureUtilMock
-          .when(() -> AutoConfigureUtil.getConfigProvider(sdkMock))
-          .thenReturn(configProviderMock);
 
       ConfigProperties configProperties =
           new DeclarativeConfigPropertiesBridgeBuilder().build(sdkMock);

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java

@@ -15,6 +15,8 @@
 import static net.bytebuddy.matcher.ElementMatchers.any;
 import static net.bytebuddy.matcher.ElementMatchers.none;
 
+import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
+import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.ContextStorage;
 import io.opentelemetry.context.Scope;
@@ -48,6 +50,7 @@
 import io.opentelemetry.javaagent.tooling.ignore.IgnoredTypesMatcher;
 import io.opentelemetry.javaagent.tooling.muzzle.AgentTooling;
 import io.opentelemetry.javaagent.tooling.util.Trie;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.SdkAutoconfigureAccess;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
@@ -167,9 +170,14 @@ private static void installBytebuddyAgent(
         installOpenTelemetrySdk(extensionClassLoader, earlyConfig);
 
     ConfigProperties sdkConfig = AutoConfigureUtil.getConfig(autoConfiguredSdk);
+    OpenTelemetrySdk openTelemetry = autoConfiguredSdk.getOpenTelemetrySdk();
+    ConfigProvider configProvider =
+        openTelemetry instanceof ExtendedOpenTelemetry
+            ? ((ExtendedOpenTelemetry) openTelemetry).getConfigProvider()
+            : null;
+
     AgentInstrumentationConfig.internalInitializeConfig(
-        new ConfigPropertiesBridge(
-            sdkConfig, AutoConfigureUtil.getConfigProvider(autoConfiguredSdk)));
+        new ConfigPropertiesBridge(sdkConfig, configProvider));
     copyNecessaryConfigToSystemProperties(sdkConfig);
 
     setBootstrapPackages(sdkConfig, extensionClassLoader);

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java

@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 
+import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.instrumentation.config.bridge.DeclarativeConfigPropertiesBridgeBuilder;
@@ -15,7 +16,6 @@
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.SdkAutoconfigureAccess;
-import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
 import io.opentelemetry.sdk.common.CompletableResultCode;
@@ -37,12 +37,12 @@ public static AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(
             .setResultAsGlobal()
             .setServiceClassLoader(extensionClassLoader)
             .build();
-    ConfigProvider configProvider = AutoConfigureUtil.getConfigProvider(autoConfiguredSdk);
     OpenTelemetrySdk sdk = autoConfiguredSdk.getOpenTelemetrySdk();
 
     setForceFlush(sdk);
 
-    if (configProvider != null) {
+    if (sdk instanceof ExtendedOpenTelemetry) {
+      ConfigProvider configProvider = ((ExtendedOpenTelemetry) sdk).getConfigProvider();
       // We create a new instance of AutoConfiguredOpenTelemetrySdk, which has a ConfigProperties
       // instance that can be used to read properties from the configuration file.
       // This allows most instrumentations to be unaware of which configuration style is used.

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/LibraryTestRunner.java

@@ -10,7 +10,6 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator;
-import io.opentelemetry.api.incubator.config.GlobalConfigProvider;
 import io.opentelemetry.api.logs.LoggerProvider;
 import io.opentelemetry.api.metrics.MeterProvider;
 import io.opentelemetry.api.trace.TracerBuilder;
@@ -66,7 +65,6 @@ public final class LibraryTestRunner extends InstrumentationTestRunner {
 
   static {
     GlobalOpenTelemetry.resetForTest();
-    GlobalConfigProvider.resetForTest();
 
     testSpanExporter = InMemorySpanExporter.create();
     testMetricExporter = InMemoryMetricExporter.create(AggregationTemporality.DELTA);
@@ -123,7 +121,6 @@ private LibraryTestRunner() {
   public void beforeTestClass() {
     // just in case: if there was any test that modified the global instance, reset it
     GlobalOpenTelemetry.resetForTest();
-    GlobalConfigProvider.resetForTest();
     GlobalOpenTelemetry.set(openTelemetrySdk);
   }