fix spurious context clear when thread detached from wallclock profil…

…ing (#6836)
DataDog · Mar 22, 2024 · b856443 · b856443
1 parent 373481b
commit b856443
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...filing-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java b/...filing-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilingIntegration.java
@@ -32,7 +32,9 @@ public class DatadogProfilingIntegration implements ProfilingContextIntegration
       new Stateful() {
         @Override
         public void close() {
-          // this implementation is stateless so nothing to do here
+          DDPROF.clearSpanContext();
+          DDPROF.clearContextValue(SPAN_NAME_INDEX);
+          DDPROF.clearContextValue(RESOURCE_NAME_INDEX);
         }
 
         @Override
@@ -60,7 +62,6 @@ public void onAttach() {
 
   @Override
   public void onDetach() {
-    clearContext();
     if (WALLCLOCK_ENABLED) {
       DDPROF.removeThread();
     }