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

Adjust variable name and remove some confuse comment

This commit is contained in:
ascrutae 2018-02-25 23:15:14 +08:00
parent 65456716a3
commit b4d58cd19b
2 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java
View File

@ -34,31 +34,27 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceC
*/
public class HystrixCommandConstructorInterceptor implements InstanceConstructorInterceptor {
public static final String OPERATION_NAME_PREFIX = "Hystrix/";
@Override
public void onConstruct(EnhancedInstance objInst, Object[] allArguments) {
String identifyKey = "";
String commandIdentify = "";
if (HystrixCommand.class.isAssignableFrom(objInst.getClass())) {
HystrixCommand hystrixCommand = (HystrixCommand)objInst;
identifyKey = hystrixCommand.getCommandKey().name();
commandIdentify = hystrixCommand.getCommandKey().name();
} else if (HystrixCollapser.class.isAssignableFrom(objInst.getClass())) {
HystrixCollapser hystrixCollapser = (HystrixCollapser)objInst;
commandIdentify = hystrixCollapser.getCollapserKey().name();
} else if (HystrixObservableCollapser.class.isAssignableFrom(objInst.getClass())) {
HystrixObservableCollapser hystrixObservableCollapser = (HystrixObservableCollapser)objInst;
commandIdentify = hystrixObservableCollapser.getCollapserKey().name();
} else if (HystrixObservableCommand.class.isAssignableFrom(objInst.getClass())) {
HystrixObservableCommand hystrixObservableCommand = (HystrixObservableCommand)objInst;
commandIdentify = hystrixObservableCommand.getCommandKey().name();
}
if (HystrixCollapser.class.isAssignableFrom(objInst.getClass())) {
HystrixCollapser hystrixCommand = (HystrixCollapser)objInst;
identifyKey = hystrixCommand.getCollapserKey().name();
}
if (HystrixObservableCollapser.class.isAssignableFrom(objInst.getClass())) {
HystrixObservableCollapser hystrixCommand = (HystrixObservableCollapser)objInst;
identifyKey = hystrixCommand.getCollapserKey().name();
}
if (HystrixObservableCommand.class.isAssignableFrom(objInst.getClass())) {
HystrixObservableCommand hystrixCommand = (HystrixObservableCommand)objInst;
identifyKey = hystrixCommand.getCommandKey().name();
}
objInst.setSkyWalkingDynamicField(new EnhanceRequireObjectCache("Hystrix/" + identifyKey));
objInst.setSkyWalkingDynamicField(new EnhanceRequireObjectCache(OPERATION_NAME_PREFIX + commandIdentify));
}
}

26
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java
View File

@ -46,11 +46,8 @@ public class SWExecutionHookWrapper extends HystrixCommandExecutionHook {
actual.onStart(commandInstance);
}
/**
* execution method
*/
@Override public <T> void onExecutionStart(HystrixInvokable<T> commandInstance) {
@Override
public <T> void onExecutionStart(HystrixInvokable<T> commandInstance) {
// create a local span, and continued, The `execution method` running in other thread if the
// hystrix strategy is `THREAD`.
EnhancedInstance enhancedInstance = (EnhancedInstance)commandInstance;
@ -66,22 +63,21 @@ public class SWExecutionHookWrapper extends HystrixCommandExecutionHook {
enhanceRequireObjectCache.setContextSnapshot(ContextManager.capture());
}
@Override public <T> Exception onExecutionError(HystrixInvokable<T> commandInstance, Exception e) {
@Override
public <T> Exception onExecutionError(HystrixInvokable<T> commandInstance, Exception e) {
ContextManager.activeSpan().errorOccurred().log(e);
ContextManager.stopSpan();
return actual.onExecutionError(commandInstance, e);
}
@Override public <T> void onExecutionSuccess(HystrixInvokable<T> commandInstance) {
@Override
public <T> void onExecutionSuccess(HystrixInvokable<T> commandInstance) {
ContextManager.stopSpan();
actual.onExecutionSuccess(commandInstance);
}
/**
* Fallback
*/
@Override public <T> void onFallbackStart(HystrixInvokable<T> commandInstance) {
@Override
public <T> void onFallbackStart(HystrixInvokable<T> commandInstance) {
EnhancedInstance enhancedInstance = (EnhancedInstance)commandInstance;
EnhanceRequireObjectCache enhanceRequireObjectCache = (EnhanceRequireObjectCache)enhancedInstance.getSkyWalkingDynamicField();
ContextSnapshot snapshot = enhanceRequireObjectCache.getContextSnapshot();
@ -93,13 +89,15 @@ public class SWExecutionHookWrapper extends HystrixCommandExecutionHook {
actual.onFallbackStart(commandInstance);
}
@Override public <T> Exception onFallbackError(HystrixInvokable<T> commandInstance, Exception e) {
@Override
public <T> Exception onFallbackError(HystrixInvokable<T> commandInstance, Exception e) {
ContextManager.activeSpan().errorOccurred().log(e);
ContextManager.stopSpan();
return actual.onFallbackError(commandInstance, e);
}
@Override public <T> void onFallbackSuccess(HystrixInvokable<T> commandInstance) {
@Override
public <T> void onFallbackSuccess(HystrixInvokable<T> commandInstance) {
ContextManager.stopSpan();
actual.onFallbackSuccess(commandInstance);
}