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

Updates to thread propagation debug property (#2500)

This commit is contained in:
Trask Stalnaker 2021-03-05 11:02:36 -08:00 committed by GitHub
parent 96606711ac
commit 5162c023bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/instrumentation.gradle
View File

@ -115,8 +115,6 @@ tasks.withType(Test).configureEach {
jvmArgs "-javaagent:${project(":testing:agent-for-testing").tasks.shadowJar.archiveFile.get().asFile.absolutePath}"
jvmArgs "-Dotel.javaagent.experimental.initializer.jar=${shadowJar.archiveFile.get().asFile.absolutePath}"
jvmArgs "-Dotel.javaagent.testing.additional-library-ignores.enabled=false"
// always run with the thread propagation debugger to help track down sporadic test failures
jvmArgs "-Dotel.javaagent.experimental.thread-propagation-debugger.enabled=true"
jvmArgs "-Dotel.javaagent.testing.fail-on-context-leak=true"
// prevent sporadic gradle deadlocks, see SafeLogger for more details
jvmArgs "-Dotel.javaagent.testing.transform-safe-logging.enabled=true"

9
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/context/ContextPropagationDebug.java
View File

@ -8,6 +8,7 @@ package io.opentelemetry.instrumentation.api.context;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.ContextKey;
import io.opentelemetry.instrumentation.api.config.Config;
import java.util.Iterator;
import java.util.List;
import org.slf4j.Logger;
@ -22,9 +23,13 @@ public final class ContextPropagationDebug {
ContextKey.named("thread-propagation-locations");
private static final boolean THREAD_PROPAGATION_DEBUGGER =
Boolean.getBoolean("otel.javaagent.experimental.thread-propagation-debugger.enabled");
Config.get()
.getBooleanProperty(
"otel.javaagent.experimental.thread-propagation-debugger.enabled",
Config.get().isAgentDebugEnabled());
private static final boolean FAIL_ON_CONTEXT_LEAK =
Boolean.getBoolean("otel.javaagent.testing.fail-on-context-leak");
Config.get().getBooleanProperty("otel.javaagent.testing.fail-on-context-leak", false);
public static boolean isThreadPropagationDebuggerEnabled() {
return THREAD_PROPAGATION_DEBUGGER;