From 334dd03429faac996b1b2bd3e6e6846c475dd921 Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Sat, 19 Jan 2019 10:48:54 +0800 Subject: [PATCH] fix no language attr value in mesh (#2182) --- .../storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java | 2 ++ .../server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java index aa4bb8cf5..e80d61689 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java @@ -216,6 +216,8 @@ public class MetadataQueryEsDAO extends EsDAO implements IMetadataQueryDAO { serviceInstance.getAttributes().add(new Attribute(ServiceInstanceInventory.PropertyUtil.IPV4S, ipv4)); } } + } else { + serviceInstance.setLanguage(Language.UNKNOWN); } serviceInstances.add(serviceInstance); diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java index e7a1c2a66..b5e12cdec 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java @@ -241,6 +241,8 @@ public class H2MetadataQueryDAO implements IMetadataQueryDAO { serviceInstance.getAttributes().add(new Attribute(ServiceInstanceInventory.PropertyUtil.IPV4S, ipv4)); } } + } else { + serviceInstance.setLanguage(Language.UNKNOWN); } serviceInstances.add(serviceInstance);