pr review

Author: zeitlinger

api/all/src/main/java/io/opentelemetry/api/GlobalOpenTelemetry.java

@@ -8,6 +8,7 @@
 import io.opentelemetry.api.internal.ConfigUtil;
 import io.opentelemetry.api.internal.GuardedBy;
 import io.opentelemetry.api.internal.IncubatingUtil;
+import io.opentelemetry.api.logs.LoggerProvider;
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.api.metrics.MeterBuilder;
 import io.opentelemetry.api.metrics.MeterProvider;
@@ -21,6 +22,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
 
 /**
  * A global singleton for the entrypoint to telemetry functionality for tracing, metrics and
@@ -111,7 +113,7 @@ public static void set(OpenTelemetry openTelemetry) {
                 + "instead. Previous invocation set to cause of this exception.",
             setGlobalCaller);
       }
-      globalOpenTelemetry = IncubatingUtil.obfuscatedOpenTelemetry(openTelemetry);
+      globalOpenTelemetry = obfuscatedOpenTelemetry(openTelemetry);
       setGlobalCaller = new Throwable();
     }
   }
@@ -260,8 +262,7 @@ private static OpenTelemetry maybeAutoConfigureAndSetGlobal() {
       Object autoConfiguredSdk = initialize.invoke(null);
       Method getOpenTelemetrySdk =
           openTelemetrySdkAutoConfiguration.getMethod("getOpenTelemetrySdk");
-      return IncubatingUtil.obfuscatedOpenTelemetry(
-          (OpenTelemetry) getOpenTelemetrySdk.invoke(autoConfiguredSdk));
+      return obfuscatedOpenTelemetry((OpenTelemetry) getOpenTelemetrySdk.invoke(autoConfiguredSdk));
     } catch (NoSuchMethodException | IllegalAccessException e) {
       throw new IllegalStateException(
           "AutoConfiguredOpenTelemetrySdk detected on classpath "
@@ -275,4 +276,52 @@ private static OpenTelemetry maybeAutoConfigureAndSetGlobal() {
       return null;
     }
   }
+
+  private static OpenTelemetry obfuscatedOpenTelemetry(OpenTelemetry openTelemetry) {
+    OpenTelemetry incubating = IncubatingUtil.obfuscatedOpenTelemetryIfIncubating(openTelemetry);
+    if (incubating != null) {
+      return incubating;
+    }
+    return new ObfuscatedOpenTelemetry(openTelemetry);
+  }
+
+  /**
+   * Static global instances 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 (OpenTelemetrySdk) GlobalOpenTelemetry.get()}.
+   */
+  @ThreadSafe
+  static class ObfuscatedOpenTelemetry implements OpenTelemetry {
+
+    private final OpenTelemetry delegate;
+
+    ObfuscatedOpenTelemetry(OpenTelemetry delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public TracerProvider getTracerProvider() {
+      return delegate.getTracerProvider();
+    }
+
+    @Override
+    public MeterProvider getMeterProvider() {
+      return delegate.getMeterProvider();
+    }
+
+    @Override
+    public LoggerProvider getLogsBridge() {
+      return delegate.getLogsBridge();
+    }
+
+    @Override
+    public ContextPropagators getPropagators() {
+      return delegate.getPropagators();
+    }
+
+    @Override
+    public TracerBuilder tracerBuilder(String instrumentationScopeName) {
+      return delegate.tracerBuilder(instrumentationScopeName);
+    }
+  }
 }

api/all/src/main/java/io/opentelemetry/api/internal/IncubatingUtil.java

@@ -6,13 +6,8 @@
 package io.opentelemetry.api.internal;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.logs.LoggerProvider;
-import io.opentelemetry.api.metrics.MeterProvider;
-import io.opentelemetry.api.trace.TracerBuilder;
-import io.opentelemetry.api.trace.TracerProvider;
-import io.opentelemetry.context.propagation.ContextPropagators;
 import java.lang.reflect.Method;
-import javax.annotation.concurrent.ThreadSafe;
+import javax.annotation.Nullable;
 
 /**
  * Incubating utilities.
@@ -34,7 +29,8 @@ public static <T> T incubatingApiIfAvailable(T stableApi, String incubatingClass
     }
   }
 
-  public static OpenTelemetry obfuscatedOpenTelemetry(OpenTelemetry openTelemetry) {
+  @Nullable
+  public static OpenTelemetry obfuscatedOpenTelemetryIfIncubating(OpenTelemetry openTelemetry) {
     try {
       Class<?> extendedClass =
           Class.forName("io.opentelemetry.api.incubator.ExtendedOpenTelemetry");
@@ -50,46 +46,6 @@ public static OpenTelemetry obfuscatedOpenTelemetry(OpenTelemetry openTelemetry)
     } catch (Exception e) {
       // incubator not available
     }
-    return new ObfuscatedOpenTelemetry(openTelemetry);
-  }
-
-  /**
-   * Static global instances 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 (OpenTelemetrySdk) GlobalOpenTelemetry.get()}.
-   */
-  @ThreadSafe
-  static class ObfuscatedOpenTelemetry implements OpenTelemetry {
-
-    private final OpenTelemetry delegate;
-
-    ObfuscatedOpenTelemetry(OpenTelemetry delegate) {
-      this.delegate = delegate;
-    }
-
-    @Override
-    public TracerProvider getTracerProvider() {
-      return delegate.getTracerProvider();
-    }
-
-    @Override
-    public MeterProvider getMeterProvider() {
-      return delegate.getMeterProvider();
-    }
-
-    @Override
-    public LoggerProvider getLogsBridge() {
-      return delegate.getLogsBridge();
-    }
-
-    @Override
-    public ContextPropagators getPropagators() {
-      return delegate.getPropagators();
-    }
-
-    @Override
-    public TracerBuilder tracerBuilder(String instrumentationScopeName) {
-      return delegate.tracerBuilder(instrumentationScopeName);
-    }
+    return null;
   }
 }

api/incubator/src/main/java/io/opentelemetry/api/incubator/internal/ObfuscatedExtendedOpenTelemetry.java

@@ -30,7 +30,7 @@ public final class ObfuscatedExtendedOpenTelemetry implements ExtendedOpenTeleme
 
   /**
    * This constructor is called via reflection from {@link
-   * io.opentelemetry.api.internal.IncubatingUtil#obfuscatedOpenTelemetry(OpenTelemetry)}.
+   * io.opentelemetry.api.internal.IncubatingUtil#obfuscatedOpenTelemetryIfIncubating(OpenTelemetry)}.
    */
   public ObfuscatedExtendedOpenTelemetry(ExtendedOpenTelemetry delegate) {
     this.delegate = delegate;

sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java

@@ -758,7 +758,7 @@ void globalOpenTelemetryLock() throws InterruptedException, ExecutionException,
   private static OpenTelemetry unobfuscate(OpenTelemetry openTelemetry) {
     try {
       Field delegateField =
-          Class.forName("io.opentelemetry.api.internal.IncubatingUtil$ObfuscatedOpenTelemetry")
+          Class.forName("io.opentelemetry.api.GlobalOpenTelemetry$ObfuscatedOpenTelemetry")
               .getDeclaredField("delegate");
       delegateField.setAccessible(true);
       Object delegate = delegateField.get(openTelemetry);

sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java

@@ -91,7 +91,7 @@ void globalOpenTelemetry_AutoConfigureEnabled() {
   private static OpenTelemetry unobfuscate(OpenTelemetry openTelemetry) {
     try {
       Field delegateField =
-          Class.forName("io.opentelemetry.api.internal.IncubatingUtil$ObfuscatedOpenTelemetry")
+          Class.forName("io.opentelemetry.api.GlobalOpenTelemetry$ObfuscatedOpenTelemetry")
               .getDeclaredField("delegate");
       delegateField.setAccessible(true);
       Object delegate = delegateField.get(openTelemetry);