Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
润土的好友猹
SkyWalking
提交
42d79bf0
S
SkyWalking
项目概览
润土的好友猹
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
9
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
未验证
提交
42d79bf0
编写于
5月 25, 2020
作者:
J
Jared Tan
提交者:
GitHub
5月 25, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix too many mang ipv4 records reported by the agent when deployed in container. (#4817)
上级
edd8305f
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
17 addition
and
4 deletion
+17
-4
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
...ava/org/apache/skywalking/apm/agent/core/conf/Config.java
+8
-0
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/OSUtil.java
.../java/org/apache/skywalking/apm/agent/core/os/OSUtil.java
+6
-3
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceManagementClient.java
...alking/apm/agent/core/remote/ServiceManagementClient.java
+2
-1
docs/en/setup/service-agent/java-agent/README.md
docs/en/setup/service-agent/java-agent/README.md
+1
-0
未找到文件。
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
浏览文件 @
42d79bf0
...
...
@@ -109,6 +109,14 @@ public class Config {
* Keep tracing even the backend is not available.
*/
public
static
boolean
KEEP_TRACING
=
false
;
}
public
static
class
OsInfo
{
/**
* Limit the length of the ipv4 list size.
*/
public
static
int
IPV4_LIST_SIZE
=
10
;
}
public
static
class
Collector
{
...
...
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/OSUtil.java
浏览文件 @
42d79bf0
...
...
@@ -57,7 +57,7 @@ public class OSUtil {
public
static
List
<
String
>
getAllIPV4
()
{
if
(
IPV4_LIST
==
null
)
{
IPV4_LIST
=
new
LinkedList
<
String
>();
IPV4_LIST
=
new
LinkedList
<>();
try
{
Enumeration
<
NetworkInterface
>
interfs
=
NetworkInterface
.
getNetworkInterfaces
();
while
(
interfs
.
hasMoreElements
())
{
...
...
@@ -103,8 +103,8 @@ public class OSUtil {
return
PROCESS_NO
;
}
public
static
List
<
KeyStringValuePair
>
buildOSInfo
()
{
List
<
KeyStringValuePair
>
osInfo
=
new
ArrayList
<
KeyStringValuePair
>();
public
static
List
<
KeyStringValuePair
>
buildOSInfo
(
int
ipv4Size
)
{
List
<
KeyStringValuePair
>
osInfo
=
new
ArrayList
<>();
String
osName
=
getOsName
();
if
(
osName
!=
null
)
{
...
...
@@ -116,6 +116,9 @@ public class OSUtil {
}
List
<
String
>
allIPV4
=
getAllIPV4
();
if
(
allIPV4
.
size
()
>
0
)
{
if
(
allIPV4
.
size
()
>
ipv4Size
)
{
allIPV4
=
allIPV4
.
subList
(
0
,
ipv4Size
);
}
for
(
String
ipv4
:
allIPV4
)
{
osInfo
.
add
(
KeyStringValuePair
.
newBuilder
().
setKey
(
"ipv4"
).
setValue
(
ipv4
).
build
());
}
...
...
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceManagementClient.java
浏览文件 @
42d79bf0
...
...
@@ -119,7 +119,8 @@ public class ServiceManagementClient implements BootService, Runnable, GRPCChann
.
reportInstanceProperties
(
InstanceProperties
.
newBuilder
()
.
setService
(
Config
.
Agent
.
SERVICE_NAME
)
.
setServiceInstance
(
Config
.
Agent
.
INSTANCE_NAME
)
.
addAllProperties
(
OSUtil
.
buildOSInfo
())
.
addAllProperties
(
OSUtil
.
buildOSInfo
(
Config
.
OsInfo
.
IPV4_LIST_SIZE
))
.
addAllProperties
(
SERVICE_INSTANCE_PROPERTIES
)
.
build
());
instancePropertiesSubmitted
=
true
;
...
...
docs/en/setup/service-agent/java-agent/README.md
浏览文件 @
42d79bf0
...
...
@@ -84,6 +84,7 @@ property key | Description | Default |
`agent.force_reconnection_period `
|Force reconnection period of grpc, based on grpc_channel_check_interval.|
`1`
|
`agent.operation_name_threshold `
|The operationName max length, setting this value > 190 is not recommended.|
`150`
|
`agent.keep_tracing`
|Keep tracing even the backend is not available if this value is
`true`
.|
`false`
|
`osinfo.ipv4_list_size`
| Limit the length of the ipv4 list size. |
`10`
|
`collector.grpc_channel_check_interval`
|grpc channel status check interval.|
`30`
|
`collector.heartbeat_period`
|agent heartbeat report period. Unit, second.|
`30`
|
`collector.backend_service`
|Collector SkyWalking trace receiver service addresses.|
`127.0.0.1:11800`
|
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录