extended otel must extend otel - because we need AutoConfiguredOpenTelemetrySdk.getOpenTelemetrySdk() to return the extended instance

Author: zeitlinger

docs/apidiffs/current_vs_latest/opentelemetry-sdk.txt

@@ -1,2 +1,3 @@
 Comparing source compatibility of opentelemetry-sdk-1.53.0-SNAPSHOT.jar against opentelemetry-sdk-1.52.0.jar
-No changes.
+***  MODIFIED CLASS: PUBLIC NON_FINAL (<- FINAL) io.opentelemetry.sdk.OpenTelemetrySdk  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0

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

@@ -7,24 +7,66 @@
 
 import io.opentelemetry.api.incubator.ExtendedOpenTelemetry;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
-import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.context.propagation.ContextPropagators;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import java.io.Closeable;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
 
 /** A new interface for creating OpenTelemetrySdk that supports getting {@link ConfigProvider}. */
-public interface ExtendedOpenTelemetrySdk extends ExtendedOpenTelemetry, Closeable {
+public class ExtendedOpenTelemetrySdk extends OpenTelemetrySdk
+    implements ExtendedOpenTelemetry, Closeable {
+
+  private final ObfuscatedConfigProvider configProvider;
+
+  public ExtendedOpenTelemetrySdk(
+      SdkTracerProvider tracerProvider,
+      SdkMeterProvider meterProvider,
+      SdkLoggerProvider loggerProvider,
+      ContextPropagators propagators,
+      SdkConfigProvider configProvider) {
+    super(tracerProvider, meterProvider, loggerProvider, propagators);
+    this.configProvider = new ObfuscatedConfigProvider(configProvider);
+  }
+
+  @Override
+  public ConfigProvider getConfigProvider() {
+    return configProvider.unobfuscate();
+  }
+
   /**
-   * Shutdown the SDK. Calls {@link SdkTracerProvider#shutdown()}, {@link
-   * SdkMeterProvider#shutdown()}, and {@link SdkLoggerProvider#shutdown()}.
+   * This class allows the SDK to unobfuscate an obfuscated static global provider.
    *
-   * @return a {@link CompletableResultCode} which completes when all providers are shutdown
+   * <p>Static global providers are obfuscated when they are returned from the API to prevent users
+   * from casting them to their SDK specific implementation. For example, we do not want users to
+   * use patterns like {@code (SdkMeterProvider) openTelemetry.getMeterProvider()}.
    */
-  CompletableResultCode shutdown();
+  @ThreadSafe
+  // Visible for testing
+  static class ObfuscatedConfigProvider implements ConfigProvider {
+
+    private final SdkConfigProvider delegate;
+
+    ObfuscatedConfigProvider(SdkConfigProvider delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    @Nullable
+    public DeclarativeConfigProperties getInstrumentationConfig() {
+      if (delegate == null) {
+        return null;
+      }
+      return delegate.getInstrumentationConfig();
+    }
 
-  /** Returns a builder for {@link ExtendedOpenTelemetrySdk}. */
-  static ExtendedOpenTelemetrySdkBuilder builder() {
-    return new ExtendedOpenTelemetrySdkBuilder();
+    public SdkConfigProvider unobfuscate() {
+      return delegate;
+    }
   }
 }

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

@@ -11,6 +11,7 @@
 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;
@@ -20,15 +21,15 @@
 import java.io.Closeable;
 import java.util.Objects;
 import java.util.function.Consumer;
-import javax.annotation.Nullable;
 
-/** 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();
-  @Nullable private SdkConfigProvider configProvider;
+  private SdkConfigProvider configProvider =
+      SdkConfigProvider.create(new OpenTelemetryConfigurationModel());
   private Consumer<Closeable> closeableConsumer =
       closeable -> {
         // Default no-op closeable consumer
@@ -103,9 +104,9 @@ public ExtendedOpenTelemetrySdk build() {
     closeableConsumer.accept(tracerProvider);
     closeableConsumer.accept(meterProvider);
     closeableConsumer.accept(loggerProvider);
-    ObfuscatedExtendedOpenTelemetrySdk sdk =
-        new ObfuscatedExtendedOpenTelemetrySdk(
-            configProvider, tracerProvider, meterProvider, loggerProvider, propagators);
+    ExtendedOpenTelemetrySdk sdk =
+        new ExtendedOpenTelemetrySdk(
+            tracerProvider, meterProvider, loggerProvider, propagators, configProvider);
     closeableConsumer.accept(sdk);
     return sdk;
   }

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

@@ -33,7 +33,7 @@ static OpenTelemetryConfigurationFactory getInstance() {
   @Override
   public ExtendedOpenTelemetrySdk create(
       OpenTelemetryConfigurationModel model, DeclarativeConfigContext context) {
-    ExtendedOpenTelemetrySdkBuilder builder = ExtendedOpenTelemetrySdk.builder();
+    ExtendedOpenTelemetrySdkBuilder builder = new ExtendedOpenTelemetrySdkBuilder();
     String fileFormat = model.getFileFormat();
     if (fileFormat == null || !SUPPORTED_FILE_FORMATS.matcher(fileFormat).matches()) {
       throw new DeclarativeConfigException(