Reverting some unnecessary changes.

Improved createResource method

Author: robsunday

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

@@ -83,17 +83,23 @@ private static Resource createResourceFromModel(
           InvocationTargetException,
           IllegalAccessException,
           ClassNotFoundException {
-    Class<?> declarativeConfigurationClass =
-        Class.forName(
-            "io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration");
     Class<?> configurationModelClass =
         Class.forName(
             "io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel");
+    Method getResource = configurationModelClass.getMethod("getResource");
+    Object resourceModel = getResource.invoke(openTelemetryConfigurationModel);
 
+    Class<?> resourceModelClass =
+        Class.forName(
+            "io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ResourceModel");
+    Class<?> declarativeConfigurationClass =
+        Class.forName(
+            "io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration");
     Method createResource =
         declarativeConfigurationClass.getMethod(
-            "createResource", configurationModelClass, ComponentLoader.class);
-    return (Resource) createResource.invoke(null, openTelemetryConfigurationModel, componentLoader);
+            "createResource", resourceModelClass, ComponentLoader.class);
+
+    return (Resource) createResource.invoke(null, resourceModel, componentLoader);
   }
 
   private static ConfigurationException toConfigurationException(

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

@@ -111,20 +111,7 @@ public static OpenTelemetrySdk create(OpenTelemetryConfigurationModel configurat
   public static OpenTelemetrySdk create(
       OpenTelemetryConfigurationModel configurationModel, ComponentLoader componentLoader) {
     SpiHelper spiHelper = SpiHelper.create(componentLoader);
-    return create(configurationModel, spiHelper);
-  }
 
-  /**
-   * Interpret the {@code configurationModel} to create {@link OpenTelemetrySdk} instance
-   * corresponding to the configuration.
-   *
-   * @param configurationModel the configuration model
-   * @param spiHelper the component loader used to load {@link ComponentProvider} implementations
-   * @return the {@link OpenTelemetrySdk}
-   * @throws DeclarativeConfigException if unable to interpret
-   */
-  public static OpenTelemetrySdk create(
-      OpenTelemetryConfigurationModel configurationModel, SpiHelper spiHelper) {
     DeclarativeConfigurationBuilder builder = new DeclarativeConfigurationBuilder();
 
     for (DeclarativeConfigurationCustomizerProvider provider :
@@ -222,8 +209,7 @@ public static Sampler createSampler(DeclarativeConfigProperties genericSamplerMo
 
   /** Create a {@link Resource} from the {@code resourceModel} representing the resource config. */
   public static Resource createResource(
-      OpenTelemetryConfigurationModel model, ComponentLoader componentLoader) {
-    ResourceModel resourceModel = model.getResource();
+      ResourceModel resourceModel, ComponentLoader componentLoader) {
     if (resourceModel == null) {
       return Resource.getDefault();
     }