Fix the unexpected RunningContext recreation in the Tomcat plugin. (a…

…pache#6001)
ichaozai · Dec 13, 2020 · 84af1d2 · 84af1d2
1 parent 4a0a933
commit 84af1d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -12,6 +12,7 @@ Release Notes.
 * The operation name of quartz-scheduler plugin, has been changed as the `quartz-scheduler/${className}` format.
 * Fix jdk-http and okhttp-3.x plugin did not overwrite the old trace header.
 * Support collecting logs of log4j, log4j2, and logback in the tracing context with a new `logger-plugin`.
+* Fix the unexpected RunningContext recreation in the Tomcat plugin.
 
 #### OAP-Backend
 * Make meter receiver support MAL.

diff --git a/...gin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptor.java b/...gin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/TomcatInvokeInterceptor.java
@@ -101,8 +101,8 @@ public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allA
         if (!TomcatPluginConfig.Plugin.Tomcat.COLLECT_HTTP_PARAMS && span.isProfiling()) {
             collectHttpParam(request, span);
         }
-        ContextManager.stopSpan();
         ContextManager.getRuntimeContext().remove(Constants.FORWARD_REQUEST_FLAG);
+        ContextManager.stopSpan();
         return ret;
     }