Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
月轩居士
SkyWalking
提交
54269101
S
SkyWalking
项目概览
月轩居士
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
4
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
54269101
编写于
12月 21, 2020
作者:
Z
ZS-Oliver
提交者:
GitHub
12月 21, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix thrift trace broken and wrong arg collected. (#5989)
上级
bf639d3e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
1 deletion
+25
-1
CHANGES.md
CHANGES.md
+2
-1
apm-sniffer/apm-sdk-plugin/thrift-plugin/src/main/java/org/apache/skywalking/apm/plugin/thrift/client/TServiceClientInterceptor.java
...g/apm/plugin/thrift/client/TServiceClientInterceptor.java
+1
-0
apm-sniffer/apm-sdk-plugin/thrift-plugin/src/main/java/org/apache/skywalking/apm/plugin/thrift/wrapper/ServerInProtocolWrapper.java
...ng/apm/plugin/thrift/wrapper/ServerInProtocolWrapper.java
+22
-0
未找到文件。
CHANGES.md
浏览文件 @
54269101
...
...
@@ -17,7 +17,8 @@ Release Notes.
*
Fix the unexpected RunningContext recreation in the Tomcat plugin.
*
Fix the potential NPE when trace_sql_parameters is enabled.
*
Update
`byte-buddy`
to 1.10.19.
*
Fix thrift plugin trace link broken when intermediate service does not mount agent
*
Fix thrift plugin collects wrong args when the method without parameter.
#### OAP-Backend
*
Make meter receiver support MAL.
...
...
apm-sniffer/apm-sdk-plugin/thrift-plugin/src/main/java/org/apache/skywalking/apm/plugin/thrift/client/TServiceClientInterceptor.java
浏览文件 @
54269101
...
...
@@ -100,6 +100,7 @@ public class TServiceClientInterceptor implements InstanceConstructorInterceptor
while
(
true
)
{
TFieldIdEnum
field
=
base
.
fieldForId
(++
idx
);
if
(
field
==
null
)
{
idx
--;
break
;
}
buffer
.
append
(
field
.
getFieldName
()).
append
(
", "
);
...
...
apm-sniffer/apm-sdk-plugin/thrift-plugin/src/main/java/org/apache/skywalking/apm/plugin/thrift/wrapper/ServerInProtocolWrapper.java
浏览文件 @
54269101
...
...
@@ -21,6 +21,7 @@ package org.apache.skywalking.apm.plugin.thrift.wrapper;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Objects
;
import
org.apache.skywalking.apm.agent.core.context.CarrierItem
;
import
org.apache.skywalking.apm.agent.core.context.ContextCarrier
;
import
org.apache.skywalking.apm.agent.core.context.ContextManager
;
...
...
@@ -45,6 +46,7 @@ public class ServerInProtocolWrapper extends AbstractProtocolWrapper {
private
static
final
ILog
LOGGER
=
LogManager
.
getLogger
(
ServerInProtocolWrapper
.
class
);
private
static
final
StringTag
TAG_ARGS
=
new
StringTag
(
"args"
);
private
AbstractContext
context
;
private
static
final
String
HAVE_CREATED_SPAN
=
"HAVE_CREATED_SPAN"
;
public
ServerInProtocolWrapper
(
final
TProtocol
protocol
)
{
super
(
protocol
);
...
...
@@ -52,6 +54,7 @@ public class ServerInProtocolWrapper extends AbstractProtocolWrapper {
public
void
initial
(
AbstractContext
context
)
{
this
.
context
=
context
;
ContextManager
.
getRuntimeContext
().
put
(
HAVE_CREATED_SPAN
,
false
);
}
@Override
...
...
@@ -72,6 +75,7 @@ public class ServerInProtocolWrapper extends AbstractProtocolWrapper {
span
.
tag
(
TAG_ARGS
,
context
.
getArguments
());
span
.
setComponent
(
ComponentsDefine
.
THRIFT_SERVER
);
SpanLayer
.
asRPCFramework
(
span
);
ContextManager
.
getRuntimeContext
().
put
(
HAVE_CREATED_SPAN
,
true
);
}
catch
(
Throwable
throwable
)
{
LOGGER
.
error
(
"Failed to resolve header or create EntrySpan."
,
throwable
);
}
finally
{
...
...
@@ -81,6 +85,24 @@ public class ServerInProtocolWrapper extends AbstractProtocolWrapper {
}
return
readFieldBegin
();
}
if
(
field
.
type
==
TType
.
STOP
)
{
Boolean
haveCreatedSpan
=
(
Boolean
)
ContextManager
.
getRuntimeContext
().
get
(
HAVE_CREATED_SPAN
);
if
(
haveCreatedSpan
!=
null
&&
!
haveCreatedSpan
)
{
try
{
AbstractSpan
span
=
ContextManager
.
createEntrySpan
(
context
.
getOperatorName
(),
createContextCarrier
(
null
));
span
.
start
(
context
.
startTime
);
span
.
tag
(
TAG_ARGS
,
context
.
getArguments
());
span
.
setComponent
(
ComponentsDefine
.
THRIFT_SERVER
);
SpanLayer
.
asRPCFramework
(
span
);
}
catch
(
Throwable
throwable
)
{
LOGGER
.
error
(
"Failed to create EntrySpan."
,
throwable
);
}
finally
{
context
=
null
;
}
}
}
return
field
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录