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

Add process No in register info.

This commit is contained in:
wusheng 2017-07-27 22:58:15 +08:00
parent 45cbf8b5c4
commit eca20c9158
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apm-network/src/main/proto/DiscoveryService.proto
View File

@ -45,7 +45,8 @@ message ApplicationInstanceHeartbeat {
message OSInfo {
string osName = 1;
string hostname = 2;
repeated string ipv4s = 3;
int32 processNo = 3;
repeated string ipv4s = 4;
}
//discovery service for ServiceName by Network address or application code

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

@ -1,5 +1,6 @@
package org.skywalking.apm.agent.core.os;
import java.lang.management.ManagementFactory;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
@ -17,6 +18,7 @@ public class OSUtil {
private static volatile String OS_NAME;
private static volatile String HOST_NAME;
private static volatile List<String> IPV4_LIST;
private static volatile int PROCESS_NO = 0;
public static String getOsName() {
if (OS_NAME == null) {
@ -63,6 +65,17 @@ public class OSUtil {
return IPV4_LIST;
}
public static int getProcessNo() {
if (PROCESS_NO == 0) {
try {
PROCESS_NO = Integer.parseInt(ManagementFactory.getRuntimeMXBean().getName().split("@")[0]);
} catch (Exception e) {
PROCESS_NO = -1;
}
}
return PROCESS_NO;
}
public static OSInfo buildOSInfo() {
OSInfo.Builder builder = OSInfo.newBuilder();
String osName = getOsName();
@ -77,6 +90,7 @@ public class OSUtil {
if (allIPV4.size() > 0) {
builder.addAllIpv4S(allIPV4);
}
builder.setProcessNo(getProcessNo());
return builder.build();
}
}