extract extended opentelemetry only

Author: zeitlinger

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

@@ -6,34 +6,36 @@
 package io.opentelemetry.sdk.extension.incubator;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.api.incubator.entities.EntityProvider;
+import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.OpenTelemetrySdkBuilder;
-import io.opentelemetry.sdk.extension.incubator.entities.SdkEntityProvider;
-import io.opentelemetry.sdk.extension.incubator.entities.SdkEntityProviderBuilder;
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
-import io.opentelemetry.sdk.logs.internal.SdkLoggerProviderUtil;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
-import io.opentelemetry.sdk.metrics.internal.SdkMeterProviderUtil;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
-import io.opentelemetry.sdk.trace.internal.SdkTracerProviderUtil;
+import java.util.Objects;
 import java.util.function.Consumer;
 
-/** A new interface for creating OpenTelemetrySdk that supports {@link EntityProvider}. */
+/** A new interface for creating OpenTelemetrySdk that supports {@link ConfigProvider}. */
 public final class ExtendedOpenTelemetrySdkBuilder {
-  private ContextPropagators propagators = ContextPropagators.noop();
   private final SdkTracerProviderBuilder tracerProviderBuilder = SdkTracerProvider.builder();
   private final SdkMeterProviderBuilder meterProviderBuilder = SdkMeterProvider.builder();
   private final SdkLoggerProviderBuilder loggerProviderBuilder = SdkLoggerProvider.builder();
-  private final SdkEntityProviderBuilder resourceProviderBuilder = SdkEntityProvider.builder();
+  private ContextPropagators propagators = ContextPropagators.noop();
+  private ConfigProvider configProvider = ConfigProvider.noop();
 
   /** Sets the {@link ContextPropagators} to use. */
   public ExtendedOpenTelemetrySdkBuilder setPropagators(ContextPropagators propagators) {
-    this.propagators = propagators;
+    this.propagators = Objects.requireNonNull(propagators, "propagators must not be null");
+    return this;
+  }
+
+  /** Sets the {@link ConfigProvider} to use. */
+  public ExtendedOpenTelemetrySdkBuilder setConfigProvider(ConfigProvider configProvider) {
+    this.configProvider = Objects.requireNonNull(configProvider, "configProvider must not be null");
     return this;
   }
 
@@ -83,21 +85,11 @@ public ExtendedOpenTelemetrySdkBuilder withLoggerProvider(
    * @see GlobalOpenTelemetry
    */
   public ExtendedOpenTelemetrySdk build() {
-    SdkEntityProvider resourceProvider = resourceProviderBuilder.build();
-    SdkTracerProvider tracerProvider =
-        SdkTracerProviderUtil.setResourceSupplier(
-                tracerProviderBuilder, resourceProvider::getResource)
-            .build();
-    SdkMeterProvider meterProvider =
-        SdkMeterProviderUtil.setResourceSupplier(
-                meterProviderBuilder, resourceProvider::getResource)
-            .build();
-    SdkLoggerProvider loggerProvider =
-        SdkLoggerProviderUtil.setResourceSupplier(
-                loggerProviderBuilder, resourceProvider::getResource)
-            .build();
-    return new ObfuscatedExtendedOpenTelemerySdk(
-        resourceProvider, tracerProvider, meterProvider, loggerProvider, propagators);
+    SdkTracerProvider tracerProvider = tracerProviderBuilder.build();
+    SdkMeterProvider meterProvider = meterProviderBuilder.build();
+    SdkLoggerProvider loggerProvider = loggerProviderBuilder.build();
+    return new ObfuscatedExtendedOpenTelemetrySdk(
+        configProvider, tracerProvider, meterProvider, loggerProvider, propagators);
   }
 
   /**

…r/ObfuscatedExtendedOpenTelemerySdk.java …/ObfuscatedExtendedOpenTelemetrySdk.javasdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/ObfuscatedExtendedOpenTelemerySdk.java renamed to sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/ObfuscatedExtendedOpenTelemetrySdk.java sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/ObfuscatedExtendedOpenTelemerySdk.java renamed to sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/ObfuscatedExtendedOpenTelemetrySdk.java

@@ -6,8 +6,6 @@
 package io.opentelemetry.sdk.extension.incubator;
 
 import io.opentelemetry.api.incubator.config.ConfigProvider;
-import io.opentelemetry.api.incubator.entities.EntityBuilder;
-import io.opentelemetry.api.incubator.entities.EntityProvider;
 import io.opentelemetry.api.logs.LoggerBuilder;
 import io.opentelemetry.api.logs.LoggerProvider;
 import io.opentelemetry.api.metrics.MeterBuilder;
@@ -17,7 +15,6 @@
 import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.sdk.common.CompletableResultCode;
-import io.opentelemetry.sdk.extension.incubator.entities.SdkEntityProvider;
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
@@ -29,24 +26,24 @@
 import javax.annotation.concurrent.ThreadSafe;
 
 /** The SDK implementation of {@link ExtendedOpenTelemetrySdk}. */
-final class ObfuscatedExtendedOpenTelemerySdk implements ExtendedOpenTelemetrySdk {
+final class ObfuscatedExtendedOpenTelemetrySdk implements ExtendedOpenTelemetrySdk {
 
   private static final Logger LOGGER =
-      Logger.getLogger(ObfuscatedExtendedOpenTelemerySdk.class.getName());
+      Logger.getLogger(ObfuscatedExtendedOpenTelemetrySdk.class.getName());
   private final AtomicBoolean isShutdown = new AtomicBoolean(false);
   private final ObfuscatedTracerProvider tracerProvider;
   private final ObfuscatedMeterProvider meterProvider;
   private final ObfuscatedLoggerProvider loggerProvider;
-  private final ObfuscatedEntityProvider configProvider;
+  private final ConfigProvider configProvider;
   private final ContextPropagators propagators;
 
-  ObfuscatedExtendedOpenTelemerySdk(
+  ObfuscatedExtendedOpenTelemetrySdk(
       ConfigProvider configProvider,
       SdkTracerProvider tracerProvider,
       SdkMeterProvider meterProvider,
       SdkLoggerProvider loggerProvider,
       ContextPropagators propagators) {
-    this.configProvider = new ObfuscatedEntityProvider(configProvider);
+    this.configProvider = configProvider;
     this.tracerProvider = new ObfuscatedTracerProvider(tracerProvider);
     this.meterProvider = new ObfuscatedMeterProvider(meterProvider);
     this.loggerProvider = new ObfuscatedLoggerProvider(loggerProvider);
@@ -99,8 +96,8 @@ public ContextPropagators getPropagators() {
   @Override
   public String toString() {
     return "ExtendedOpenTelemetrySdk{"
-        + "entityProvider="
-        + configProvider.unobfuscate()
+        + "configProvider="
+        + configProvider
         + ", tracerProvider="
         + tracerProvider.unobfuscate()
         + ", meterProvider="
@@ -202,36 +199,4 @@ public SdkLoggerProvider unobfuscate() {
       return delegate;
     }
   }
-
-  /**
-   * This class allows the SDK to unobfuscate an obfuscated static global provider.
-   *
-   * <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 (SdkResourceProvider) openTelemetry.getResourceProvider()}.
-   */
-  @ThreadSafe
-  // Visible for testing
-  static class ObfuscatedEntityProvider implements EntityProvider {
-
-    private final SdkEntityProvider delegate;
-
-    ObfuscatedEntityProvider(SdkEntityProvider delegate) {
-      this.delegate = delegate;
-    }
-
-    public SdkEntityProvider unobfuscate() {
-      return delegate;
-    }
-
-    @Override
-    public boolean removeEntity(String entityType) {
-      return delegate.removeEntity(entityType);
-    }
-
-    @Override
-    public EntityBuilder attachOrUpdateEntity(String entityType) {
-      return delegate.attachOrUpdateEntity(entityType);
-    }
-  }
 }