Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
8a322e85
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 搜索 >>
未验证
提交
8a322e85
编写于
12月 23, 2021
作者:
wu-sheng
提交者:
GitHub
12月 23, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix `Can't split endpoint id into 2 parts` bug for endpoint ID in the mesh's TCP case. (#8327)
上级
e74adec0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
3 deletion
+8
-3
CHANGES.md
CHANGES.md
+4
-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
+4
-1
未找到文件。
CHANGES.md
浏览文件 @
8a322e85
...
...
@@ -7,8 +7,8 @@ Release Notes.
#### Project
*
Upgrade log4j2 to 2.17.0 for CVE-2021-44228, CVE-2021-45046 and CVE-2021-45105. This CVE only effects on JDK if JNDI
is opened in
default. Notice, using JVM option
`-Dlog4j2.formatMsgNoLookups=true`
or setting
*
Upgrade log4j2 to 2.17.0 for CVE-2021-44228, CVE-2021-45046 and CVE-2021-45105. This CVE only effects on JDK if JNDI
is opened in
default. Notice, using JVM option
`-Dlog4j2.formatMsgNoLookups=true`
or setting
the
`LOG4J_FORMAT_MSG_NO_LOOKUPS=”true”`
environment variable also avoids CVEs.
*
Upgrade maven-wrapper to 3.1.0, maven to 3.8.4 for performance improvements and ARM more native support.
...
...
@@ -18,6 +18,8 @@ Release Notes.
*
Bump up Armeria version to fix CVE.
*
Polish ETCD cluster config environment variables.
*
Add the analysis of metrics in Satellite MetricsService.
*
Fix
`Can't split endpoint id into 2 parts`
bug for endpoint ID. In the TCP in service mesh observability, endpoint
name doesn't exist in TCP traffic.
#### UI
...
...
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
浏览文件 @
8a322e85
...
...
@@ -21,7 +21,6 @@ package org.apache.skywalking.aop.server.receiver.mesh;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.skywalking.apm.network.servicemesh.v3.Protocol
;
import
org.apache.skywalking.apm.network.servicemesh.v3.ServiceMeshMetric
;
import
org.apache.skywalking.oap.server.library.util.StringUtil
;
import
org.apache.skywalking.oap.server.core.Const
;
import
org.apache.skywalking.oap.server.core.CoreModule
;
import
org.apache.skywalking.oap.server.core.analysis.NodeType
;
...
...
@@ -37,6 +36,7 @@ import org.apache.skywalking.oap.server.core.source.ServiceInstanceRelation;
import
org.apache.skywalking.oap.server.core.source.ServiceRelation
;
import
org.apache.skywalking.oap.server.core.source.SourceReceiver
;
import
org.apache.skywalking.oap.server.library.module.ModuleManager
;
import
org.apache.skywalking.oap.server.library.util.StringUtil
;
import
org.apache.skywalking.oap.server.telemetry.TelemetryModule
;
import
org.apache.skywalking.oap.server.telemetry.api.CounterMetrics
;
import
org.apache.skywalking.oap.server.telemetry.api.HistogramMetrics
;
...
...
@@ -226,6 +226,9 @@ public class TelemetryDataDispatcher {
}
private
static
void
toEndpoint
(
ServiceMeshMetric
.
Builder
metrics
,
long
minuteTimeBucket
)
{
if
(
StringUtil
.
isEmpty
(
metrics
.
getEndpoint
()))
{
return
;
}
Endpoint
endpoint
=
new
Endpoint
();
endpoint
.
setTimeBucket
(
minuteTimeBucket
);
endpoint
.
setName
(
metrics
.
getEndpoint
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录