kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPE in handleMethodException method of apm-jdk-threadpool-plugin. (#681) (#682) 

Co-authored-by: forrestwang <forrest.wang@woo.network>
This commit is contained in:
ForrestWang123 2024-04-19 08:51:09 +08:00 committed by GitHub
parent ec30b5f53d
commit 1a01047007
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apm-sniffer/bootstrap-plugins/jdk-threadpool-plugin/src/main/java/org/apache/skywalking/apm/plugin/AbstractThreadingPoolInterceptor.java
View File

@ -28,22 +28,11 @@ import java.lang.reflect.Method;
public abstract class AbstractThreadingPoolInterceptor implements InstanceMethodsAroundInterceptor {
@Override
public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes, MethodInterceptResult result) throws Throwable {
if (!ContextManager.isActive()) {
if (notToEnhance(allArguments)) {
return;
}
if (allArguments == null || allArguments.length < 1) {
return;
}
Object argument = allArguments[0];
// Avoid duplicate enhancement, such as the case where it has already been enhanced by RunnableWrapper or CallableWrapper with toolkit.
if (argument instanceof EnhancedInstance && ((EnhancedInstance) argument).getSkyWalkingDynamicField() instanceof ContextSnapshot) {
return;
}
Object wrappedObject = wrap(argument);
Object wrappedObject = wrap(allArguments[0]);
if (wrappedObject != null) {
allArguments[0] = wrappedObject;
}
@ -63,10 +52,25 @@ public abstract class AbstractThreadingPoolInterceptor implements InstanceMethod
@Override
public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes, Throwable t) {
if (!ContextManager.isActive()) {
if (notToEnhance(allArguments)) {
return;
}
ContextManager.activeSpan().log(t);
}
private boolean notToEnhance(Object[] allArguments) {
if (!ContextManager.isActive()) {
return true;
}
if (allArguments == null || allArguments.length < 1) {
return true;
}
Object argument = allArguments[0];
// Avoid duplicate enhancement, such as the case where it has already been enhanced by RunnableWrapper or CallableWrapper with toolkit.
return argument instanceof EnhancedInstance && ((EnhancedInstance) argument).getSkyWalkingDynamicField() instanceof ContextSnapshot;
}
}