From 4545e431f040939b244e95bf11f4a45017647783 Mon Sep 17 00:00:00 2001
From: wu-sheng <wu.sheng@foxmail.com>
Date: Tue, 26 Dec 2017 15:28:34 +0800
Subject: [PATCH] Add query arguments.

---
 .../ui-graphql/overview-layer.graphqls        | 11 +++-----
 .../main/resources/ui-graphql/trace.graphqls  | 27 ++++++++++++++++---
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/overview-layer.graphqls b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/overview-layer.graphqls
index 6b55b323a..8179ce5ad 100644
--- a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/overview-layer.graphqls
+++ b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/overview-layer.graphqls
@@ -3,7 +3,6 @@
 type ApplicationTopology {
   nodes: [Node]!
   calls: [Call]
-  duration: Duration!
 }
 
 # The base Node of all node types in topology
@@ -70,20 +69,17 @@ type ClusterBrief {
   numOfDatabase: Int
   numOfCache: Int
   numOfMQ: Int
-  duration: Duration!
 }
 
 # Query the trend of alarm rate based on the given duration
 type AlarmTrend {
   numOfAlarmRate: [Int]!
-  duration: Duration!
 }
 
 # Query all conjectural applications based on the given duration
 # All applications here are not installed agent.
 type ConjecturalAppBrief {
   apps: [ConjecturalApp!]
-  duration: Duration!
 }
 
 # The basic info of the conjectural application,
@@ -96,7 +92,8 @@ type ConjecturalApp {
 }
 
 extend type Query {
-  getApplicationTopology: ApplicationTopology
-  getClusterBrief: ClusterBrief
-  getAlarmTrend: AlarmTrend
+  getApplicationTopology(duration: Duration!): ApplicationTopology
+  getClusterBrief(duration: Duration!): ClusterBrief
+  getAlarmTrend(duration: Duration!): AlarmTrend
+  getConjecturalApps(duration: Duration!): ConjecturalAppBrief
 }
diff --git a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls
index 950560646..75b8b2003 100644
--- a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls
+++ b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls
@@ -1,16 +1,37 @@
+# The list of traces
 type TraceBrief {
   traces: [BasicTrace!]
-  duration: Duration!
-
 }
 
+# Trace basic info
 type BasicTrace {
    operationName: String!
    duration: Int!
    start: String!
+   isError: Boolean
+   traceId: String
 }
 
+# Represent the conditions used for query TraceBrief
+type TraceQueryCondition {
+  applicationCodes: [String!]
+  traceId: String
+  operationName: String
+  # The time range of traces started
+  queryDuration: Duration
+  # The mix time of trace
+  minTraceDuration: Int
+  # The max time of trace
+  maxTraceDuration: Int
+  topN: Boolean
+  needTotal: Int
+}
+
+enum QueryOrder {
+  BY_START_TIME
+  BY_DURATION
+}
 
 extend type Query {
-   queryBasicTraces: TraceBrief
+   queryBasicTraces(condition: TraceQueryCondition): TraceBrief
 }
\ No newline at end of file