Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
killuaz丶x
SkyWalking
提交
ae6b4add
S
SkyWalking
项目概览
killuaz丶x
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
1
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,发现更多精彩内容 >>
未验证
提交
ae6b4add
编写于
8月 30, 2020
作者:
X
xbkaishui
提交者:
GitHub
8月 30, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#5311 Fix ActiveMQ NullPointerException (#5412)
上级
22bf8e6a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
3 deletion
+28
-3
apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnExceptionInterceptor.java
...alking/apm/plugin/rocketMQ/v4/OnExceptionInterceptor.java
+11
-2
apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnExceptionInterceptorTest.java
...ng/apm/plugin/rocketMQ/v4/OnExceptionInterceptorTest.java
+17
-1
未找到文件。
apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnExceptionInterceptor.java
浏览文件 @
ae6b4add
...
...
@@ -34,15 +34,24 @@ import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
public
class
OnExceptionInterceptor
implements
InstanceMethodsAroundInterceptor
{
public
static
final
String
CALLBACK_OPERATION_NAME_PREFIX
=
"RocketMQ/"
;
private
static
final
String
DEFAULT_TOPIC
=
"no_topic"
;
@Override
public
void
beforeMethod
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
argumentsTypes
,
MethodInterceptResult
result
)
throws
Throwable
{
SendCallBackEnhanceInfo
enhanceInfo
=
(
SendCallBackEnhanceInfo
)
objInst
.
getSkyWalkingDynamicField
();
AbstractSpan
activeSpan
=
ContextManager
.
createLocalSpan
(
CALLBACK_OPERATION_NAME_PREFIX
+
enhanceInfo
.
getTopicId
()
+
"/Producer/Callback"
);
String
topicId
=
DEFAULT_TOPIC
;
// The SendCallBackEnhanceInfo could be null when there is an internal exception in the client API,
// such as MQClientException("no route info of this topic")
if
(
enhanceInfo
!=
null
)
{
topicId
=
enhanceInfo
.
getTopicId
();
}
AbstractSpan
activeSpan
=
ContextManager
.
createLocalSpan
(
CALLBACK_OPERATION_NAME_PREFIX
+
topicId
+
"/Producer/Callback"
);
activeSpan
.
setComponent
(
ComponentsDefine
.
ROCKET_MQ_PRODUCER
);
activeSpan
.
errorOccurred
().
log
((
Throwable
)
allArguments
[
0
]);
ContextManager
.
continued
(
enhanceInfo
.
getContextSnapshot
());
if
(
enhanceInfo
!=
null
&&
enhanceInfo
.
getContextSnapshot
()
!=
null
)
{
ContextManager
.
continued
(
enhanceInfo
.
getContextSnapshot
());
}
}
@Override
...
...
apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/OnExceptionInterceptorTest.java
浏览文件 @
ae6b4add
...
...
@@ -65,13 +65,28 @@ public class OnExceptionInterceptorTest {
@Before
public
void
setUp
()
{
exceptionInterceptor
=
new
OnExceptionInterceptor
();
}
@Test
public
void
testOnException
()
throws
Throwable
{
enhanceInfo
=
new
SendCallBackEnhanceInfo
(
"test"
,
contextSnapshot
);
when
(
enhancedInstance
.
getSkyWalkingDynamicField
()).
thenReturn
(
enhanceInfo
);
exceptionInterceptor
.
beforeMethod
(
enhancedInstance
,
null
,
new
Object
[]
{
new
RuntimeException
()},
null
,
null
);
exceptionInterceptor
.
afterMethod
(
enhancedInstance
,
null
,
new
Object
[]
{
new
RuntimeException
()},
null
,
null
);
assertThat
(
segmentStorage
.
getTraceSegments
().
size
(),
is
(
1
));
TraceSegment
traceSegment
=
segmentStorage
.
getTraceSegments
().
get
(
0
);
List
<
AbstractTracingSpan
>
spans
=
SegmentHelper
.
getSpans
(
traceSegment
);
assertThat
(
spans
.
size
(),
is
(
1
));
AbstractTracingSpan
exceptionSpan
=
spans
.
get
(
0
);
SpanAssert
.
assertException
(
SpanHelper
.
getLogs
(
exceptionSpan
).
get
(
0
),
RuntimeException
.
class
);
SpanAssert
.
assertOccurException
(
exceptionSpan
,
true
);
}
@Test
public
void
testOnException
()
throws
Throwable
{
public
void
testOnException
WithoutSkyWalkingDynamicField
()
throws
Throwable
{
exceptionInterceptor
.
beforeMethod
(
enhancedInstance
,
null
,
new
Object
[]
{
new
RuntimeException
()},
null
,
null
);
exceptionInterceptor
.
afterMethod
(
enhancedInstance
,
null
,
new
Object
[]
{
new
RuntimeException
()},
null
,
null
);
...
...
@@ -81,6 +96,7 @@ public class OnExceptionInterceptorTest {
assertThat
(
spans
.
size
(),
is
(
1
));
AbstractTracingSpan
exceptionSpan
=
spans
.
get
(
0
);
assertThat
(
exceptionSpan
.
getOperationName
(),
is
(
"RocketMQ/no_topic/Producer/Callback"
));
SpanAssert
.
assertException
(
SpanHelper
.
getLogs
(
exceptionSpan
).
get
(
0
),
RuntimeException
.
class
);
SpanAssert
.
assertOccurException
(
exceptionSpan
,
true
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录