Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
润土的好友猹
SkyWalking
提交
b0ec2071
S
SkyWalking
项目概览
润土的好友猹
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
9
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
b0ec2071
编写于
8月 30, 2018
作者:
wu-sheng
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into 5.x
上级
3afe0215
a99733bf
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
79 addition
and
4 deletion
+79
-4
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixConcurrencyStrategyInterceptor.java
...gin/hystrix/v1/HystrixConcurrencyStrategyInterceptor.java
+15
-2
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java
...king/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java
+14
-1
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWHystrixConcurrencyStrategyWrapper.java
...lugin/hystrix/v1/SWHystrixConcurrencyStrategyWrapper.java
+4
-1
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWHystrixPluginsWrapperCache.java
...g/apm/plugin/hystrix/v1/SWHystrixPluginsWrapperCache.java
+46
-0
未找到文件。
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixConcurrencyStrategyInterceptor.java
浏览文件 @
b0ec2071
...
...
@@ -34,8 +34,21 @@ public class HystrixConcurrencyStrategyInterceptor implements InstanceMethodsAro
@Override
public
Object
afterMethod
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
argumentsTypes
,
Object
ret
)
throws
Throwable
{
return
new
SWHystrixConcurrencyStrategyWrapper
((
HystrixConcurrencyStrategy
)
ret
);
Object
ret
)
throws
Throwable
{
SWHystrixPluginsWrapperCache
wrapperCache
=
(
SWHystrixPluginsWrapperCache
)
objInst
.
getSkyWalkingDynamicField
();
if
(
wrapperCache
==
null
||
wrapperCache
.
getSwHystrixConcurrencyStrategyWrapper
()
==
null
)
{
synchronized
(
objInst
)
{
if
(
wrapperCache
==
null
)
{
wrapperCache
=
new
SWHystrixPluginsWrapperCache
();
objInst
.
setSkyWalkingDynamicField
(
wrapperCache
);
}
if
(
wrapperCache
.
getSwHystrixConcurrencyStrategyWrapper
()
==
null
)
{
wrapperCache
.
setSwHystrixConcurrencyStrategyWrapper
(
new
SWHystrixConcurrencyStrategyWrapper
((
HystrixConcurrencyStrategy
)
ret
));
}
}
}
return
wrapperCache
.
getSwHystrixConcurrencyStrategyWrapper
();
}
@Override
public
void
handleMethodException
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
...
...
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java
浏览文件 @
b0ec2071
...
...
@@ -40,7 +40,20 @@ public class HystrixPluginsInterceptor implements InstanceMethodsAroundIntercept
@Override
public
Object
afterMethod
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
argumentsTypes
,
Object
ret
)
throws
Throwable
{
return
new
SWExecutionHookWrapper
((
HystrixCommandExecutionHook
)
ret
);
SWHystrixPluginsWrapperCache
wrapperCache
=
(
SWHystrixPluginsWrapperCache
)
objInst
.
getSkyWalkingDynamicField
();
if
(
wrapperCache
==
null
||
wrapperCache
.
getSwExecutionHookWrapper
()
==
null
)
{
synchronized
(
objInst
)
{
if
(
wrapperCache
==
null
)
{
wrapperCache
=
new
SWHystrixPluginsWrapperCache
();
objInst
.
setSkyWalkingDynamicField
(
wrapperCache
);
}
if
(
wrapperCache
.
getSwExecutionHookWrapper
()
==
null
)
{
wrapperCache
.
setSwExecutionHookWrapper
(
new
SWExecutionHookWrapper
((
HystrixCommandExecutionHook
)
ret
));
}
}
}
return
wrapperCache
.
getSwExecutionHookWrapper
();
}
@Override
public
void
handleMethodException
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
...
...
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWHystrixConcurrencyStrategyWrapper.java
浏览文件 @
b0ec2071
...
...
@@ -36,7 +36,10 @@ public class SWHystrixConcurrencyStrategyWrapper extends HystrixConcurrencyStrat
@Override
public
<
T
>
Callable
<
T
>
wrapCallable
(
Callable
<
T
>
callable
)
{
return
new
WrappedCallable
<
T
>(
ContextManager
.
getRuntimeContext
().
capture
(),
super
.
wrapCallable
(
callable
));
Callable
<
T
>
delegateCallable
=
delegate
!=
null
?
delegate
.
wrapCallable
(
callable
)
:
super
.
wrapCallable
(
callable
);
return
new
WrappedCallable
<
T
>(
ContextManager
.
getRuntimeContext
().
capture
(),
delegateCallable
);
}
static
class
WrappedCallable
<
T
>
implements
Callable
<
T
>
{
...
...
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWHystrixPluginsWrapperCache.java
0 → 100644
浏览文件 @
b0ec2071
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package
org.apache.skywalking.apm.plugin.hystrix.v1
;
/**
* {@link SWHystrixPluginsWrapperCache} record the {@link SWExecutionHookWrapper} and {@link SWHystrixConcurrencyStrategyWrapper} object for
* storing in EnhancedInstance#dynamicField together.
*
* @author chenpengfei
*/
public
class
SWHystrixPluginsWrapperCache
{
private
volatile
SWExecutionHookWrapper
swExecutionHookWrapper
;
private
volatile
SWHystrixConcurrencyStrategyWrapper
swHystrixConcurrencyStrategyWrapper
;
public
SWExecutionHookWrapper
getSwExecutionHookWrapper
()
{
return
swExecutionHookWrapper
;
}
public
void
setSwExecutionHookWrapper
(
SWExecutionHookWrapper
swExecutionHookWrapper
)
{
this
.
swExecutionHookWrapper
=
swExecutionHookWrapper
;
}
public
SWHystrixConcurrencyStrategyWrapper
getSwHystrixConcurrencyStrategyWrapper
()
{
return
swHystrixConcurrencyStrategyWrapper
;
}
public
void
setSwHystrixConcurrencyStrategyWrapper
(
SWHystrixConcurrencyStrategyWrapper
swHystrixConcurrencyStrategyWrapper
)
{
this
.
swHystrixConcurrencyStrategyWrapper
=
swHystrixConcurrencyStrategyWrapper
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录