kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix too many mang ipv4 records reported by the agent when deployed in container. (#4817)

This commit is contained in:
Jared Tan 2020-05-25 16:15:10 +08:00 committed by GitHub
parent edd8305fa2
commit 42d79bf08d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/Config.java
View File

@ -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 {

9
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/os/OSUtil.java
View File

@ -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());
}

3
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceManagementClient.java
View File

@ -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;

1
docs/en/setup/service-agent/java-agent/README.md
View File

@ -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`|