return resource in auto configured sdk

Author: zeitlinger

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

@@ -54,10 +54,12 @@ static AutoConfiguredOpenTelemetrySdk configureFromFile(
           sdkConfigProvider.getMethod("create", openTelemetryConfiguration, ComponentLoader.class);
       ConfigProvider configProvider =
           (ConfigProvider) createFileConfigProvider.invoke(null, model, componentLoader);
-      // Note: can't access file configuration resource without reflection so setting a dummy
-      // resource
-      return AutoConfiguredOpenTelemetrySdk.create(
-          sdk, Resource.getDefault(), null, configProvider);
+      Method createResource =
+          declarativeConfiguration.getMethod(
+              "createResource", openTelemetryConfiguration, ComponentLoader.class);
+      Resource resource = (Resource) createResource.invoke(null, model, componentLoader);
+
+      return AutoConfiguredOpenTelemetrySdk.create(sdk, resource, null, configProvider);
     } catch (FileNotFoundException e) {
       throw new ConfigurationException("Configuration file not found", e);
     } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {

sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java

@@ -7,7 +7,6 @@
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static java.util.Collections.singletonMap;
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
@@ -118,12 +117,12 @@ void configFile_Valid() {
     ConfigProperties config =
         DefaultConfigProperties.createFromMap(
             Collections.singletonMap("otel.experimental.config.file", configFilePath.toString()));
+    Resource resource = Resource.getDefault().toBuilder().put("service.name", "test").build();
     OpenTelemetrySdk expectedSdk =
         OpenTelemetrySdk.builder()
             .setTracerProvider(
                 SdkTracerProvider.builder()
-                    .setResource(
-                        Resource.getDefault().toBuilder().put("service.name", "test").build())
+                    .setResource(resource)
                     .addSpanProcessor(SimpleSpanProcessor.create(LoggingSpanExporter.create()))
                     .build())
             .build();
@@ -138,9 +137,7 @@ void configFile_Valid() {
 
     assertThat(autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk().toString())
         .isEqualTo(expectedSdk.toString());
-    // AutoConfiguredOpenTelemetrySdk#getResource() is set to a dummy value when configuring from
-    // file
-    assertThat(autoConfiguredOpenTelemetrySdk.getResource()).isEqualTo(Resource.getDefault());
+    assertThat(autoConfiguredOpenTelemetrySdk.getResource()).isEqualTo(resource);
     verify(builder, times(1)).shutdownHook(autoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk());
     assertThat(Runtime.getRuntime().removeShutdownHook(thread)).isTrue();
     logCapturer.assertContains("Autoconfiguring from configuration file: " + configFilePath);

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

@@ -17,6 +17,7 @@
 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;
+import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.io.Closeable;
 import java.io.IOException;
@@ -113,17 +114,36 @@ public static OpenTelemetrySdk create(
       OpenTelemetryConfigurationModel configurationModel, ComponentLoader componentLoader) {
     SpiHelper spiHelper = SpiHelper.create(componentLoader);
 
+    return createAndMaybeCleanup(
+        OpenTelemetryConfigurationFactory.getInstance(),
+        spiHelper,
+        customizeModel(configurationModel, spiHelper));
+  }
+
+  public static Resource createResource(
+      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;
+  }
+
+  private static OpenTelemetryConfigurationModel customizeModel(
+      OpenTelemetryConfigurationModel configurationModel, SpiHelper spiHelper) {
     DeclarativeConfigurationBuilder builder = new DeclarativeConfigurationBuilder();
 
     for (DeclarativeConfigurationCustomizerProvider provider :
         spiHelper.loadOrdered(DeclarativeConfigurationCustomizerProvider.class)) {
       provider.customize(builder);
     }
 
-    return createAndMaybeCleanup(
-        OpenTelemetryConfigurationFactory.getInstance(),
-        spiHelper,
-        builder.customizeModel(configurationModel));
+    return builder.customizeModel(configurationModel);
   }
 
   /**

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

@@ -19,6 +19,7 @@
 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;
@@ -173,4 +174,25 @@ void create_ModelCustomizer() {
                 + "telemetry.sdk.name=\"opentelemetry\", "
                 + "telemetry.sdk.version=\"");
   }
+
+  @Test
+  void createResource() {
+    OpenTelemetryConfigurationModel model = new OpenTelemetryConfigurationModel();
+    model.withFileFormat("1.0-rc.1");
+    Resource resource =
+        DeclarativeConfiguration.createResource(
+            model,
+            // customizer is TestDeclarativeConfigurationCustomizerProvider
+            ComponentLoader.forClassLoader(
+                DeclarativeConfigurationCreateTest.class.getClassLoader()));
+    assertThat(resource.toString())
+        .contains(
+            "Resource{schemaUrl=null, attributes={"
+                + "color=\"blue\", "
+                + "foo=\"bar\", "
+                + "service.name=\"unknown_service:java\", "
+                + "telemetry.sdk.language=\"java\", "
+                + "telemetry.sdk.name=\"opentelemetry\", "
+                + "telemetry.sdk.version=\"");
+  }
 }