open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Mateusz Rzeszutek 2022-11-22 17:29:33 +01:00 committed by GitHub
parent 910d177e6c
commit 82a3fe3001
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark-overhead-jmh/src/jmh/java/io/opentelemetry/javaagent/benchmark/servlet/ServletWithSdkDisabledBenchmark.java
View File

@ -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 {}

2
javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationFileLoaderTest.java
View File

@ -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