You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2019/01/19 01:40:36 UTC
[incubator-skywalking] branch GA-release updated: fix no language
attr value in mesh
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch GA-release
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/GA-release by this push:
new eb3a583 fix no language attr value in mesh
eb3a583 is described below
commit eb3a583a6d15661f0bc02dc374ea2c6c0436c787
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Sat Jan 19 09:32:48 2019 +0800
fix no language attr value in mesh
---
.../server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java | 2 ++
.../oap/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 aa4bb8c..e80d616 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 e7a1c2a..b5e12cd 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);