review comments

Author: fandreuz

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

@@ -17,6 +17,7 @@
 import io.opentelemetry.context.propagation.ContextPropagators;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
@@ -116,6 +117,14 @@ public static void set(OpenTelemetry openTelemetry) {
     }
   }
 
+  public static <T extends OpenTelemetry> T set(Supplier<T> supplier) {
+    synchronized (mutex) {
+      T openTelemetry = supplier.get();
+      set(openTelemetry);
+      return openTelemetry;
+    }
+  }
+
   /** Returns the globally registered {@link TracerProvider}. */
   public static TracerProvider getTracerProvider() {
     return get().getTracerProvider();

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

@@ -9,6 +9,10 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.incubator.config.ConfigProvider;
+import io.opentelemetry.api.logs.LoggerProvider;
+import io.opentelemetry.api.metrics.MeterProvider;
+import io.opentelemetry.api.trace.TracerProvider;
+import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
@@ -25,7 +29,7 @@
  */
 @Immutable
 @AutoValue
-public abstract class AutoConfiguredOpenTelemetrySdk {
+public abstract class AutoConfiguredOpenTelemetrySdk implements OpenTelemetry {
 
   /**
    * Returns an {@link AutoConfiguredOpenTelemetrySdk} automatically initialized through recognized
@@ -90,4 +94,24 @@ static AutoConfiguredOpenTelemetrySdk create(
   abstract Object getConfigProvider();
 
   AutoConfiguredOpenTelemetrySdk() {}
+
+  @Override
+  public TracerProvider getTracerProvider() {
+    return getOpenTelemetrySdk().getTracerProvider();
+  }
+
+  @Override
+  public MeterProvider getMeterProvider() {
+    return getOpenTelemetrySdk().getMeterProvider();
+  }
+
+  @Override
+  public LoggerProvider getLogsBridge() {
+    return getOpenTelemetrySdk().getLogsBridge();
+  }
+
+  @Override
+  public ContextPropagators getPropagators() {
+    return getOpenTelemetrySdk().getPropagators();
+  }
 }

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

@@ -36,7 +36,6 @@
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.io.Closeable;
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -425,7 +424,12 @@ AutoConfiguredOpenTelemetrySdkBuilder setComponentLoader(ComponentLoader compone
    * the settings of this {@link AutoConfiguredOpenTelemetrySdkBuilder}.
    */
   public AutoConfiguredOpenTelemetrySdk build() {
-    return maybeRunWithGlobalOpenTelemetryLock(this::buildImpl);
+    if (!setResultAsGlobal) {
+      return buildImpl();
+    }
+    AutoConfiguredOpenTelemetrySdk sdk = GlobalOpenTelemetry.set(this::buildImpl);
+    logger.log(Level.FINE, "Global OpenTelemetry set to {0} by autoconfiguration", sdk);
+    return sdk;
   }
 
   private AutoConfiguredOpenTelemetrySdk buildImpl() {
@@ -445,8 +449,10 @@ private AutoConfiguredOpenTelemetrySdk buildImpl() {
         maybeConfigureFromFile(config, componentLoader);
     if (fromFileConfiguration != null) {
       maybeRegisterShutdownHook(fromFileConfiguration.getOpenTelemetrySdk());
-      maybeSetAsGlobal(
-          fromFileConfiguration.getOpenTelemetrySdk(), fromFileConfiguration.getConfigProvider());
+      Object configProvider = fromFileConfiguration.getConfigProvider();
+      if (setResultAsGlobal && INCUBATOR_AVAILABLE && configProvider != null) {
+        IncubatingUtil.setGlobalConfigProvider(configProvider);
+      }
       return fromFileConfiguration;
     }
 
@@ -472,7 +478,6 @@ private AutoConfiguredOpenTelemetrySdk buildImpl() {
 
       OpenTelemetrySdk openTelemetrySdk = sdkBuilder.build();
       maybeRegisterShutdownHook(openTelemetrySdk);
-      maybeSetAsGlobal(openTelemetrySdk, null);
       callAutoConfigureListeners(spiHelper, openTelemetrySdk);
 
       return AutoConfiguredOpenTelemetrySdk.create(openTelemetrySdk, resource, config, null);
@@ -577,48 +582,6 @@ private void maybeRegisterShutdownHook(OpenTelemetrySdk openTelemetrySdk) {
     Runtime.getRuntime().addShutdownHook(shutdownHook(openTelemetrySdk));
   }
 
-  private <T> T maybeRunWithGlobalOpenTelemetryLock(Supplier<T> supplier) {
-    Object mutex;
-    if (!setResultAsGlobal || (mutex = getGlobalOpenTelemetryLock()) == null) {
-      return supplier.get();
-    }
-    synchronized (mutex) {
-      return supplier.get();
-    }
-  }
-
-  // Visible for testing
-  @Nullable
-  static Object getGlobalOpenTelemetryLock() {
-    Object mutex = null;
-    try {
-      Field mutexField = GlobalOpenTelemetry.class.getDeclaredField("mutex");
-      mutexField.setAccessible(true);
-      mutex = mutexField.get(null);
-      if (mutex == null) {
-        logger.log(
-            Level.SEVERE,
-            "Found a null Global OpenTelemetry mutex, this is a bug in the opentelemetry-java SDK and should be reported");
-      }
-    } catch (Exception exception) {
-      logger.log(Level.WARNING, "Could not acquire Global OpenTelemetry mutex", exception);
-    }
-    return mutex;
-  }
-
-  private void maybeSetAsGlobal(
-      OpenTelemetrySdk openTelemetrySdk, @Nullable Object configProvider) {
-    if (!setResultAsGlobal) {
-      return;
-    }
-    GlobalOpenTelemetry.set(openTelemetrySdk);
-    if (INCUBATOR_AVAILABLE && configProvider != null) {
-      IncubatingUtil.setGlobalConfigProvider(configProvider);
-    }
-    logger.log(
-        Level.FINE, "Global OpenTelemetry set to {0} by autoconfiguration", openTelemetrySdk);
-  }
-
   // Visible for testing
   void callAutoConfigureListeners(SpiHelper spiHelper, OpenTelemetrySdk openTelemetrySdk) {
     for (AutoConfigureListener listener : spiHelper.getListeners()) {