Add property to allow autoconfiguration of SDK telemetry version (#8037)

anuraaga · web-flow · commit 9a089b61cd99 · 2026-02-10T12:11:25.000-06:00
diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/InternalTelemetryConfiguration.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/InternalTelemetryConfiguration.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.otlp.internal;
+
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import io.opentelemetry.sdk.common.InternalTelemetryVersion;
+import java.util.Locale;
+
+/**
+ * Reads the desired SDK internal telemetry version from {@link ConfigProperties}.
+ *
+ * <p>This is the same as {@code io.opentelemetry.sdk.autoconfigure.InternalTelemetryConfiguration}.
+ * Any changes should be reflected there as well.
+ */
+final class InternalTelemetryConfiguration {
+
+  static InternalTelemetryVersion getVersion(ConfigProperties config) {
+    String version = config.getString("otel.experimental.sdk.telemetry.version");
+    if (version == null) {
+      return InternalTelemetryVersion.LEGACY;
+    }
+
+    switch (version.toLowerCase(Locale.ROOT)) {
+      case "legacy":
+        return InternalTelemetryVersion.LEGACY;
+      case "latest":
+        return InternalTelemetryVersion.LATEST;
+      default:
+        throw new ConfigurationException("Invalid sdk telemetry version: " + version);
+    }
+  }
+
+  private InternalTelemetryConfiguration() {}
+}
diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpConfigUtil.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpConfigUtil.java
@@ -9,6 +9,7 @@
 import io.opentelemetry.exporter.internal.ExporterBuilderUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import io.opentelemetry.sdk.common.InternalTelemetryVersion;
 import io.opentelemetry.sdk.common.export.MemoryMode;
 import io.opentelemetry.sdk.common.export.RetryPolicy;
 import java.io.File;
@@ -62,7 +63,8 @@ public static void configureOtlpExporterBuilder(
       Consumer<byte[]> setTrustedCertificates,
       BiConsumer<byte[], byte[]> setClientTls,
       Consumer<RetryPolicy> setRetryPolicy,
-      Consumer<MemoryMode> setMemoryMode) {
+      Consumer<MemoryMode> setMemoryMode,
+      Consumer<InternalTelemetryVersion> setInternalTelemetryVersion) {
     setComponentLoader.accept(config.getComponentLoader());
 
     String protocol = getOtlpProtocol(dataType, config);
@@ -107,6 +109,9 @@ public static void configureOtlpExporterBuilder(
       setTimeout.accept(timeout);
     }
 
+    InternalTelemetryVersion telemetryVersion = InternalTelemetryConfiguration.getVersion(config);
+    setInternalTelemetryVersion.accept(telemetryVersion);
+
     String certificatePath =
         config.getString(
             determinePropertyByType(config, "otel.exporter.otlp", dataType, "certificate"));
diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpLogRecordExporterProvider.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpLogRecordExporterProvider.java
@@ -53,7 +53,8 @@ public LogRecordExporter createExporter(ConfigProperties config) {
           builder::setTrustedCertificates,
           builder::setClientTls,
           builder::setRetryPolicy,
-          builder::setMemoryMode);
+          builder::setMemoryMode,
+          builder::setInternalTelemetryVersion);
       builder.setMeterProvider(meterProviderRef::get);
 
       return builder.build();
@@ -71,7 +72,8 @@ public LogRecordExporter createExporter(ConfigProperties config) {
           builder::setTrustedCertificates,
           builder::setClientTls,
           builder::setRetryPolicy,
-          builder::setMemoryMode);
+          builder::setMemoryMode,
+          builder::setInternalTelemetryVersion);
       builder.setMeterProvider(meterProviderRef::get);
 
       return builder.build();
diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpMetricExporterProvider.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpMetricExporterProvider.java
@@ -54,7 +54,8 @@ public MetricExporter createExporter(ConfigProperties config) {
           builder::setTrustedCertificates,
           builder::setClientTls,
           builder::setRetryPolicy,
-          builder::setMemoryMode);
+          builder::setMemoryMode,
+          builder::setInternalTelemetryVersion);
       ExporterBuilderUtil.configureOtlpAggregationTemporality(
           config, builder::setAggregationTemporalitySelector);
       ExporterBuilderUtil.configureOtlpHistogramDefaultAggregation(
@@ -76,7 +77,8 @@ public MetricExporter createExporter(ConfigProperties config) {
           builder::setTrustedCertificates,
           builder::setClientTls,
           builder::setRetryPolicy,
-          builder::setMemoryMode);
+          builder::setMemoryMode,
+          builder::setInternalTelemetryVersion);
       ExporterBuilderUtil.configureOtlpAggregationTemporality(
           config, builder::setAggregationTemporalitySelector);
       ExporterBuilderUtil.configureOtlpHistogramDefaultAggregation(
diff --git a/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpSpanExporterProvider.java b/exporters/otlp/all/src/main/java/io/opentelemetry/exporter/otlp/internal/OtlpSpanExporterProvider.java
@@ -52,7 +52,8 @@ public SpanExporter createExporter(ConfigProperties config) {
           builder::setTrustedCertificates,
           builder::setClientTls,
           builder::setRetryPolicy,
-          builder::setMemoryMode);
+          builder::setMemoryMode,
+          builder::setInternalTelemetryVersion);
       builder.setMeterProvider(meterProviderRef::get);
 
       return builder.build();
@@ -70,7 +71,8 @@ public SpanExporter createExporter(ConfigProperties config) {
           builder::setTrustedCertificates,
           builder::setClientTls,
           builder::setRetryPolicy,
-          builder::setMemoryMode);
+          builder::setMemoryMode,
+          builder::setInternalTelemetryVersion);
       builder.setMeterProvider(meterProviderRef::get);
 
       return builder.build();
diff --git a/exporters/otlp/all/src/test/java/io/opentelemetry/exporter/otlp/internal/OtlpConfigUtilTest.java b/exporters/otlp/all/src/test/java/io/opentelemetry/exporter/otlp/internal/OtlpConfigUtilTest.java
@@ -379,6 +379,7 @@ private static String configureEndpoint(String dataType, Map<String, String> pro
         value -> {},
         (value1, value2) -> {},
         value -> {},
+        value -> {},
         value -> {});
 
     return endpoint.get();
diff --git a/sdk-extensions/autoconfigure/build.gradle.kts b/sdk-extensions/autoconfigure/build.gradle.kts
@@ -77,6 +77,7 @@ testing {
             environment("OTEL_EXPORTER_OTLP_TIMEOUT", "5000")
             environment("OTEL_TEST_CONFIGURED", "true")
             environment("OTEL_TEST_WRAPPED", "1")
+            environment("OTEL_EXPERIMENTAL_SDK_TELEMETRY_VERSION", "latest")
           }
         }
       }
diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/InternalTelemetryConfiguration.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/InternalTelemetryConfiguration.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure;
+
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import io.opentelemetry.sdk.common.InternalTelemetryVersion;
+import java.util.Locale;
+
+/**
+ * Reads the desired SDK internal telemetry version from {@link ConfigProperties}.
+ *
+ * <p>This is the same as {@code
+ * io.opentelemetry.exporter.otlp.internal.InternalTelemetryConfiguration}. Any changes should be
+ * reflected there as well.
+ */
+final class InternalTelemetryConfiguration {
+
+  static InternalTelemetryVersion getVersion(ConfigProperties config) {
+    String version = config.getString("otel.experimental.sdk.telemetry.version");
+    if (version == null) {
+      return InternalTelemetryVersion.LEGACY;
+    }
+
+    switch (version.toLowerCase(Locale.ROOT)) {
+      case "legacy":
+        return InternalTelemetryVersion.LEGACY;
+      case "latest":
+        return InternalTelemetryVersion.LATEST;
+      default:
+        throw new ConfigurationException("Invalid sdk telemetry version: " + version);
+    }
+  }
+
+  private InternalTelemetryConfiguration() {}
+}
diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/LoggerProviderConfiguration.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/LoggerProviderConfiguration.java
@@ -10,6 +10,7 @@
 import io.opentelemetry.api.metrics.MeterProvider;
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.common.InternalTelemetryVersion;
 import io.opentelemetry.sdk.logs.LogLimits;
 import io.opentelemetry.sdk.logs.LogLimitsBuilder;
 import io.opentelemetry.sdk.logs.LogRecordProcessor;
@@ -18,6 +19,7 @@
 import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessorBuilder;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
 import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor;
+import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessorBuilder;
 import java.io.Closeable;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -44,13 +46,17 @@ static void configureLoggerProvider(
       List<Closeable> closeables) {
 
     loggerProviderBuilder.setLogLimits(() -> configureLogLimits(config));
-    loggerProviderBuilder.setMeterProvider(() -> meterProvider);
+    InternalTelemetryVersion telemetryVersion = InternalTelemetryConfiguration.getVersion(config);
+    if (telemetryVersion != InternalTelemetryVersion.LEGACY) {
+      loggerProviderBuilder.setMeterProvider(() -> meterProvider);
+    }
 
     Map<String, LogRecordExporter> exportersByName =
         configureLogRecordExporters(config, spiHelper, logRecordExporterCustomizer, closeables);
 
     List<LogRecordProcessor> processors =
-        configureLogRecordProcessors(config, exportersByName, meterProvider, closeables);
+        configureLogRecordProcessors(
+            config, exportersByName, telemetryVersion, meterProvider, closeables);
     for (LogRecordProcessor processor : processors) {
       LogRecordProcessor wrapped = logRecordProcessorCustomizer.apply(processor, config);
       if (wrapped != processor) {
@@ -64,6 +70,7 @@ static void configureLoggerProvider(
   static List<LogRecordProcessor> configureLogRecordProcessors(
       ConfigProperties config,
       Map<String, LogRecordExporter> exportersByName,
+      InternalTelemetryVersion telemetryVersion,
       MeterProvider meterProvider,
       List<Closeable> closeables) {
     Map<String, LogRecordExporter> exportersByNameCopy = new HashMap<>(exportersByName);
@@ -72,10 +79,12 @@ static List<LogRecordProcessor> configureLogRecordProcessors(
     for (String simpleProcessorExporterName : simpleProcessorExporterNames) {
       LogRecordExporter exporter = exportersByNameCopy.remove(simpleProcessorExporterName);
       if (exporter != null) {
-        LogRecordProcessor logRecordProcessor =
-            SimpleLogRecordProcessor.builder(exporter)
-                .setMeterProvider(() -> meterProvider)
-                .build();
+        SimpleLogRecordProcessorBuilder logRecordProcessorBuilder =
+            SimpleLogRecordProcessor.builder(exporter);
+        if (telemetryVersion != InternalTelemetryVersion.LEGACY) {
+          logRecordProcessorBuilder.setMeterProvider(() -> meterProvider);
+        }
+        LogRecordProcessor logRecordProcessor = logRecordProcessorBuilder.build();
         closeables.add(logRecordProcessor);
         logRecordProcessors.add(logRecordProcessor);
       }
@@ -85,7 +94,8 @@ static List<LogRecordProcessor> configureLogRecordProcessors(
       LogRecordExporter compositeLogRecordExporter =
           LogRecordExporter.composite(exportersByNameCopy.values());
       LogRecordProcessor logRecordProcessor =
-          configureBatchLogRecordProcessor(config, compositeLogRecordExporter, meterProvider);
+          configureBatchLogRecordProcessor(
+              config, compositeLogRecordExporter, telemetryVersion, meterProvider);
       closeables.add(logRecordProcessor);
       logRecordProcessors.add(logRecordProcessor);
     }
@@ -95,7 +105,10 @@ static List<LogRecordProcessor> configureLogRecordProcessors(
 
   // VisibleForTesting
   static BatchLogRecordProcessor configureBatchLogRecordProcessor(
-      ConfigProperties config, LogRecordExporter exporter, MeterProvider meterProvider) {
+      ConfigProperties config,
+      LogRecordExporter exporter,
+      InternalTelemetryVersion telemetryVersion,
+      MeterProvider meterProvider) {
     BatchLogRecordProcessorBuilder builder =
         BatchLogRecordProcessor.builder(exporter).setMeterProvider(meterProvider);
 
@@ -119,6 +132,8 @@ static BatchLogRecordProcessor configureBatchLogRecordProcessor(
       builder.setExporterTimeout(timeout);
     }
 
+    builder.setInternalTelemetryVersion(telemetryVersion);
+
     return builder.build();
   }
 
diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/TracerProviderConfiguration.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/TracerProviderConfiguration.java
@@ -11,13 +11,15 @@
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
 import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider;
+import io.opentelemetry.sdk.common.InternalTelemetryVersion;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import io.opentelemetry.sdk.trace.SpanLimits;
 import io.opentelemetry.sdk.trace.SpanLimitsBuilder;
 import io.opentelemetry.sdk.trace.SpanProcessor;
 import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
 import io.opentelemetry.sdk.trace.export.BatchSpanProcessorBuilder;
 import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
+import io.opentelemetry.sdk.trace.export.SimpleSpanProcessorBuilder;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.io.Closeable;
@@ -49,7 +51,10 @@ static void configureTracerProvider(
       List<Closeable> closeables) {
 
     tracerProviderBuilder.setSpanLimits(configureSpanLimits(config));
-    tracerProviderBuilder.setMeterProvider(() -> meterProvider);
+    InternalTelemetryVersion telemetryVersion = InternalTelemetryConfiguration.getVersion(config);
+    if (telemetryVersion != InternalTelemetryVersion.LEGACY) {
+      tracerProviderBuilder.setMeterProvider(() -> meterProvider);
+    }
 
     String sampler = config.getString("otel.traces.sampler", PARENTBASED_ALWAYS_ON);
     tracerProviderBuilder.setSampler(
@@ -60,7 +65,8 @@ static void configureTracerProvider(
             config, spiHelper, spanExporterCustomizer, closeables);
 
     List<SpanProcessor> processors =
-        configureSpanProcessors(config, exportersByName, meterProvider, closeables);
+        configureSpanProcessors(
+            config, exportersByName, telemetryVersion, meterProvider, closeables);
     for (SpanProcessor processor : processors) {
       SpanProcessor wrapped = spanProcessorCustomizer.apply(processor, config);
       if (wrapped != processor) {
@@ -73,6 +79,7 @@ static void configureTracerProvider(
   static List<SpanProcessor> configureSpanProcessors(
       ConfigProperties config,
       Map<String, SpanExporter> exportersByName,
+      InternalTelemetryVersion telemetryVersion,
       MeterProvider meterProvider,
       List<Closeable> closeables) {
     Map<String, SpanExporter> exportersByNameCopy = new HashMap<>(exportersByName);
@@ -81,8 +88,11 @@ static List<SpanProcessor> configureSpanProcessors(
     for (String simpleProcessorExporterNames : simpleProcessorExporterNames) {
       SpanExporter exporter = exportersByNameCopy.remove(simpleProcessorExporterNames);
       if (exporter != null) {
-        SpanProcessor spanProcessor =
-            SimpleSpanProcessor.builder(exporter).setMeterProvider(() -> meterProvider).build();
+        SimpleSpanProcessorBuilder spanProcessorBuilder = SimpleSpanProcessor.builder(exporter);
+        if (telemetryVersion != InternalTelemetryVersion.LEGACY) {
+          spanProcessorBuilder.setMeterProvider(() -> meterProvider);
+        }
+        SpanProcessor spanProcessor = spanProcessorBuilder.build();
         closeables.add(spanProcessor);
         spanProcessors.add(spanProcessor);
       }
@@ -91,7 +101,8 @@ static List<SpanProcessor> configureSpanProcessors(
     if (!exportersByNameCopy.isEmpty()) {
       SpanExporter compositeSpanExporter = SpanExporter.composite(exportersByNameCopy.values());
       SpanProcessor spanProcessor =
-          configureBatchSpanProcessor(config, compositeSpanExporter, meterProvider);
+          configureBatchSpanProcessor(
+              config, compositeSpanExporter, telemetryVersion, meterProvider);
       closeables.add(spanProcessor);
       spanProcessors.add(spanProcessor);
     }
@@ -101,7 +112,10 @@ static List<SpanProcessor> configureSpanProcessors(
 
   // VisibleForTesting
   static BatchSpanProcessor configureBatchSpanProcessor(
-      ConfigProperties config, SpanExporter exporter, MeterProvider meterProvider) {
+      ConfigProperties config,
+      SpanExporter exporter,
+      InternalTelemetryVersion telemetryVersion,
+      MeterProvider meterProvider) {
     BatchSpanProcessorBuilder builder =
         BatchSpanProcessor.builder(exporter).setMeterProvider(() -> meterProvider);
 
@@ -125,6 +139,8 @@ static BatchSpanProcessor configureBatchSpanProcessor(
       builder.setExporterTimeout(timeout);
     }
 
+    builder.setInternalTelemetryVersion(telemetryVersion);
+
     return builder.build();
   }
 
diff --git a/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/TracerProviderConfigurationTest.java b/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/TracerProviderConfigurationTest.java
@@ -17,6 +17,7 @@
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
 import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.common.InternalTelemetryVersion;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import io.opentelemetry.sdk.trace.SpanLimits;
@@ -100,7 +101,7 @@ void configureTracerProvider() {
   void configureBatchSpanProcessor_empty() {
     try (BatchSpanProcessor processor =
         TracerProviderConfiguration.configureBatchSpanProcessor(
-            EMPTY, mockSpanExporter, MeterProvider.noop())) {
+            EMPTY, mockSpanExporter, InternalTelemetryVersion.LEGACY, MeterProvider.noop())) {
       assertThat(processor)
           .extracting("worker")
           .satisfies(
@@ -133,6 +134,7 @@ void configureBatchSpanProcessor_configured() {
         TracerProviderConfiguration.configureBatchSpanProcessor(
             DefaultConfigProperties.createFromMap(properties),
             mockSpanExporter,
+            InternalTelemetryVersion.LEGACY,
             MeterProvider.noop())) {
       assertThat(processor)
           .extracting("worker")
diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigurableSpanExporterTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigurableSpanExporterTest.java
diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/FullConfigTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/FullConfigTest.java
diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/LoggerProviderConfigurationTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/LoggerProviderConfigurationTest.java
diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/provider/MetricCustomizer.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/provider/MetricCustomizer.java

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ testing {`
`77`	`77`	`environment("OTEL_EXPORTER_OTLP_TIMEOUT", "5000")`
`78`	`78`	`environment("OTEL_TEST_CONFIGURED", "true")`
`79`	`79`	`environment("OTEL_TEST_WRAPPED", "1")`
	`80`	`+ environment("OTEL_EXPERIMENTAL_SDK_TELEMETRY_VERSION", "latest")`
`80`	`81`	`}`
`81`	`82`	`}`
`82`	`83`	`}`