Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
59d47250
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 大约 1 年
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
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 搜索 >>
未验证
提交
59d47250
编写于
3月 26, 2019
作者:
wu-sheng
提交者:
GitHub
3月 26, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix endpoint name rule package (#2405)
* Add more logs * no message * no message * Exclude test file.
上级
9a09e962
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
26 addition
and
3 deletion
+26
-3
apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java
...ava/org/apache/skywalking/apm/util/StringFormatGroup.java
+13
-0
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/EndpointNameFormater.java
...alking/aop/server/receiver/mesh/EndpointNameFormater.java
+5
-2
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
...ing/aop/server/receiver/mesh/TelemetryDataDispatcher.java
+7
-1
oap-server/server-starter/pom.xml
oap-server/server-starter/pom.xml
+1
-0
未找到文件。
apm-commons/apm-util/src/main/java/org/apache/skywalking/apm/util/StringFormatGroup.java
浏览文件 @
59d47250
...
...
@@ -63,6 +63,12 @@ public class StringFormatGroup {
return
new
FormatResult
(
false
,
string
);
}
@Override
public
String
toString
()
{
return
"StringFormatGroup{"
+
"rules="
+
rules
+
'}'
;
}
public
class
FormatResult
{
private
boolean
match
;
private
String
name
;
...
...
@@ -97,5 +103,12 @@ public class StringFormatGroup {
public
Pattern
getPattern
()
{
return
pattern
;
}
@Override
public
String
toString
()
{
return
"PatternRule{"
+
"name='"
+
name
+
'\''
+
", pattern="
+
pattern
+
'}'
;
}
}
}
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/EndpointNameFormater.java
浏览文件 @
59d47250
...
...
@@ -46,18 +46,21 @@ public class EndpointNameFormater {
}
if
(
stream
==
null
)
{
logger
.
info
(
"endpoint_naming_rules.properties not found. No endpoint nam
e
setup."
);
logger
.
info
(
"endpoint_naming_rules.properties not found. No endpoint nam
ing
setup."
);
}
else
{
properties
.
load
(
stream
);
properties
.
forEach
((
key
,
value
)
->
{
endpointRule
.
addRule
((
String
)
key
,
(
String
)
value
);
logger
.
debug
(
"endpoint naming rule of service {} found, name[{}] and rule[{}]"
,
service
,
key
,
value
);
});
}
}
catch
(
IOException
e
)
{
logger
.
info
(
"{}_endpoint_rules.properties not found. No endpoint nam
e
setup."
,
service
);
logger
.
info
(
"{}_endpoint_rules.properties not found. No endpoint nam
ing
setup."
,
service
);
}
ALL_RULES
.
put
(
service
,
endpointRule
);
logger
.
debug
(
"endpoint naming rules of service {} added. {}"
,
service
,
endpointRule
);
}
public
static
StringFormatGroup
.
FormatResult
format
(
String
service
,
String
endpointName
)
{
...
...
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
浏览文件 @
59d47250
...
...
@@ -63,10 +63,16 @@ public class TelemetryDataDispatcher {
public
static
void
preProcess
(
ServiceMeshMetric
data
)
{
String
service
=
data
.
getDestServiceId
()
==
Const
.
NONE
?
data
.
getDestServiceName
()
:
SERVICE_CACHE
.
get
(
data
.
getDestServiceId
()).
getName
();
StringFormatGroup
.
FormatResult
formatResult
=
EndpointNameFormater
.
format
(
service
,
data
.
getEndpoint
());
String
endpointName
=
data
.
getEndpoint
();
StringFormatGroup
.
FormatResult
formatResult
=
EndpointNameFormater
.
format
(
service
,
endpointName
);
if
(
formatResult
.
isMatch
())
{
data
=
data
.
toBuilder
().
setEndpoint
(
formatResult
.
getName
()).
build
();
}
if
(
logger
.
isDebugEnabled
())
{
if
(
formatResult
.
isMatch
())
{
logger
.
debug
(
"Endpoint {} is renamed to {}"
,
endpointName
,
data
.
getEndpoint
());
}
}
ServiceMeshMetricDataDecorator
decorator
=
new
ServiceMeshMetricDataDecorator
(
data
);
if
(
decorator
.
tryMetaDataRegister
())
{
...
...
oap-server/server-starter/pom.xml
浏览文件 @
59d47250
...
...
@@ -186,6 +186,7 @@
<exclude>
alarm-settings.yml
</exclude>
<exclude>
component-libraries.yml
</exclude>
<exclude>
datasource-settings.properties
</exclude>
<exclude>
endpoint_naming_rules.properties
</exclude>
</excludes>
</configuration>
</plugin>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录