add comment

Author: laurit

instrumentation/executors/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/executors/ExecutorAdviceHelper.java

@@ -109,6 +109,7 @@ public static <T> void cleanUpAfterSubmit(
       exceptions.
        */
       propagatedContext.clear();
+      // setting the field to null removes it from the fallback map
       virtualField.set(task, null);
     }
   }
@@ -122,8 +123,9 @@ public static <T> void cleanPropagatedContext(
 
     PropagatedContext propagatedContext = virtualField.get(task);
     if (propagatedContext != null) {
-      virtualField.set(task, null);
       propagatedContext.clear();
+      // setting the field to null removes it from the fallback map
+      virtualField.set(task, null);
     }
   }
 

instrumentation/executors/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/executors/TaskAdviceHelper.java

@@ -22,6 +22,7 @@ public static <T> Scope makePropagatedContextCurrent(
       VirtualField<T, PropagatedContext> virtualField, T task) {
     PropagatedContext propagatedContext = virtualField.get(task);
     if (propagatedContext != null) {
+      // setting the field to null removes it from the fallback map
       virtualField.set(task, null);
       Context context = propagatedContext.getAndClear();
       if (context != null) {