From 028429345838b277a7b1be3c05d4cb1db2f9b194 Mon Sep 17 00:00:00 2001 From: ZhHong <371816216@qq.com> Date: Thu, 13 Dec 2018 23:58:02 +0800 Subject: [PATCH] /instance/register osName, hostName (#2042) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit osName and hostName values are reversed。 --- .../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 e000a33851..d21b6f4ac6 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(); -- GitLab