Merge pull request #1100 from microsoft/trask/fix-async-thread-tracking

Fix async thread tracking
microsoft · Oct 16, 2019 · 2882bc8 · 2882bc8
2 parents 9e20a2f + 77d91cc
commit 2882bc8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...ain/java/com/microsoft/applicationinsights/agent/internal/model/AuxThreadContextImpl.java b/...ain/java/com/microsoft/applicationinsights/agent/internal/model/AuxThreadContextImpl.java
@@ -53,7 +53,11 @@ public Span startAndMarkAsyncTransactionComplete() {
     private Span start(boolean completeAsyncTransaction) {
         ThreadContextThreadLocal.Holder threadContextHolder = Global.getThreadContextHolder();
         ThreadContextPlus threadContext = threadContextHolder.get();
-        if (threadContext != null) {
+        // TODO once local spans are supported, only return NOP if parent spans are the same
+        // Checking if in same request is needed in case the existing thread context is from a prior request
+        // (e.g. this can happen if the thread activity was captured via Thread constructor, but the thread was
+        // really then used in a thread pool)
+        if (threadContext != null && threadContext.getServletRequestInfo() == servletRequestInfo) {
             if (completeAsyncTransaction) {
                 threadContext.setTransactionAsyncComplete();
             }