supplier and then function

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.Function;
 import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -117,11 +118,18 @@ public static void set(OpenTelemetry openTelemetry) {
     }
   }
 
-  public static <T extends OpenTelemetry> T set(Supplier<T> supplier) {
+  /**
+   * Sets the {@link OpenTelemetry} that should be the global instance.
+   *
+   * <p>This method calls the given {@code supplier}, converts the output to an {@link
+   * OpenTelemetry} object, and finally calls {@link #set(OpenTelemetry)}, all while holding the
+   * {@link GlobalOpenTelemetry} mutex.
+   */
+  public static <T> T set(Supplier<T> supplier, Function<T, OpenTelemetry> converter) {
     synchronized (mutex) {
-      T openTelemetry = supplier.get();
-      set(openTelemetry);
-      return openTelemetry;
+      T output = supplier.get();
+      set(converter.apply(output));
+      return output;
     }
   }
 

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

@@ -9,10 +9,6 @@
 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;
@@ -29,7 +25,7 @@
  */
 @Immutable
 @AutoValue
-public abstract class AutoConfiguredOpenTelemetrySdk implements OpenTelemetry {
+public abstract class AutoConfiguredOpenTelemetrySdk {
 
   /**
    * Returns an {@link AutoConfiguredOpenTelemetrySdk} automatically initialized through recognized
@@ -94,24 +90,4 @@ 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

@@ -427,7 +427,9 @@ public AutoConfiguredOpenTelemetrySdk build() {
     if (!setResultAsGlobal) {
       return buildImpl();
     }
-    AutoConfiguredOpenTelemetrySdk sdk = GlobalOpenTelemetry.set(this::buildImpl);
+    AutoConfiguredOpenTelemetrySdk sdk =
+        GlobalOpenTelemetry.set(
+            this::buildImpl, AutoConfiguredOpenTelemetrySdk::getOpenTelemetrySdk);
     logger.log(Level.FINE, "Global OpenTelemetry set to {0} by autoconfiguration", sdk);
     return sdk;
   }

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

@@ -374,7 +374,7 @@ void builder_setResultAsGlobalFalse() {
 
   @Test
   void builder_setResultAsGlobalTrue() {
-    OpenTelemetry openTelemetry = builder.setResultAsGlobal().build();
+    OpenTelemetrySdk openTelemetry = builder.setResultAsGlobal().build().getOpenTelemetrySdk();
 
     assertThat(GlobalOpenTelemetry.get()).extracting("delegate").isSameAs(openTelemetry);
   }