Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
山不在高_有仙则灵
SkyWalking
提交
a960272f
S
SkyWalking
项目概览
山不在高_有仙则灵
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
12
Star
0
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a960272f
编写于
5月 31, 2018
作者:
X
Xin,Zhang
提交者:
wu-sheng
5月 31, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix the issue that Hystrix plugin case NPE (#1293)
上级
3f7a86f9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
4 deletion
+12
-4
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java
...ugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java
+3
-1
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java
...g/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java
+3
-1
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java
...walking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java
+6
-2
未找到文件。
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java
浏览文件 @
a960272f
...
...
@@ -36,7 +36,9 @@ public class HystrixCommandGetFallbackInterceptor implements InstanceMethodsArou
AbstractSpan
activeSpan
=
ContextManager
.
createLocalSpan
(
enhanceRequireObjectCache
.
getOperationNamePrefix
()
+
"/Fallback"
);
activeSpan
.
setComponent
(
ComponentsDefine
.
HYSTRIX
);
ContextManager
.
continued
(
snapshot
);
if
(
snapshot
!=
null
)
{
ContextManager
.
continued
(
snapshot
);
}
}
@Override
...
...
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java
浏览文件 @
a960272f
...
...
@@ -41,7 +41,9 @@ public class HystrixCommandRunInterceptor implements InstanceMethodsAroundInterc
AbstractSpan
activeSpan
=
ContextManager
.
createLocalSpan
(
enhanceRequireObjectCache
.
getOperationNamePrefix
()
+
"/Execution"
);
activeSpan
.
setComponent
(
ComponentsDefine
.
HYSTRIX
);
ContextManager
.
continued
(
snapshot
);
if
(
snapshot
!=
null
)
{
ContextManager
.
continued
(
snapshot
);
}
// Because of `fall back` method running in other thread. so we need capture concurrent span for tracing.
enhanceRequireObjectCache
.
setContextSnapshot
(
ContextManager
.
capture
());
...
...
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java
浏览文件 @
a960272f
...
...
@@ -41,7 +41,9 @@ public class SWExecutionHookWrapper extends HystrixCommandExecutionHook {
public
<
T
>
void
onStart
(
HystrixInvokable
<
T
>
commandInstance
)
{
EnhancedInstance
enhancedInstance
=
(
EnhancedInstance
)
commandInstance
;
EnhanceRequireObjectCache
enhanceRequireObjectCache
=
(
EnhanceRequireObjectCache
)
enhancedInstance
.
getSkyWalkingDynamicField
();
enhanceRequireObjectCache
.
setContextSnapshot
(
ContextManager
.
capture
());
if
(
ContextManager
.
isActive
())
{
enhanceRequireObjectCache
.
setContextSnapshot
(
ContextManager
.
capture
());
}
actual
.
onStart
(
commandInstance
);
}
...
...
@@ -166,7 +168,9 @@ public class SWExecutionHookWrapper extends HystrixCommandExecutionHook {
@Override
public
<
T
>
void
onStart
(
HystrixCommand
<
T
>
commandInstance
)
{
EnhancedInstance
enhancedInstance
=
(
EnhancedInstance
)
commandInstance
;
EnhanceRequireObjectCache
enhanceRequireObjectCache
=
(
EnhanceRequireObjectCache
)
enhancedInstance
.
getSkyWalkingDynamicField
();
enhanceRequireObjectCache
.
setContextSnapshot
(
ContextManager
.
capture
());
if
(
ContextManager
.
isActive
())
{
enhanceRequireObjectCache
.
setContextSnapshot
(
ContextManager
.
capture
());
}
actual
.
onStart
(
commandInstance
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录