From b4d58cd19bf6853d8d96d7c8abb88482a4832e15 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Sun, 25 Feb 2018 23:15:14 +0800 Subject: [PATCH] Adjust variable name and remove some confuse comment --- .../HystrixCommandConstructorInterceptor.java | 32 ++++++++----------- .../hystrix/v1/SWExecutionHookWrapper.java | 26 +++++++-------- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java index a6f4ecd06..e6f8aeb31 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java @@ -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)); } } diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java index cc60c4ebd..dafba818a 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java @@ -46,11 +46,8 @@ public class SWExecutionHookWrapper extends HystrixCommandExecutionHook { actual.onStart(commandInstance); } - /** - * execution method - */ - - @Override public void onExecutionStart(HystrixInvokable commandInstance) { + @Override + public void onExecutionStart(HystrixInvokable 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 Exception onExecutionError(HystrixInvokable commandInstance, Exception e) { + @Override + public Exception onExecutionError(HystrixInvokable commandInstance, Exception e) { ContextManager.activeSpan().errorOccurred().log(e); ContextManager.stopSpan(); return actual.onExecutionError(commandInstance, e); } - @Override public void onExecutionSuccess(HystrixInvokable commandInstance) { + @Override + public void onExecutionSuccess(HystrixInvokable commandInstance) { ContextManager.stopSpan(); actual.onExecutionSuccess(commandInstance); } - /** - * Fallback - */ - - @Override public void onFallbackStart(HystrixInvokable commandInstance) { + @Override + public void onFallbackStart(HystrixInvokable 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 Exception onFallbackError(HystrixInvokable commandInstance, Exception e) { + @Override + public Exception onFallbackError(HystrixInvokable commandInstance, Exception e) { ContextManager.activeSpan().errorOccurred().log(e); ContextManager.stopSpan(); return actual.onFallbackError(commandInstance, e); } - @Override public void onFallbackSuccess(HystrixInvokable commandInstance) { + @Override + public void onFallbackSuccess(HystrixInvokable commandInstance) { ContextManager.stopSpan(); actual.onFallbackSuccess(commandInstance); }