Resource set in the AutoConfiguredOpenTelemetrySdk object is now configured from the 'resource' YAML node

Author: robsunday

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

@@ -48,15 +48,16 @@ static AutoConfiguredOpenTelemetrySdk configureFromFile(
           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);
       ConfigProvider configProvider = (ConfigProvider) createFileConfigProvider.invoke(null, model);
-      // Note: can't access file configuration resource without reflection so setting a dummy
-      // resource
-      return AutoConfiguredOpenTelemetrySdk.create(
-          sdk, Resource.getDefault(), null, configProvider);
+
+      Resource configuredResource = createResourceFromModel(model, componentLoader);
+
+      return AutoConfiguredOpenTelemetrySdk.create(sdk, configuredResource, null, configProvider);
     } catch (FileNotFoundException e) {
       throw new ConfigurationException("Configuration file not found", e);
     } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
@@ -76,6 +77,25 @@ static AutoConfiguredOpenTelemetrySdk configureFromFile(
     }
   }
 
+  private static Resource createResourceFromModel(
+      Object openTelemetryConfigurationModel, ComponentLoader componentLoader)
+      throws NoSuchMethodException,
+          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 createResource =
+        declarativeConfigurationClass.getMethod(
+            "createResource", configurationModelClass, ComponentLoader.class);
+    return (Resource) createResource.invoke(null, openTelemetryConfigurationModel, componentLoader);
+  }
+
   private static ConfigurationException toConfigurationException(
       DeclarativeConfigException exception) {
     String message = Objects.requireNonNull(exception.getMessage());

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

@@ -16,7 +16,9 @@
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 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.ResourceModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SamplerModel;
+import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.io.Closeable;
 import java.io.IOException;
@@ -109,7 +111,20 @@ 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 :
@@ -205,6 +220,17 @@ public static Sampler createSampler(DeclarativeConfigProperties genericSamplerMo
         samplerModel);
   }
 
+  /** Create a {@link Resource} from the {@code resourceModel} representing the resource config. */
+  public static Resource createResource(
+      OpenTelemetryConfigurationModel model, ComponentLoader componentLoader) {
+    ResourceModel resourceModel = model.getResource();
+    if (resourceModel == null) {
+      return Resource.getDefault();
+    }
+    return createAndMaybeCleanup(
+        ResourceFactory.getInstance(), SpiHelper.create(componentLoader), resourceModel);
+  }
+
   private static YamlDeclarativeConfigProperties requireYamlDeclarativeConfigProperties(
       DeclarativeConfigProperties declarativeConfigProperties) {
     if (!(declarativeConfigProperties instanceof YamlDeclarativeConfigProperties)) {