From 4e03d23c613463beb00757849a8bcf9a58923481 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Fri, 24 Oct 2025 11:26:57 -0400
Subject: [PATCH] Fixed thread local cleanup detected by IDEA.

---
 .../bootstrap/instrumentation/java/concurrent/TPEHelper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java
index 1f3eccab66b..eddf5020f74 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java
@@ -101,7 +101,7 @@ public static AgentScope getAndClearThreadLocalScope(Runnable task) {
       return null;
     }
     AgentScope scope = threadLocalScope.get();
-    threadLocalScope.set(null);
+    threadLocalScope.remove();
     return scope;
   }