From 18ed80bd9530a534240846c40fdaa5fc2c0fae64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 18 Jan 2019 08:00:51 +0800 Subject: [PATCH] Fix missing language field. (#2174) --- .../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 80ff9a737d..aa4bb8cf51 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 @@ -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)) { 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 301887f0c4..e7a1c2a664 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 @@ -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)) { -- GitLab