Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
山不在高_有仙则灵
SkyWalking
提交
348ebd54
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,发现更多精彩内容 >>
提交
348ebd54
编写于
10月 13, 2017
作者:
G
gaohongtao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
A snapshot from the same thread would be properly 'continued' by ContextManager
上级
086c5ac0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
11 deletion
+4
-11
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextManager.java
...org/skywalking/apm/agent/core/context/ContextManager.java
+1
-1
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextSnapshot.java
...rg/skywalking/apm/agent/core/context/ContextSnapshot.java
+0
-4
apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/skywalking/apm/plugin/sjdbc/ExecuteEventListener.java
...org/skywalking/apm/plugin/sjdbc/ExecuteEventListener.java
+3
-6
未找到文件。
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextManager.java
浏览文件 @
348ebd54
...
...
@@ -153,7 +153,7 @@ public class ContextManager implements TracingContextListener, BootService, Igno
if
(
snapshot
==
null
)
{
throw
new
IllegalArgumentException
(
"ContextSnapshot can't be null."
);
}
if
(
snapshot
.
isValid
())
{
if
(
snapshot
.
isValid
()
&&
!
snapshot
.
getTraceSegmentId
().
equals
(
get
().
capture
().
getTraceSegmentId
())
)
{
get
().
continued
(
snapshot
);
}
}
...
...
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextSnapshot.java
浏览文件 @
348ebd54
...
...
@@ -113,8 +113,4 @@ public class ContextSnapshot {
public
int
getEntryApplicationInstanceId
()
{
return
entryApplicationInstanceId
;
}
public
boolean
fromCurrent
()
{
return
traceSegmentId
.
equals
(
ContextManager
.
capture
().
getTraceSegmentId
());
}
}
apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/src/main/java/org/skywalking/apm/plugin/sjdbc/ExecuteEventListener.java
浏览文件 @
348ebd54
...
...
@@ -23,9 +23,9 @@ import com.dangdang.ddframe.rdb.sharding.executor.event.DMLExecutionEvent;
import
com.dangdang.ddframe.rdb.sharding.executor.event.DQLExecutionEvent
;
import
com.dangdang.ddframe.rdb.sharding.executor.threadlocal.ExecutorDataMap
;
import
com.dangdang.ddframe.rdb.sharding.util.EventBusInstance
;
import
com.google.common.base.Joiner
;
import
com.google.common.eventbus.AllowConcurrentEvents
;
import
com.google.common.eventbus.Subscribe
;
import
java.util.stream.Collectors
;
import
org.skywalking.apm.agent.core.context.ContextManager
;
import
org.skywalking.apm.agent.core.context.ContextSnapshot
;
import
org.skywalking.apm.agent.core.context.tag.Tags
;
...
...
@@ -63,16 +63,13 @@ public class ExecuteEventListener {
case
BEFORE_EXECUTE:
AbstractSpan
span
=
ContextManager
.
createExitSpan
(
"/SJDBC/BRANCH/"
+
operation
,
event
.
getDataSource
());
if
(
ExecutorDataMap
.
getDataMap
().
containsKey
(
AsyncExecuteInterceptor
.
SNAPSHOT_DATA_KEY
))
{
ContextSnapshot
contextSnapshot
=
(
ContextSnapshot
)
ExecutorDataMap
.
getDataMap
().
get
(
AsyncExecuteInterceptor
.
SNAPSHOT_DATA_KEY
);
if
(!
contextSnapshot
.
fromCurrent
())
{
ContextManager
.
continued
(
contextSnapshot
);
}
ContextManager
.
continued
((
ContextSnapshot
)
ExecutorDataMap
.
getDataMap
().
get
(
AsyncExecuteInterceptor
.
SNAPSHOT_DATA_KEY
));
}
Tags
.
DB_TYPE
.
set
(
span
,
"sql"
);
Tags
.
DB_INSTANCE
.
set
(
span
,
event
.
getDataSource
());
Tags
.
DB_STATEMENT
.
set
(
span
,
event
.
getSql
());
if
(!
event
.
getParameters
().
isEmpty
())
{
Tags
.
DB_BIND_VARIABLES
.
set
(
span
,
event
.
getParameters
().
stream
().
map
(
Object:
:
toString
).
collect
(
Collectors
.
joining
(
","
)));
Tags
.
DB_BIND_VARIABLES
.
set
(
span
,
Joiner
.
on
(
","
).
join
(
event
.
getParameters
(
)));
}
span
.
setComponent
(
ComponentsDefine
.
SHARDING_JDBC
);
SpanLayer
.
asDB
(
span
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录