Merge pull request scouter-project#742 from scouter-project/feature/s…

…pring-reactive-coroutine-gunlee [agent.java] reactive support misc
kys2406 · Aug 25, 2020 · ab9a4e6 · ab9a4e6
2 parents 0fafca2 + a26ce98
commit ab9a4e6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/scouter.agent.java/src/main/java/scouter/agent/trace/TraceContextManager.java b/scouter.agent.java/src/main/java/scouter/agent/trace/TraceContextManager.java
@@ -204,6 +204,12 @@ public static void start(TraceContext o) {
  }
  }
 
+ public static void takeoverTxid(TraceContext o, long oldTxid) {
+ txidLocal.set(o.txid);
+ entryByTxid.remove(oldTxid);
+ entryByTxid.put(o.txid, o);
+ }
+
  public static void startByCoroutine(TraceContext o) {
  txidByCoroutine.set(o.txid);
  }
@@ -262,13 +268,12 @@ public static void clearAllContext(TraceContext o) {
  entryByTxid.remove(o.txid);
  if (conf._psts_progressive_reactor_thread_trace_enabled) {
  txidThreadMap.remove(o.txid);
- } else {
- entryByThreadId.remove(o.threadId);
  }
 
  txidByCoroutine.set(null);
  if (!o.isReactiveStarted) { //do not clear txidLocal in reactive
  txidLocal.set(null);
+ entryByThreadId.remove(o.threadId);
  }
 
  clearForceDiscard();

diff --git a/scouter.agent.java/src/main/java/scouter/agent/trace/TraceMain.java b/scouter.agent.java/src/main/java/scouter/agent/trace/TraceMain.java
@@ -1322,7 +1322,11 @@ public static Object startAsyncPossibleService(Object keyObject, String fullName
  }
  localContext.service = true;
  if (id.gxid != 0) localContext.context.gxid = id.gxid;
- if (id.callee != 0) localContext.context.txid = id.callee;
+ if (id.callee != 0) {
+ long oldTxid = localContext.context.txid;
+ localContext.context.txid = id.callee;
+ TraceContextManager.takeoverTxid(localContext.context, oldTxid);
+ }
  if (id.caller != 0) localContext.context.caller = id.caller;
 
  String serviceName = StringUtil.removeLastString(className, '/') + "#" + methodName + "() -- " + fullName;
@@ -1492,7 +1496,11 @@ public static Object callRunnableCallInvoked(Object callRunnableObj) {
  }
  localContext.service = true;
  if (id.gxid != 0) localContext.context.gxid = id.gxid;
- if (id.callee != 0) localContext.context.txid = id.callee;
+ if (id.callee != 0) {
+ long oldTxid = localContext.context.txid;
+ localContext.context.txid = id.callee;
+ TraceContextManager.takeoverTxid(localContext.context, oldTxid);
+ }
  if (id.caller != 0) localContext.context.caller = id.caller;
 
  return localContext;