Rebase fixes

Author: JonasKunz

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

@@ -1,2 +1,5 @@
 Comparing source compatibility of opentelemetry-sdk-trace-1.52.0-SNAPSHOT.jar against opentelemetry-sdk-trace-1.51.0.jar
-No changes.
+***  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>)

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

@@ -86,9 +86,7 @@ private static SpanMetrics createSpanMetrics(
       Supplier<MeterProvider> meterProviderSupplier) {
     switch (internalTelemetryVersion) {
       case LEGACY:
-      case DISABLED:
         return SpanMetrics.noop();
-      case V1_33:
       case LATEST:
         return new SemConvSpanMetrics(meterProviderSupplier);
     }

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

@@ -12,9 +12,9 @@
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.sdk.common.Clock;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
+import io.opentelemetry.sdk.common.InternalTelemetryVersion;
 import io.opentelemetry.sdk.internal.DefaultExceptionAttributeResolver;
 import io.opentelemetry.sdk.internal.ExceptionAttributeResolver;
-import io.opentelemetry.sdk.common.InternalTelemetryVersion;
 import io.opentelemetry.sdk.internal.ScopeConfigurator;
 import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder;
 import io.opentelemetry.sdk.resources.Resource;
@@ -39,8 +39,7 @@ public final class SdkTracerProviderBuilder {
   private Supplier<SpanLimits> spanLimitsSupplier = SpanLimits::getDefault;
   private Sampler sampler = DEFAULT_SAMPLER;
   private Supplier<MeterProvider> meterProviderSupplier = GlobalOpenTelemetry::getMeterProvider;
-  private InternalTelemetryVersion internalTelemetryVersion =
-      InternalTelemetryVersion.DISABLED;
+  private InternalTelemetryVersion internalTelemetryVersion = InternalTelemetryVersion.LEGACY;
   private ScopeConfiguratorBuilder<TracerConfig> tracerConfiguratorBuilder =
       TracerConfig.configuratorBuilder();
   private ExceptionAttributeResolver exceptionAttributeResolver =
@@ -194,8 +193,8 @@ public SdkTracerProviderBuilder setMeterProvider(Supplier<MeterProvider> meterPr
   }
 
   /**
-   * Sets the {@link InternalTelemetryVersion} defining which self-monitoring metrics the
-   * tracers originating from this provider collect.
+   * Sets the {@link InternalTelemetryVersion} defining which self-monitoring metrics the tracers
+   * originating from this provider collect.
    */
   public SdkTracerProviderBuilder setInternalTelemetry(
       InternalTelemetryVersion internalTelemetryVersion) {

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

@@ -1131,7 +1131,7 @@ public String getDescription() {
 
   @Test
   @SuppressWarnings("unchecked")
-  void healthMetricsDisabled() {
+  void healthMetricsDisabledForLegacy() {
     AtomicReference<SamplingDecision> currentSamplingDecision = new AtomicReference<>();
     Sampler sampler =
         new Sampler() {
@@ -1158,7 +1158,7 @@ public String getDescription() {
         SdkTracerProvider.builder()
             .setSampler(sampler)
             .setMeterProvider(mockMeterProvider)
-            .setInternalTelemetry(InternalTelemetryVersion.DISABLED)
+            .setInternalTelemetry(InternalTelemetryVersion.LEGACY)
             .build()
             .get("testing");