You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/12/13 15:58:09 UTC
[incubator-skywalking] branch master updated: /instance/register
osName, hostName (#2042)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 0284293 /instance/register osName, hostName (#2042)
0284293 is described below
commit 028429345838b277a7b1be3c05d4cb1db2f9b194
Author: ZhHong <37...@qq.com>
AuthorDate: Thu Dec 13 23:58:02 2018 +0800
/instance/register osName, hostName (#2042)
osName and hostName values are reversed。
---
.../provider/handler/v5/rest/InstanceDiscoveryServletHandler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/rest/InstanceDiscoveryServletHandler.java b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/rest/InstanceDiscoveryServletHandler.java
index e000a33..d21b6f4 100644
--- a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/rest/InstanceDiscoveryServletHandler.java
+++ b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/rest/InstanceDiscoveryServletHandler.java
@@ -70,8 +70,8 @@ public class InstanceDiscoveryServletHandler extends JettyJsonHandler {
JsonObject osInfoJson = instance.get(OS_INFO).getAsJsonObject();
ServiceInstanceInventory.AgentOsInfo agentOsInfo = new ServiceInstanceInventory.AgentOsInfo();
- agentOsInfo.setHostname(osInfoJson.get("osName").getAsString());
- agentOsInfo.setOsName(osInfoJson.get("hostName").getAsString());
+ agentOsInfo.setHostname(osInfoJson.get("hostName").getAsString());
+ agentOsInfo.setOsName(osInfoJson.get("osName").getAsString());
agentOsInfo.setProcessNo(osInfoJson.get("processId").getAsInt());
JsonArray ipv4s = osInfoJson.get("ipv4s").getAsJsonArray();