Remove support for otel.experimental.sdk.enabled (#4973)

open-telemetry · Nov 26, 2022 · ee2d981 · ee2d981
1 parent c2947bf
commit ee2d981
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 57 deletions.
diff --git a/sdk-extensions/autoconfigure/README.md b/sdk-extensions/autoconfigure/README.md
@@ -44,9 +44,9 @@ for more details.
 
 The OpenTelemetry SDK can be disabled entirely. If disabled, `AutoConfiguredOpenTelemetrySdk#getOpenTelemetrySdk()` will return a minimally configured instance (i.e. `OpenTelemetrySdk.builder().build()`).
 
-| System property   | Environment variable | Purpose                                                                                                                                                                                      |
-|-------------------|----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| otel.sdk.disabled | OTEL_SDK_DISABLED    | If `true`, disable the OpenTelemetry SDK. Defaults to `false`. The now legacy property `otel.experimental.sdk.enabled` will continue to work with default `true` during a transition period. |
+| System property   | Environment variable | Purpose                                                        |
+|-------------------|----------------------|----------------------------------------------------------------|
+| otel.sdk.disabled | OTEL_SDK_DISABLED    | If `true`, disable the OpenTelemetry SDK. Defaults to `false`. |
 
 ## Exporters
 

diff --git a/...c/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java b/...c/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java
@@ -331,9 +331,7 @@ public AutoConfiguredOpenTelemetrySdk build() {
         ResourceConfiguration.configureResource(config, serviceClassLoader, resourceCustomizer);
 
     OpenTelemetrySdk openTelemetrySdk = OpenTelemetrySdk.builder().build();
-    boolean sdkEnabled =
-        !config.getBoolean(
-            "otel.sdk.disabled", !config.getBoolean("otel.experimental.sdk.enabled", true));
+    boolean sdkEnabled = !config.getBoolean("otel.sdk.disabled", false);
 
     if (sdkEnabled) {
       SdkMeterProviderBuilder meterProviderBuilder = SdkMeterProvider.builder();

diff --git a/.../src/test/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java b/.../src/test/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java
@@ -359,31 +359,6 @@ private static Supplier<Map<String, String>> disableExportPropertySupplier() {
     return () -> props;
   }
 
-  @Test
-  void disableSdkLegacyProperty() {
-    BiFunction<SdkTracerProviderBuilder, ConfigProperties, SdkTracerProviderBuilder>
-        traceCustomizer = getTracerProviderBuilderSpy();
-    BiFunction<SdkMeterProviderBuilder, ConfigProperties, SdkMeterProviderBuilder>
-        metricCustomizer = getMeterProviderBuilderSpy();
-    BiFunction<SdkLoggerProviderBuilder, ConfigProperties, SdkLoggerProviderBuilder> logCustomizer =
-        getLoggerProviderBuilderSpy();
-
-    AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
-        AutoConfiguredOpenTelemetrySdk.builder()
-            .addPropertiesSupplier(() -> singletonMap("otel.experimental.sdk.enabled", "false"))
-            .addTracerProviderCustomizer(traceCustomizer)
-            .addMeterProviderCustomizer(metricCustomizer)
-            .addLoggerProviderCustomizer(logCustomizer)
-            .build();
-
-    assertThat(autoConfiguredSdk.getOpenTelemetrySdk()).isInstanceOf(OpenTelemetrySdk.class);
-
-    // When the SDK is disabled, configuration is skipped and none of the customizers are called
-    verify(traceCustomizer, never()).apply(any(), any());
-    verify(metricCustomizer, never()).apply(any(), any());
-    verify(logCustomizer, never()).apply(any(), any());
-  }
-
   @Test
   void disableSdk() {
     BiFunction<SdkTracerProviderBuilder, ConfigProperties, SdkTracerProviderBuilder>
@@ -409,32 +384,6 @@ void disableSdk() {
     verify(logCustomizer, never()).apply(any(), any());
   }
 
-  @Test
-  void disableSdkNewPropertyWins() {
-    BiFunction<SdkTracerProviderBuilder, ConfigProperties, SdkTracerProviderBuilder>
-        traceCustomizer = getTracerProviderBuilderSpy();
-    BiFunction<SdkMeterProviderBuilder, ConfigProperties, SdkMeterProviderBuilder>
-        metricCustomizer = getMeterProviderBuilderSpy();
-    BiFunction<SdkLoggerProviderBuilder, ConfigProperties, SdkLoggerProviderBuilder> logCustomizer =
-        getLoggerProviderBuilderSpy();
-
-    AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
-        AutoConfiguredOpenTelemetrySdk.builder()
-            .addPropertiesSupplier(() -> singletonMap("otel.sdk.disabled", "true"))
-            .addPropertiesSupplier(() -> singletonMap("otel.experimental.sdk.enabled", "true"))
-            .addTracerProviderCustomizer(traceCustomizer)
-            .addMeterProviderCustomizer(metricCustomizer)
-            .addLoggerProviderCustomizer(logCustomizer)
-            .build();
-
-    assertThat(autoConfiguredSdk.getOpenTelemetrySdk()).isInstanceOf(OpenTelemetrySdk.class);
-
-    // When the SDK is disabled, configuration is skipped and none of the customizers are called
-    verify(traceCustomizer, never()).apply(any(), any());
-    verify(metricCustomizer, never()).apply(any(), any());
-    verify(logCustomizer, never()).apply(any(), any());
-  }
-
   @Test
   void tracerProviderCustomizer() {
     InMemorySpanExporter spanExporter = InMemorySpanExporter.create();