Browse Source

Use otel.sdk.disabled property instead of the deprecated one (#7270)

Mateusz Rzeszutek 2 years ago
parent
commit
82a3fe3001

+ 1 - 1
benchmark-overhead-jmh/src/jmh/java/io/opentelemetry/javaagent/benchmark/servlet/ServletWithSdkDisabledBenchmark.java

@@ -7,5 +7,5 @@ package io.opentelemetry.javaagent.benchmark.servlet;
 
 import org.openjdk.jmh.annotations.Fork;
 
-@Fork(jvmArgsAppend = "-Dotel.experimental.sdk.enabled=false")
+@Fork(jvmArgsAppend = "-Dotel.sdk.disabled=true")
 public class ServletWithSdkDisabledBenchmark extends ServletBenchmark {}

+ 1 - 1
javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFileLoaderTest.java

@@ -36,7 +36,7 @@ class ConfigurationFileLoaderTest {
   }
 
   // regression for https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6696
-  @SetSystemProperty(key = "otel.experimental.sdk.enabled", value = "false") // don't setup the SDK
+  @SetSystemProperty(key = "otel.sdk.disabled", value = "true") // don't setup the SDK
   @Test
   void fileConfigOverwritesUserPropertiesSupplier(@TempDir Path tempDir) throws IOException {
     // given