From de59bf7aebc20110c21c0e39e9b987e4aec91911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A8=81?=
 <51618159+LIU-WEI-git@users.noreply.github.com>
Date: Sun, 5 Sep 2021 13:56:00 +0800
Subject: [PATCH] Fix `H2MetadataQueryDAO.searchService` doesn't support auto
 grouping. [issue #7653] (#7654)

---
 CHANGES.md                                                       | 1 +
 .../server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 9838eb4a0b..f63527ff1d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -54,6 +54,7 @@ Release Notes.
 * Support mTLS for gRPC channel.
 * Add yaml file suffix limit when reading ui templates.
 * Support consul grouped dynamic configurations.
+* Fix `H2MetadataQueryDAO.searchService` doesn't support auto grouping.
 
 #### UI
 
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 87c2d91be5..9c25e6aa2f 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
@@ -163,6 +163,7 @@ public class H2MetadataQueryDAO implements IMetadataQueryDAO {
                     Service service = new Service();
                     service.setId(resultSet.getString(H2TableInstaller.ID_COLUMN));
                     service.setName(resultSet.getString(ServiceTraffic.NAME));
+                    service.setGroup(resultSet.getString(ServiceTraffic.GROUP));
                     return service;
                 }
             }