This is an automated email from the ASF dual-hosted git repository. huxing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-sentinel-support.git
commit 73d56474a629503654ce3f216fdb58ffe0d736a7 Author: Eric Zhao <[email protected]> AuthorDate: Wed Sep 26 14:32:29 2018 +0800 Enhance exception tracing in Sentinel Dubbo Adapter Signed-off-by: Eric Zhao <[email protected]> --- pom.xml | 4 +--- .../csp/sentinel/adapter/dubbo/SentinelDubboConsumerFilter.java | 8 +++++++- .../csp/sentinel/adapter/dubbo/SentinelDubboProviderFilter.java | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e34e9f0..9ed1a2c 100644 --- a/pom.xml +++ b/pom.xml @@ -31,10 +31,8 @@ <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> - <version>1.2.47</version> + <version>1.2.49</version> <scope>test</scope> </dependency> </dependencies> - - </project> \ No newline at end of file diff --git a/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/SentinelDubboConsumerFilter.java b/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/SentinelDubboConsumerFilter.java index 4df20d4..85b268d 100755 --- a/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/SentinelDubboConsumerFilter.java +++ b/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/SentinelDubboConsumerFilter.java @@ -57,7 +57,13 @@ public class SentinelDubboConsumerFilter extends AbstractDubboFilter implements ContextUtil.enter(resourceName); interfaceEntry = SphU.entry(invoker.getInterface().getName(), EntryType.OUT); methodEntry = SphU.entry(resourceName, EntryType.OUT); - return invoker.invoke(invocation); + + Result result = invoker.invoke(invocation); + if (result.hasException()) { + // Record common exception. + Tracer.trace(result.getException()); + } + return result; } catch (BlockException e) { return DubboFallbackRegistry.getConsumerFallback().handle(invoker, invocation, e); } catch (RpcException e) { diff --git a/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/SentinelDubboProviderFilter.java b/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/SentinelDubboProviderFilter.java index 0eacab2..c82afb8 100755 --- a/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/SentinelDubboProviderFilter.java +++ b/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/SentinelDubboProviderFilter.java @@ -63,7 +63,11 @@ public class SentinelDubboProviderFilter extends AbstractDubboFilter implements interfaceEntry = SphU.entry(interfaceName, EntryType.IN); methodEntry = SphU.entry(resourceName, EntryType.IN, 1, invocation.getArguments()); - return invoker.invoke(invocation); + Result result = invoker.invoke(invocation); + if (result.hasException()) { + Tracer.trace(result.getException()); + } + return result; } catch (BlockException e) { return DubboFallbackRegistry.getProviderFallback().handle(invoker, invocation, e); } catch (RpcException e) {
