Use OpenTelemetry at configuration level instead of MeterProvider

Author: JonasKunz

docs/apidiffs/current_vs_latest/opentelemetry-sdk-trace.txt

@@ -2,4 +2,4 @@ Comparing source compatibility of opentelemetry-sdk-trace-1.52.0-SNAPSHOT.jar ag
 ***  MODIFIED CLASS: PUBLIC FINAL io.opentelemetry.sdk.trace.SdkTracerProviderBuilder  (not serializable)
 	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
 	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.SdkTracerProviderBuilder setInternalTelemetry(io.opentelemetry.sdk.common.InternalTelemetryVersion)
-	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.SdkTracerProviderBuilder setMeterProvider(java.util.function.Supplier<io.opentelemetry.api.metrics.MeterProvider>)
+	+++  NEW METHOD: PUBLIC(+) io.opentelemetry.sdk.trace.SdkTracerProviderBuilder setInternalTelemetryOpenTelemetry(java.util.function.Supplier<io.opentelemetry.api.OpenTelemetry>)

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerProviderBuilder.java

@@ -8,6 +8,7 @@
 import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.metrics.MeterProvider;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.sdk.common.Clock;
@@ -183,12 +184,13 @@ public SdkTracerProviderBuilder addSpanProcessorFirst(SpanProcessor spanProcesso
   }
 
   /**
-   * Sets the {@link MeterProvider} supplier used to collect self-monitoring metrics. If not set,
-   * uses {@link GlobalOpenTelemetry#getMeterProvider()}.
+   * Sets the {@link OpenTelemetry} supplier used to collect self-monitoring telemetry. If not set,
+   * uses {@link GlobalOpenTelemetry#get()}.
    */
-  public SdkTracerProviderBuilder setMeterProvider(Supplier<MeterProvider> meterProviderSupplier) {
-    requireNonNull(meterProviderSupplier, "meterProviderSupplier");
-    this.meterProviderSupplier = meterProviderSupplier;
+  public SdkTracerProviderBuilder setInternalTelemetryOpenTelemetry(
+      Supplier<OpenTelemetry> openTelemetrySupplier) {
+    requireNonNull(openTelemetrySupplier, "openTelemetrySupplier");
+    this.meterProviderSupplier = () -> openTelemetrySupplier.get().getMeterProvider();
     return this;
   }
 

sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanBuilderTest.java

@@ -19,9 +19,9 @@
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.mockito.Mockito.verifyNoInteractions;
 
+import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
-import io.opentelemetry.api.metrics.MeterProvider;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.SpanContext;
@@ -34,6 +34,7 @@
 import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.common.InternalTelemetryVersion;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
@@ -987,10 +988,14 @@ public String getDescription() {
     InMemoryMetricReader inMemoryMetrics = InMemoryMetricReader.create();
     try (SdkMeterProvider meterProvider =
         SdkMeterProvider.builder().registerMetricReader(inMemoryMetrics).build()) {
+
+      OpenTelemetrySdk telemetrySdk =
+          OpenTelemetrySdk.builder().setMeterProvider(meterProvider).build();
+
       Tracer tracer =
           SdkTracerProvider.builder()
               .setSampler(sampler)
-              .setMeterProvider(() -> meterProvider)
+              .setInternalTelemetryOpenTelemetry(() -> telemetrySdk)
               .setInternalTelemetry(InternalTelemetryVersion.LATEST)
               .build()
               .get("testing");
@@ -1152,12 +1157,12 @@ public String getDescription() {
           }
         };
 
-    Supplier<MeterProvider> mockMeterProvider = Mockito.mock(Supplier.class);
+    Supplier<OpenTelemetry> mockTelemetryProvider = Mockito.mock(Supplier.class);
 
     Tracer tracer =
         SdkTracerProvider.builder()
             .setSampler(sampler)
-            .setMeterProvider(mockMeterProvider)
+            .setInternalTelemetryOpenTelemetry(mockTelemetryProvider)
             .setInternalTelemetry(InternalTelemetryVersion.LEGACY)
             .build()
             .get("testing");
@@ -1171,7 +1176,7 @@ public String getDescription() {
     currentSamplingDecision.set(SamplingDecision.RECORD_AND_SAMPLE);
     tracer.spanBuilder("record_and_sample").startSpan().end();
 
-    verifyNoInteractions(mockMeterProvider);
+    verifyNoInteractions(mockTelemetryProvider);
   }
 
   @Test