move logic to incubating util

Author: zeitlinger

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

@@ -11,7 +11,9 @@
 import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
 import io.opentelemetry.api.incubator.config.GlobalConfigProvider;
 import io.opentelemetry.common.ComponentLoader;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import io.opentelemetry.sdk.resources.Resource;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -98,11 +100,32 @@ private static AutoConfiguredOpenTelemetrySdk getOpenTelemetrySdk(
     Class<?> declarativeConfiguration =
         Class.forName(
             "io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration");
+
+    Class<?> contextClass =
+        Class.forName(
+            "io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigContext");
+    Method createContext = contextClass.getDeclaredMethod("create", ComponentLoader.class);
+    createContext.setAccessible(true);
+    Object context = createContext.invoke(null, componentLoader);
+
     Method create =
-        declarativeConfiguration.getMethod(
-            "createAutoConfiguredSdk", openTelemetryConfiguration, ComponentLoader.class);
+        declarativeConfiguration.getDeclaredMethod(
+            "create", openTelemetryConfiguration, contextClass);
+    create.setAccessible(true);
+    OpenTelemetrySdk sdk = (OpenTelemetrySdk) create.invoke(null, model, context);
+
+    Class<?> providerClass =
+        Class.forName("io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider");
+    Object provider =
+        providerClass
+            .getDeclaredMethod("create", openTelemetryConfiguration, ComponentLoader.class)
+            .invoke(null, model, componentLoader);
+
+    Method getResource = contextClass.getDeclaredMethod("getResource");
+    getResource.setAccessible(true);
+    Resource resource = (Resource) getResource.invoke(context);
 
-    return (AutoConfiguredOpenTelemetrySdk) create.invoke(null, model, componentLoader);
+    return AutoConfiguredOpenTelemetrySdk.create(sdk, resource, null, provider);
   }
 
   // Visible for testing

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

@@ -13,7 +13,6 @@
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.AutoConfigureListener;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
@@ -138,15 +137,6 @@ private static ExtendedOpenTelemetrySdk create(
     return sdk;
   }
 
-  public static AutoConfiguredOpenTelemetrySdk createAutoConfiguredSdk(
-      OpenTelemetryConfigurationModel configurationModel, ComponentLoader componentLoader) {
-    DeclarativeConfigContext context = DeclarativeConfigContext.create(componentLoader);
-    OpenTelemetrySdk sdk = create(configurationModel, context);
-    SdkConfigProvider provider = SdkConfigProvider.create(configurationModel, componentLoader);
-
-    return AutoConfiguredOpenTelemetrySdkAccess.create(sdk, context.getResource(), provider);
-  }
-
   /**
    * Parse the {@code configuration} YAML and return the {@link OpenTelemetryConfigurationModel}.
    *

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

@@ -18,7 +18,6 @@
 import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.internal.testing.CleanupExtension;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.extension.incubator.ExtendedOpenTelemetrySdk;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
@@ -195,25 +194,4 @@ void callAutoConfigureListeners_exceptionIsCaught() {
                     spiHelper, OpenTelemetrySdk.builder().build()))
         .doesNotThrowAnyException();
   }
-
-  @Test
-  void createAutoConfiguredSdk() {
-    OpenTelemetryConfigurationModel model = new OpenTelemetryConfigurationModel();
-    model.withFileFormat("1.0-rc.1");
-    AutoConfiguredOpenTelemetrySdk sdk =
-        DeclarativeConfiguration.createAutoConfiguredSdk(
-            model,
-            // customizer is TestDeclarativeConfigurationCustomizerProvider
-            ComponentLoader.forClassLoader(
-                DeclarativeConfigurationCreateTest.class.getClassLoader()));
-    assertThat(sdk.toString())
-        .contains(
-            "resource=Resource{schemaUrl=null, attributes={"
-                + "color=\"blue\", "
-                + "foo=\"bar\", "
-                + "service.name=\"unknown_service:java\", "
-                + "telemetry.sdk.language=\"java\", "
-                + "telemetry.sdk.name=\"opentelemetry\", "
-                + "telemetry.sdk.version=\"");
-  }
 }