don't create resource twice

Author: zeitlinger

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

@@ -9,9 +9,7 @@
 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;
@@ -46,20 +44,8 @@ static AutoConfiguredOpenTelemetrySdk configureFromFile(
               "io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel");
       Method create =
           declarativeConfiguration.getMethod(
-              "create", openTelemetryConfiguration, ComponentLoader.class);
-      OpenTelemetrySdk sdk = (OpenTelemetrySdk) create.invoke(null, model, componentLoader);
-      Class<?> sdkConfigProvider =
-          Class.forName("io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider");
-      Method createFileConfigProvider =
-          sdkConfigProvider.getMethod("create", openTelemetryConfiguration, ComponentLoader.class);
-      ConfigProvider configProvider =
-          (ConfigProvider) createFileConfigProvider.invoke(null, model, componentLoader);
-      Method createResource =
-          declarativeConfiguration.getMethod(
-              "createResource", openTelemetryConfiguration, ComponentLoader.class);
-      Resource resource = (Resource) createResource.invoke(null, model, componentLoader);
-
-      return AutoConfiguredOpenTelemetrySdk.create(sdk, resource, null, configProvider);
+              "createAutoConfiguredSdk", openTelemetryConfiguration, ComponentLoader.class);
+      return (AutoConfiguredOpenTelemetrySdk) create.invoke(null, model, componentLoader);
     } catch (FileNotFoundException e) {
       throw new ConfigurationException("Configuration file not found", e);
     } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {

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

@@ -7,8 +7,10 @@
 
 import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.resources.Resource;
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -21,11 +23,17 @@ class DeclarativeConfigContext {
 
   private final SpiHelper spiHelper;
   private final List<Closeable> closeables = new ArrayList<>();
+  private Resource resource = Resource.empty();
 
+  // Visible for testing
   DeclarativeConfigContext(SpiHelper spiHelper) {
     this.spiHelper = spiHelper;
   }
 
+  static DeclarativeConfigContext create(ComponentLoader componentLoader) {
+    return new DeclarativeConfigContext(SpiHelper.create(componentLoader));
+  }
+
   /**
    * Add the {@code closeable} to the list of closeables to clean up if configuration fails
    * exceptionally, and return it.
@@ -39,6 +47,18 @@ List<Closeable> getCloseables() {
     return Collections.unmodifiableList(closeables);
   }
 
+  Resource getResource() {
+    return resource;
+  }
+
+  void setResource(Resource resource) {
+    this.resource = resource;
+  }
+
+  SpiHelper getSpiHelper() {
+    return spiHelper;
+  }
+
   /**
    * Find a registered {@link ComponentProvider} with {@link ComponentProvider#getType()} matching
    * {@code type}, {@link ComponentProvider#getName()} matching {@code name}, and call {@link

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

@@ -13,7 +13,9 @@
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel;
@@ -22,6 +24,8 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
@@ -112,38 +116,60 @@ public static OpenTelemetrySdk create(OpenTelemetryConfigurationModel configurat
    */
   public static OpenTelemetrySdk create(
       OpenTelemetryConfigurationModel configurationModel, ComponentLoader componentLoader) {
-    SpiHelper spiHelper = SpiHelper.create(componentLoader);
+    return create(configurationModel, DeclarativeConfigContext.create(componentLoader));
+  }
+
+  private static OpenTelemetrySdk create(
+      OpenTelemetryConfigurationModel configurationModel, DeclarativeConfigContext context) {
+    DeclarativeConfigurationBuilder builder = new DeclarativeConfigurationBuilder();
+
+    for (DeclarativeConfigurationCustomizerProvider provider :
+        context.getSpiHelper().loadOrdered(DeclarativeConfigurationCustomizerProvider.class)) {
+      provider.customize(builder);
+    }
 
     return createAndMaybeCleanup(
         OpenTelemetryConfigurationFactory.getInstance(),
-        spiHelper,
-        customizeModel(configurationModel, spiHelper));
+        context,
+        builder.customizeModel(configurationModel));
   }
 
-  public static Resource createResource(
+  public static AutoConfiguredOpenTelemetrySdk createAutoConfiguredSdk(
       OpenTelemetryConfigurationModel configurationModel, ComponentLoader componentLoader) {
-    SpiHelper spiHelper = SpiHelper.create(componentLoader);
-    OpenTelemetryConfigurationModel model = customizeModel(configurationModel, spiHelper);
-
-    Resource resource = Resource.getDefault();
-    if (model.getResource() != null) {
-      resource =
-          ResourceFactory.getInstance()
-              .create(model.getResource(), new DeclarativeConfigContext(spiHelper));
-    }
-    return resource;
-  }
+    DeclarativeConfigContext context = DeclarativeConfigContext.create(componentLoader);
 
-  private static OpenTelemetryConfigurationModel customizeModel(
-      OpenTelemetryConfigurationModel configurationModel, SpiHelper spiHelper) {
-    DeclarativeConfigurationBuilder builder = new DeclarativeConfigurationBuilder();
+    OpenTelemetrySdk sdk = create(configurationModel, context);
+    SdkConfigProvider provider = SdkConfigProvider.create(configurationModel, componentLoader);
 
-    for (DeclarativeConfigurationCustomizerProvider provider :
-        spiHelper.loadOrdered(DeclarativeConfigurationCustomizerProvider.class)) {
-      provider.customize(builder);
+    try {
+      Method method =
+          Class.forName(AutoConfiguredOpenTelemetrySdk.class.getName())
+              .getDeclaredMethod(
+                  "create",
+                  OpenTelemetrySdk.class,
+                  Resource.class,
+                  ConfigProperties.class,
+                  Object.class);
+      method.setAccessible(true);
+      return (AutoConfiguredOpenTelemetrySdk)
+          method.invoke(null, sdk, context.getResource(), null, provider);
+    } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
+      throw new ConfigurationException(
+          "Error configuring from file. Is opentelemetry-sdk-extension-incubator on the classpath?",
+          e);
+    } catch (InvocationTargetException e) {
+      Throwable cause = e.getCause();
+      if (cause instanceof DeclarativeConfigException) {
+        throw toConfigurationException((DeclarativeConfigException) cause);
+      }
+      throw new ConfigurationException("Unexpected error configuring from file", e);
     }
+  }
 
-    return builder.customizeModel(configurationModel);
+  private static ConfigurationException toConfigurationException(
+      DeclarativeConfigException exception) {
+    String message = Objects.requireNonNull(exception.getMessage());
+    return new ConfigurationException(message, exception);
   }
 
   /**
@@ -226,7 +252,7 @@ public static Sampler createSampler(DeclarativeConfigProperties genericSamplerMo
             DeclarativeConfigProperties.toMap(yamlDeclarativeConfigProperties), SamplerModel.class);
     return createAndMaybeCleanup(
         SamplerFactory.getInstance(),
-        SpiHelper.create(yamlDeclarativeConfigProperties.getComponentLoader()),
+        DeclarativeConfigContext.create(yamlDeclarativeConfigProperties.getComponentLoader()),
         samplerModel);
   }
 
@@ -239,8 +265,8 @@ private static YamlDeclarativeConfigProperties requireYamlDeclarativeConfigPrope
     return (YamlDeclarativeConfigProperties) declarativeConfigProperties;
   }
 
-  static <M, R> R createAndMaybeCleanup(Factory<M, R> factory, SpiHelper spiHelper, M model) {
-    DeclarativeConfigContext context = new DeclarativeConfigContext(spiHelper);
+  static <M, R> R createAndMaybeCleanup(
+      Factory<M, R> factory, DeclarativeConfigContext context, M model) {
     try {
       return factory.create(model, context);
     } catch (RuntimeException e) {

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

@@ -52,6 +52,7 @@ public OpenTelemetrySdk create(
     if (model.getResource() != null) {
       resource = ResourceFactory.getInstance().create(model.getResource(), context);
     }
+    context.setResource(resource);
 
     if (model.getLoggerProvider() != null) {
       builder.setLoggerProvider(

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigurationCreateTest.java

@@ -16,10 +16,10 @@
 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.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanProcessorModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
-import io.opentelemetry.sdk.resources.Resource;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -176,18 +176,18 @@ void create_ModelCustomizer() {
   }
 
   @Test
-  void createResource() {
+  void createAutoConfiguredSdk() {
     OpenTelemetryConfigurationModel model = new OpenTelemetryConfigurationModel();
     model.withFileFormat("1.0-rc.1");
-    Resource resource =
-        DeclarativeConfiguration.createResource(
+    AutoConfiguredOpenTelemetrySdk sdk =
+        DeclarativeConfiguration.createAutoConfiguredSdk(
             model,
             // customizer is TestDeclarativeConfigurationCustomizerProvider
             ComponentLoader.forClassLoader(
                 DeclarativeConfigurationCreateTest.class.getClassLoader()));
-    assertThat(resource.toString())
+    assertThat(sdk.toString())
         .contains(
-            "Resource{schemaUrl=null, attributes={"
+            "resource=Resource{schemaUrl=null, attributes={"
                 + "color=\"blue\", "
                 + "foo=\"bar\", "
                 + "service.name=\"unknown_service:java\", "