Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
山不在高_有仙则灵
SkyWalking
提交
9529a75b
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,发现更多精彩内容 >>
未验证
提交
9529a75b
编写于
3月 09, 2018
作者:
彭
彭勇升 pengys
提交者:
GitHub
3月 09, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed/920 (#921)
* Fixed #920 * Sync sub module.
上级
3bde71ce
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
10 deletion
+14
-10
apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
...provider/parser/standardization/ReferenceIdExchanger.java
+8
-6
apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
...rser/provider/parser/standardization/SpanIdExchanger.java
+4
-3
apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/Const.java
.../org/apache/skywalking/apm/collector/core/util/Const.java
+1
-0
skywalking-ui
skywalking-ui
+1
-1
未找到文件。
apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
浏览文件 @
9529a75b
...
...
@@ -57,13 +57,14 @@ public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
}
@Override
public
boolean
exchange
(
ReferenceDecorator
standardBuilder
,
int
applicationId
)
{
if
(
standardBuilder
.
getEntryServiceId
()
==
0
&&
StringUtils
.
isNotEmpty
(
standardBuilder
.
getEntryServiceName
()))
{
int
entryServiceId
=
serviceNameService
.
getOrCreate
(
instanceCacheService
.
getApplicationId
(
standardBuilder
.
getEntryApplicationInstanceId
()),
SpanType
.
Entry_VALUE
,
standardBuilder
.
getEntryServiceName
());
if
(
standardBuilder
.
getEntryServiceId
()
==
0
)
{
String
entryServiceName
=
StringUtils
.
isNotEmpty
(
standardBuilder
.
getEntryServiceName
())
?
standardBuilder
.
getEntryServiceName
()
:
Const
.
DOMAIN_OPERATION_NAME
;
int
entryServiceId
=
serviceNameService
.
getOrCreate
(
instanceCacheService
.
getApplicationId
(
standardBuilder
.
getEntryApplicationInstanceId
()),
SpanType
.
Entry_VALUE
,
entryServiceName
);
if
(
entryServiceId
==
0
)
{
if
(
logger
.
isDebugEnabled
())
{
int
entryApplicationId
=
instanceCacheService
.
getApplicationId
(
standardBuilder
.
getEntryApplicationInstanceId
());
logger
.
debug
(
"entry service name: {} from application id: {} exchange failed"
,
standardBuilder
.
getEntryServiceName
()
,
entryApplicationId
);
logger
.
debug
(
"entry service name: {} from application id: {} exchange failed"
,
entryServiceName
,
entryApplicationId
);
}
return
false
;
}
else
{
...
...
@@ -73,13 +74,14 @@ public class ReferenceIdExchanger implements IdExchanger<ReferenceDecorator> {
}
}
if
(
standardBuilder
.
getParentServiceId
()
==
0
&&
StringUtils
.
isNotEmpty
(
standardBuilder
.
getParentServiceName
()))
{
int
parentServiceId
=
serviceNameService
.
getOrCreate
(
instanceCacheService
.
getApplicationId
(
standardBuilder
.
getParentApplicationInstanceId
()),
SpanType
.
Entry_VALUE
,
standardBuilder
.
getParentServiceName
());
if
(
standardBuilder
.
getParentServiceId
()
==
0
)
{
String
parentServiceName
=
StringUtils
.
isNotEmpty
(
standardBuilder
.
getParentServiceName
())
?
standardBuilder
.
getParentServiceName
()
:
Const
.
DOMAIN_OPERATION_NAME
;
int
parentServiceId
=
serviceNameService
.
getOrCreate
(
instanceCacheService
.
getApplicationId
(
standardBuilder
.
getParentApplicationInstanceId
()),
SpanType
.
Entry_VALUE
,
parentServiceName
);
if
(
parentServiceId
==
0
)
{
if
(
logger
.
isDebugEnabled
())
{
int
parentApplicationId
=
instanceCacheService
.
getApplicationId
(
standardBuilder
.
getParentApplicationInstanceId
());
logger
.
debug
(
"parent service name: {} from application id: {} exchange failed"
,
standardBuilder
.
getParentServiceName
()
,
parentApplicationId
);
logger
.
debug
(
"parent service name: {} from application id: {} exchange failed"
,
parentServiceName
,
parentApplicationId
);
}
return
false
;
}
else
{
...
...
apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
浏览文件 @
9529a75b
...
...
@@ -70,11 +70,12 @@ public class SpanIdExchanger implements IdExchanger<SpanDecorator> {
}
}
if
(
standardBuilder
.
getOperationNameId
()
==
0
&&
StringUtils
.
isNotEmpty
(
standardBuilder
.
getOperationName
()))
{
int
operationNameId
=
serviceNameService
.
getOrCreate
(
applicationId
,
standardBuilder
.
getSpanTypeValue
(),
standardBuilder
.
getOperationName
());
if
(
standardBuilder
.
getOperationNameId
()
==
0
)
{
String
operationName
=
StringUtils
.
isNotEmpty
(
standardBuilder
.
getOperationName
())
?
standardBuilder
.
getOperationName
()
:
Const
.
DOMAIN_OPERATION_NAME
;
int
operationNameId
=
serviceNameService
.
getOrCreate
(
applicationId
,
standardBuilder
.
getSpanTypeValue
(),
operationName
);
if
(
operationNameId
==
0
)
{
logger
.
debug
(
"service name: {} from application id: {} exchange failed"
,
standardBuilder
.
getOperationName
()
,
applicationId
);
logger
.
debug
(
"service name: {} from application id: {} exchange failed"
,
operationName
,
applicationId
);
return
false
;
}
else
{
standardBuilder
.
toBuilder
();
...
...
apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/Const.java
浏览文件 @
9529a75b
...
...
@@ -35,4 +35,5 @@ public class Const {
public
static
final
String
EMPTY_STRING
=
""
;
public
static
final
String
FILE_SUFFIX
=
"sw"
;
public
static
final
int
SPAN_TYPE_VIRTUAL
=
9
;
public
static
final
String
DOMAIN_OPERATION_NAME
=
"{domain}"
;
}
skywalking-ui
@
9c503a29
比较
839e3986
...
9c503a29
Subproject commit
839e39861b12d0cd4ce11672ede459fe4dbb00c4
Subproject commit
9c503a299aa3cba211e851e507d5625cc7cc0dd5
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录