You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2021/05/25 22:48:14 UTC
[skywalking] branch master updated: Fix jdk-threading-plugin memory
leak #7001 (#7003)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new e9b9be4 Fix jdk-threading-plugin memory leak #7001 (#7003)
e9b9be4 is described below
commit e9b9be4ab56107edb48ef5b732b2caf0e0729e90
Author: muyun12 <11...@qq.com>
AuthorDate: Wed May 26 06:47:47 2021 +0800
Fix jdk-threading-plugin memory leak #7001 (#7003)
---
CHANGES.md | 1 +
.../apm/plugin/jdk/threading/ThreadingMethodInterceptor.java | 7 +------
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 868ab83..bb05844 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,6 +31,7 @@ Release Notes.
* Fixed part of the dynamic configuration of ConfigurationDiscoveryService that does not take effect under certain circumstances.
* Introduce method interceptor API v2
* Fix ClassCast issue for RequestHolder/ResponseHolder.
+* fixed `jdk-threading-plugin` memory leak.
#### OAP-Backend
* BugFix: filter invalid Envoy access logs whose socket address is empty.
diff --git a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingMethodInterceptor.java b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingMethodInterceptor.java
index 6cf0107..e045b30 100644
--- a/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingMethodInterceptor.java
+++ b/apm-sniffer/bootstrap-plugins/jdk-threading-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdk/threading/ThreadingMethodInterceptor.java
@@ -48,12 +48,7 @@ public class ThreadingMethodInterceptor implements InstanceMethodsAroundIntercep
@Override
public Object afterMethod(final EnhancedInstance objInst, final Method method, final Object[] allArguments,
final Class<?>[] argumentsTypes, final Object ret) {
-
- final Object storedField = objInst.getSkyWalkingDynamicField();
- if (storedField != null) {
- ContextManager.stopSpan();
- }
-
+ ContextManager.stopSpan();
return ret;
}