Skip to content

Commit 29f57a4

Browse files
Revert change and put suppression for IDEA and comment with explanation.
1 parent 1ba710f commit 29f57a4

File tree

1 file changed

+4
-1
lines changed
  • dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent

1 file changed

+4
-1
lines changed

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ public static AgentScope getAndClearThreadLocalScope(Runnable task) {
101101
return null;
102102
}
103103
AgentScope scope = threadLocalScope.get();
104-
threadLocalScope.remove();
104+
// Intentionally use `.set(null)` instead of `.remove()` for performance reasons.
105+
// For details see: https://github.com/DataDog/dd-trace-java/pull/9856#discussion_r2527729963
106+
// noinspection ThreadLocalSetWithNull
107+
threadLocalScope.set(null);
105108
return scope;
106109
}
107110

0 commit comments

Comments
 (0)