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

Fix missing language field. (#2174)

This commit is contained in:
吴晟 Wu Sheng 2019-01-18 08:00:51 +08:00 committed by GitHub
parent 9cda28f054
commit 18ed80bd95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
View File

@ -197,6 +197,8 @@ public class MetadataQueryEsDAO extends EsDAO implements IMetadataQueryDAO {
JsonObject properties = GSON.fromJson(propertiesString, JsonObject.class);
if (properties.has(LANGUAGE)) {
serviceInstance.setLanguage(LanguageTrans.INSTANCE.value(properties.get(LANGUAGE).getAsString()));
} else {
serviceInstance.setLanguage(Language.UNKNOWN);
}
if (properties.has(OS_NAME)) {

2
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
View File

@ -222,6 +222,8 @@ public class H2MetadataQueryDAO implements IMetadataQueryDAO {
JsonObject properties = GSON.fromJson(propertiesString, JsonObject.class);
if (properties.has(LANGUAGE)) {
serviceInstance.setLanguage(LanguageTrans.INSTANCE.value(properties.get(LANGUAGE).getAsString()));
} else {
serviceInstance.setLanguage(Language.UNKNOWN);
}
if (properties.has(OS_NAME)) {