Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
91b94cfc
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,发现更多精彩内容 >>
未验证
提交
91b94cfc
编写于
5月 16, 2022
作者:
静夜思朝颜
提交者:
GitHub
5月 16, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Adapt the process procotol update (#9069)
上级
6b7d6038
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
15 deletion
+29
-15
apm-protocol/apm-network/src/main/proto
apm-protocol/apm-network/src/main/proto
+1
-1
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/process/ProcessTraffic.java
...p/server/core/analysis/manual/process/ProcessTraffic.java
+8
-1
oap-server/server-receiver-plugin/skywalking-ebpf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/ebpf/provider/handler/EBPFProcessServiceHandler.java
...iver/ebpf/provider/handler/EBPFProcessServiceHandler.java
+19
-12
test/e2e-v2/script/env
test/e2e-v2/script/env
+1
-1
未找到文件。
proto
@
f1b62de2
比较
ad4a02c6
...
f1b62de2
Subproject commit
ad4a02c6c035da5182034a53b5fe6998bd52cb9f
Subproject commit
f1b62de294f7f46f3334900417ffb349f19a479c
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/process/ProcessTraffic.java
浏览文件 @
91b94cfc
...
...
@@ -19,6 +19,7 @@
package
org.apache.skywalking.oap.server.core.analysis.manual.process
;
import
com.google.gson.Gson
;
import
com.google.gson.JsonElement
;
import
com.google.gson.JsonObject
;
import
lombok.EqualsAndHashCode
;
import
lombok.Getter
;
...
...
@@ -36,6 +37,8 @@ import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
import
org.apache.skywalking.oap.server.core.storage.type.StorageBuilder
;
import
org.apache.skywalking.oap.server.library.util.StringUtil
;
import
java.util.Map
;
import
static
org
.
apache
.
skywalking
.
oap
.
server
.
core
.
source
.
DefaultScopeDefine
.
PROCESS
;
@Stream
(
name
=
ProcessTraffic
.
INDEX_NAME
,
scopeId
=
PROCESS
,
...
...
@@ -118,8 +121,12 @@ public class ProcessTraffic extends Metrics {
if
(
StringUtil
.
isNotBlank
(
processTraffic
.
getAgentId
()))
{
this
.
agentId
=
processTraffic
.
getAgentId
();
}
if
(
processTraffic
.
getProperties
()
!=
null
&&
processTraffic
.
getProperties
().
size
()
>
0
)
{
if
(
this
.
properties
==
null
)
{
this
.
properties
=
processTraffic
.
getProperties
();
}
else
if
(
processTraffic
.
getProperties
()
!=
null
)
{
for
(
Map
.
Entry
<
String
,
JsonElement
>
e
:
processTraffic
.
getProperties
().
entrySet
())
{
this
.
properties
.
add
(
e
.
getKey
(),
e
.
getValue
());
}
}
if
(
processTraffic
.
getDetectType
()
>
0
)
{
this
.
detectType
=
processTraffic
.
getDetectType
();
...
...
oap-server/server-receiver-plugin/skywalking-ebpf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/ebpf/provider/handler/EBPFProcessServiceHandler.java
浏览文件 @
91b94cfc
...
...
@@ -35,7 +35,6 @@ import org.apache.skywalking.apm.network.ebpf.profiling.process.v3.EBPFProcessPr
import
org.apache.skywalking.apm.network.ebpf.profiling.process.v3.EBPFProcessReportList
;
import
org.apache.skywalking.apm.network.ebpf.profiling.process.v3.EBPFProcessServiceGrpc
;
import
org.apache.skywalking.apm.network.ebpf.profiling.process.v3.EBPFReportProcessDownstream
;
import
org.apache.skywalking.oap.server.core.Const
;
import
org.apache.skywalking.oap.server.core.CoreModule
;
import
org.apache.skywalking.oap.server.core.analysis.DownSampling
;
import
org.apache.skywalking.oap.server.core.analysis.IDManager
;
...
...
@@ -103,6 +102,7 @@ public class EBPFProcessServiceHandler extends EBPFProcessServiceGrpc.EBPFProces
@Override
public
void
keepAlive
(
EBPFProcessPingPkgList
request
,
StreamObserver
<
Commands
>
responseObserver
)
{
final
long
timeBucket
=
TimeBucket
.
getTimeBucket
(
System
.
currentTimeMillis
(),
DownSampling
.
Minute
);
final
String
agentID
=
request
.
getEbpfAgentID
();
request
.
getProcessesList
().
forEach
(
p
->
{
final
EBPFProcessEntityMetadata
entity
=
p
.
getEntityMetadata
();
...
...
@@ -117,8 +117,10 @@ public class EBPFProcessServiceHandler extends EBPFProcessServiceGrpc.EBPFProces
processUpdate
.
setServiceNormal
(
true
);
processUpdate
.
setName
(
entity
.
getProcessName
());
processUpdate
.
setLabels
(
entity
.
getLabelsList
());
processUpdate
.
setProperties
(
convertProperties
(
p
.
getPropertiesList
()));
processUpdate
.
setProfilingSupportStatus
(
getProfilingSupportStatus
(
p
.
getPropertiesList
()));
processUpdate
.
setTimeBucket
(
timeBucket
);
processUpdate
.
setAgentId
(
Const
.
EMPTY_STRING
);
processUpdate
.
setAgentId
(
agentID
);
sourceReceiver
.
receive
(
processUpdate
);
// instance
...
...
@@ -155,11 +157,7 @@ public class EBPFProcessServiceHandler extends EBPFProcessServiceGrpc.EBPFProces
// metadata
process
.
setDetectType
(
ProcessDetectType
.
VM
);
process
.
setAgentId
(
agentId
);
final
JsonObject
properties
=
new
JsonObject
();
for
(
KeyStringValuePair
kv
:
hostProcess
.
getPropertiesList
())
{
properties
.
addProperty
(
kv
.
getKey
(),
kv
.
getValue
());
}
process
.
setProperties
(
properties
);
process
.
setProperties
(
convertProperties
(
hostProcess
.
getPropertiesList
()));
process
.
setLabels
(
hostProcess
.
getEntity
().
getLabelsList
());
process
.
setProfilingSupportStatus
(
getProfilingSupportStatus
(
hostProcess
.
getPropertiesList
()));
...
...
@@ -173,6 +171,7 @@ public class EBPFProcessServiceHandler extends EBPFProcessServiceGrpc.EBPFProces
.
setProcessId
(
processId
)
.
setHostProcess
(
EBPFHostProcessDownstream
.
newBuilder
()
.
setPid
(
hostProcess
.
getPid
())
.
setEntityMetadata
(
hostProcess
.
getEntity
())
.
build
())
.
build
();
return
Tuple
.
of
(
process
,
downstream
);
...
...
@@ -190,11 +189,7 @@ public class EBPFProcessServiceHandler extends EBPFProcessServiceGrpc.EBPFProces
// metadata
process
.
setDetectType
(
ProcessDetectType
.
KUBERNETES
);
process
.
setAgentId
(
agentId
);
final
JsonObject
properties
=
new
JsonObject
();
for
(
KeyStringValuePair
kv
:
kubernetesProcessMetadata
.
getPropertiesList
())
{
properties
.
addProperty
(
kv
.
getKey
(),
kv
.
getValue
());
}
process
.
setProperties
(
properties
);
process
.
setProperties
(
convertProperties
(
kubernetesProcessMetadata
.
getPropertiesList
()));
process
.
setLabels
(
kubernetesProcessMetadata
.
getEntity
().
getLabelsList
());
process
.
setProfilingSupportStatus
(
getProfilingSupportStatus
(
kubernetesProcessMetadata
.
getPropertiesList
()));
...
...
@@ -208,6 +203,7 @@ public class EBPFProcessServiceHandler extends EBPFProcessServiceGrpc.EBPFProces
.
setProcessId
(
processId
)
.
setK8SProcess
(
EBPFKubernetesProcessDownstream
.
newBuilder
()
.
setPid
(
kubernetesProcessMetadata
.
getPid
())
.
setEntityMetadata
(
kubernetesProcessMetadata
.
getEntity
())
.
build
())
.
build
();
return
Tuple
.
of
(
process
,
downstream
);
...
...
@@ -243,4 +239,15 @@ public class EBPFProcessServiceHandler extends EBPFProcessServiceGrpc.EBPFProces
}
return
ProfilingSupportStatus
.
NOT_SUPPORT
;
}
/**
* Convert process properties to source data
*/
private
JsonObject
convertProperties
(
List
<
KeyStringValuePair
>
properties
)
{
final
JsonObject
result
=
new
JsonObject
();
for
(
KeyStringValuePair
kv
:
properties
)
{
result
.
addProperty
(
kv
.
getKey
(),
kv
.
getValue
());
}
return
result
;
}
}
test/e2e-v2/script/env
浏览文件 @
91b94cfc
...
...
@@ -22,6 +22,6 @@ SW_AGENT_PYTHON_COMMIT=c76a6ec51a478ac91abb20ec8f22a99b8d4d6a58
SW_AGENT_CLIENT_JS_COMMIT=af0565a67d382b683c1dbd94c379b7080db61449
SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
SW_KUBERNETES_COMMIT_SHA=0f3ec68e5a7e1608cec8688716b848ed15e971e5
SW_ROVER_COMMIT=
00b5150ec70197af13a9e5f1ffc203d433dc886b
SW_ROVER_COMMIT=
90c93c706743aac1f5853b677730edae8cc32a2c
SW_CTL_COMMIT=03dbdcf8cecc3abdef661efaa5734c01ac49adea
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录