no api changes

Author: zeitlinger

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

@@ -7,11 +7,14 @@
 
 import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import javax.annotation.Nullable;
 import java.io.Closeable;
+import java.lang.reflect.Field;
 
 /** A new interface for creating OpenTelemetrySdk that supports getting {@link ConfigProvider}. */
 public interface ExtendedOpenTelemetrySdk extends ExtendedOpenTelemetry, Closeable {
@@ -27,4 +30,16 @@ public interface ExtendedOpenTelemetrySdk extends ExtendedOpenTelemetry, Closeab
   static ExtendedOpenTelemetrySdkBuilder builder() {
     return new ExtendedOpenTelemetrySdkBuilder();
   }
+
+  @Nullable default ExtendedOpenTelemetrySdk fromOpenTelemetrySdk(OpenTelemetrySdk openTelemetry) {
+    try {
+      Class<?> sdk = Class.forName("io.opentelemetry.sdk.OpenTelemetrySdk");
+      Field extendedOpenTelemetrySdk = sdk.getDeclaredField("extendedOpenTelemetrySdk");
+      extendedOpenTelemetrySdk.setAccessible(true);
+      return (ExtendedOpenTelemetrySdk) extendedOpenTelemetrySdk.get(openTelemetry);
+    } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
+      throw new IllegalStateException(
+          "Cannot create ExtendedOpenTelemetrySdk from OpenTelemetrySdk", e);
+    }
+  }
 }

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

@@ -10,22 +10,32 @@
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.OpenTelemetrySdkBuilder;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
+import java.io.Closeable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Objects;
 import java.util.function.Consumer;
 
-/** A new interface for creating OpenTelemetrySdk that supports {@link ConfigProvider}. */
+/** An builder for creating an {@link ExtendedOpenTelemetrySdk} instance. */
 public final class ExtendedOpenTelemetrySdkBuilder {
   private final SdkTracerProviderBuilder tracerProviderBuilder = SdkTracerProvider.builder();
   private final SdkMeterProviderBuilder meterProviderBuilder = SdkMeterProvider.builder();
   private final SdkLoggerProviderBuilder loggerProviderBuilder = SdkLoggerProvider.builder();
   private ContextPropagators propagators = ContextPropagators.noop();
-  private ConfigProvider configProvider = ConfigProvider.noop();
+  private ConfigProvider configProvider =
+      SdkConfigProvider.create(new OpenTelemetryConfigurationModel());
+  private Consumer<Closeable> closeableConsumer =
+      closeable -> {
+        // Default no-op closeable consumer
+      };
 
   /** Sets the {@link ContextPropagators} to use. */
   public ExtendedOpenTelemetrySdkBuilder setPropagators(ContextPropagators propagators) {
@@ -39,6 +49,11 @@ public ExtendedOpenTelemetrySdkBuilder setConfigProvider(ConfigProvider configPr
     return this;
   }
 
+  public ExtendedOpenTelemetrySdkBuilder setCloseableConsumer(Consumer<Closeable> configurator) {
+    this.closeableConsumer = Objects.requireNonNull(configurator, "configurator must not be null");
+    return this;
+  }
+
   /**
    * Applies a consumer callback to configure the TracerProvider being built for this OpenTelemetry.
    *
@@ -84,12 +99,35 @@ public ExtendedOpenTelemetrySdkBuilder withLoggerProvider(
    *
    * @see GlobalOpenTelemetry
    */
-  public ExtendedOpenTelemetrySdk build() {
+  public OpenTelemetrySdk build() {
     SdkTracerProvider tracerProvider = tracerProviderBuilder.build();
     SdkMeterProvider meterProvider = meterProviderBuilder.build();
     SdkLoggerProvider loggerProvider = loggerProviderBuilder.build();
-    return new ObfuscatedExtendedOpenTelemetrySdk(
-        configProvider, tracerProvider, meterProvider, loggerProvider, propagators);
+    closeableConsumer.accept(tracerProvider);
+    closeableConsumer.accept(meterProvider);
+    closeableConsumer.accept(loggerProvider);
+    ExtendedOpenTelemetrySdk extendedOpenTelemetrySdk =
+        new ObfuscatedExtendedOpenTelemetrySdk(
+            configProvider, tracerProvider, meterProvider, loggerProvider, propagators);
+    closeableConsumer.accept(extendedOpenTelemetrySdk);
+
+    OpenTelemetrySdkBuilder builder =
+        OpenTelemetrySdk.builder()
+            .setTracerProvider(tracerProvider)
+            .setMeterProvider(meterProvider)
+            .setLoggerProvider(loggerProvider)
+            .setPropagators(propagators);
+
+    try {
+      Method setExtendedOpenTelemetrySdk =
+          builder.getClass().getDeclaredMethod("setExtendedOpenTelemetrySdk", Object.class);
+      setExtendedOpenTelemetrySdk.setAccessible(true);
+      setExtendedOpenTelemetrySdk.invoke(builder, extendedOpenTelemetrySdk);
+    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+      throw new IllegalStateException("unable to set extended OpenTelemetry SDK", e);
+    }
+
+    return builder.build();
   }
 
   /**
@@ -102,8 +140,8 @@ public ExtendedOpenTelemetrySdk build() {
    *
    * @see GlobalOpenTelemetry
    */
-  public ExtendedOpenTelemetrySdk buildAndRegisterGlobal() {
-    ExtendedOpenTelemetrySdk sdk = build();
+  public OpenTelemetrySdk buildAndRegisterGlobal() {
+    OpenTelemetrySdk sdk = build();
     GlobalOpenTelemetry.set(sdk);
     return sdk;
   }

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

@@ -26,7 +26,7 @@
 import javax.annotation.concurrent.ThreadSafe;
 
 /** The SDK implementation of {@link ExtendedOpenTelemetrySdk}. */
-final class ObfuscatedExtendedOpenTelemetrySdk implements ExtendedOpenTelemetrySdk {
+public final class ObfuscatedExtendedOpenTelemetrySdk implements ExtendedOpenTelemetrySdk {
 
   private static final Logger LOGGER =
       Logger.getLogger(ObfuscatedExtendedOpenTelemetrySdk.class.getName());
@@ -37,7 +37,7 @@ final class ObfuscatedExtendedOpenTelemetrySdk implements ExtendedOpenTelemetryS
   private final ConfigProvider configProvider;
   private final ContextPropagators propagators;
 
-  ObfuscatedExtendedOpenTelemetrySdk(
+  public ObfuscatedExtendedOpenTelemetrySdk(
       ConfigProvider configProvider,
       SdkTracerProvider tracerProvider,
       SdkMeterProvider meterProvider,

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

@@ -7,6 +7,7 @@
 
 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 java.io.Closeable;
@@ -39,6 +40,9 @@ List<Closeable> getCloseables() {
     return Collections.unmodifiableList(closeables);
   }
 
+  ComponentLoader getComponentLoader() {
+    return spiHelper.getComponentLoader();
+  }
   /**
    * 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/LoggerProviderFactory.java

@@ -15,14 +15,12 @@
 import io.opentelemetry.sdk.internal.ScopeConfigurator;
 import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder;
 import io.opentelemetry.sdk.logs.LogLimits;
-import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
 import io.opentelemetry.sdk.logs.internal.LoggerConfig;
 import io.opentelemetry.sdk.logs.internal.SdkLoggerProviderUtil;
 import java.util.List;
 
-final class LoggerProviderFactory
-    implements Factory<LoggerProviderAndAttributeLimits, SdkLoggerProviderBuilder> {
+final class LoggerProviderFactory {
 
   private static final LoggerProviderFactory INSTANCE = new LoggerProviderFactory();
 
@@ -32,14 +30,13 @@ static LoggerProviderFactory getInstance() {
     return INSTANCE;
   }
 
-  @Override
-  public SdkLoggerProviderBuilder create(
+  public void configure(
+      SdkLoggerProviderBuilder builder,
       LoggerProviderAndAttributeLimits model, DeclarativeConfigContext context) {
-    SdkLoggerProviderBuilder builder = SdkLoggerProvider.builder();
 
     LoggerProviderModel loggerProviderModel = model.getLoggerProvider();
     if (loggerProviderModel == null) {
-      return builder;
+      return;
     }
 
     LogLimits logLimits =
@@ -85,7 +82,6 @@ public SdkLoggerProviderBuilder create(
       SdkLoggerProviderUtil.setLoggerConfigurator(builder, configuratorBuilder.build());
     }
 
-    return builder;
   }
 
   private static class LoggerConfigFactory

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

@@ -17,14 +17,13 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ViewStreamModel;
 import io.opentelemetry.sdk.internal.ScopeConfigurator;
 import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder;
-import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
 import io.opentelemetry.sdk.metrics.export.CardinalityLimitSelector;
 import io.opentelemetry.sdk.metrics.internal.MeterConfig;
 import io.opentelemetry.sdk.metrics.internal.SdkMeterProviderUtil;
 import java.util.List;
 
-final class MeterProviderFactory implements Factory<MeterProviderModel, SdkMeterProviderBuilder> {
+final class MeterProviderFactory {
 
   private static final MeterProviderFactory INSTANCE = new MeterProviderFactory();
 
@@ -34,10 +33,8 @@ static MeterProviderFactory getInstance() {
     return INSTANCE;
   }
 
-  @Override
-  public SdkMeterProviderBuilder create(
-      MeterProviderModel model, DeclarativeConfigContext context) {
-    SdkMeterProviderBuilder builder = SdkMeterProvider.builder();
+  public void configure(
+      SdkMeterProviderBuilder builder, MeterProviderModel model, DeclarativeConfigContext context) {
 
     List<MetricReaderModel> readerModels = model.getReaders();
     if (readerModels != null) {
@@ -95,7 +92,6 @@ public SdkMeterProviderBuilder create(
       SdkMeterProviderUtil.setMeterConfigurator(builder, configuratorBuilder.build());
     }
 
-    return builder;
   }
 
   private static class MeterConfigFactory

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

@@ -7,8 +7,11 @@
 
 import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.OpenTelemetrySdkBuilder;
+import io.opentelemetry.sdk.extension.incubator.ExtendedOpenTelemetrySdkBuilder;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LoggerProviderModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.MeterProviderModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.TracerProviderModel;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.Objects;
 import java.util.regex.Pattern;
@@ -30,7 +33,7 @@ static OpenTelemetryConfigurationFactory getInstance() {
   @Override
   public OpenTelemetrySdk create(
       OpenTelemetryConfigurationModel model, DeclarativeConfigContext context) {
-    OpenTelemetrySdkBuilder builder = OpenTelemetrySdk.builder();
+    ExtendedOpenTelemetrySdkBuilder builder = new ExtendedOpenTelemetrySdkBuilder();
     String fileFormat = model.getFileFormat();
     if (fileFormat == null || !SUPPORTED_FILE_FORMATS.matcher(fileFormat).matches()) {
       throw new DeclarativeConfigException(
@@ -40,52 +43,56 @@ public OpenTelemetrySdk create(
     // behavior for experimental properties.
 
     if (Objects.equals(true, model.getDisabled())) {
-      return builder.build();
+      return OpenTelemetrySdk.builder().build();
     }
 
+    builder.setCloseableConsumer(context::addCloseable);
+    builder.setConfigProvider(SdkConfigProvider.create(model, context.getComponentLoader()));
     if (model.getPropagator() != null) {
       builder.setPropagators(
           PropagatorFactory.getInstance().create(model.getPropagator(), context));
     }
 
-    Resource resource = Resource.getDefault();
+    Resource resource;
     if (model.getResource() != null) {
       resource = ResourceFactory.getInstance().create(model.getResource(), context);
+    } else {
+      resource = Resource.getDefault();
     }
 
-    if (model.getLoggerProvider() != null) {
-      builder.setLoggerProvider(
-          context.addCloseable(
+    LoggerProviderModel loggerProvider = model.getLoggerProvider();
+    if (loggerProvider != null) {
+      builder.withLoggerProvider(
+          sdkLoggerProviderBuilder ->
               LoggerProviderFactory.getInstance()
-                  .create(
+                  .configure(
+                      sdkLoggerProviderBuilder.setResource(resource),
                       LoggerProviderAndAttributeLimits.create(
-                          model.getAttributeLimits(), model.getLoggerProvider()),
-                      context)
-                  .setResource(resource)
-                  .build()));
+                          model.getAttributeLimits(), loggerProvider),
+                      context));
     }
 
-    if (model.getTracerProvider() != null) {
-      builder.setTracerProvider(
-          context.addCloseable(
+    TracerProviderModel tracerProvider = model.getTracerProvider();
+    if (tracerProvider != null) {
+      builder.withTracerProvider(
+          sdkTracerProviderBuilder ->
               TracerProviderFactory.getInstance()
-                  .create(
+                  .configure(
+                      sdkTracerProviderBuilder.setResource(resource),
                       TracerProviderAndAttributeLimits.create(
-                          model.getAttributeLimits(), model.getTracerProvider()),
-                      context)
-                  .setResource(resource)
-                  .build()));
+                          model.getAttributeLimits(), tracerProvider),
+                      context));
     }
 
-    if (model.getMeterProvider() != null) {
-      builder.setMeterProvider(
-          context.addCloseable(
+    MeterProviderModel meterProvider = model.getMeterProvider();
+    if (meterProvider != null) {
+      builder.withMeterProvider(
+          sdkMeterProviderBuilder ->
               MeterProviderFactory.getInstance()
-                  .create(model.getMeterProvider(), context)
-                  .setResource(resource)
-                  .build()));
+                  .configure(
+                      sdkMeterProviderBuilder.setResource(resource), meterProvider, context));
     }
 
-    return context.addCloseable(builder.build());
+    return builder.build();
   }
 }

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

@@ -50,4 +50,9 @@ public static SdkConfigProvider create(
   public DeclarativeConfigProperties getInstrumentationConfig() {
     return instrumentationConfig;
   }
+
+  @Override
+  public String toString() {
+    return "SdkConfigProvider{" + "instrumentationConfig=" + instrumentationConfig + '}';
+  }
 }