From c0ed7d88da1a911f3fbc6f9eda2312bdd02f59e8 Mon Sep 17 00:00:00 2001
From: w <52819067+weiqiang-w@users.noreply.github.com>
Date: Thu, 28 Jan 2021 17:41:17 +0800
Subject: [PATCH] Fix a legal metric query adoption bug. (#6270)

---
 CHANGES.md                                                       | 1 +
 .../skywalking/oap/query/graphql/resolver/MetricQuery.java       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 178fe2e06..770f742f3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -79,6 +79,7 @@ Release Notes.
 * Add the text analyzer for querying log in the es storage.
 * Chore:  Remove duplicate codes in Envoy ALS handler.
 * Remove the strict rule of OAL disable statement parameter.
+* Fix a legal metric query adoption bug. Don't support global level metric query.
 
 #### UI
 * Fix un-removed tags in trace query.
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java
index 109ac0693..618d28820 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java
@@ -58,6 +58,7 @@ public class MetricQuery implements GraphQLQueryResolver {
             condition.setEntity(new MockEntity(null));
 
             kv.setValue(query.readMetricsValue(condition, duration));
+            values.addKVInt(kv);
         } else {
             for (final String id : metrics.getIds()) {
                 KVInt kv = new KVInt();