From 03183a2e8d379c007eaaabf9c75903319c56978a Mon Sep 17 00:00:00 2001
From: mrproliu <741550557@qq.com>
Date: Thu, 18 Sep 2025 10:40:25 +0800
Subject: [PATCH] Bump up query protocol for trace

---
 dependencies.sh |  2 +-
 query/schema.go | 73 ++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/dependencies.sh b/dependencies.sh
index 863457b..161b3ac 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -18,7 +18,7 @@
 # under the License.
 
 export COLLECT_PROTOCOL_SHA=16c51358ebcf42629bf4ffdf952253971f20eb25
-export QUERY_PROTOCOL_SHA=23baed2234e4bbc18cd7ec7d47bfe7d4bc8ef363
+export QUERY_PROTOCOL_SHA=97f9bfc9dbf9313a951a5fa3791e92186cfede05
 export ENVOY_SERVICE_PROTOCOL_SHA=533b32f1b390a3a88ec2008d0561e07c926d879a
 export XDS_SERVICE_PROTOCOL_SHA=25de7278fc844d392d607214f36dbedf50f167ee
 export PROTOC_VALIDATE_SHA=v0.6.1
diff --git a/query/schema.go b/query/schema.go
index f95b498..a336825 100644
--- a/query/schema.go
+++ b/query/schema.go
@@ -383,6 +383,12 @@ type Endpoint struct {
 	Name string `json:"name"`
 }
 
+type EndpointCondition struct {
+	ServiceName  string  `json:"serviceName"`
+	EndpointName string  `json:"endpointName"`
+	Layer        *string `json:"layer,omitempty"`
+}
+
 type EndpointInfo struct {
 	ID          string `json:"id"`
 	Name        string `json:"name"`
@@ -494,6 +500,12 @@ type HierarchyServiceRelation struct {
 	LowerService *HierarchyRelatedService `json:"lowerService"`
 }
 
+type InstanceCondition struct {
+	ServiceName  string  `json:"serviceName"`
+	InstanceName string  `json:"instanceName"`
+	Layer        *string `json:"layer,omitempty"`
+}
+
 type InstanceHierarchy struct {
 	Relations []*HierarchyInstanceRelation `json:"relations"`
 }
@@ -560,6 +572,19 @@ type LogQueryCondition struct {
 	QueryOrder                 *Order               `json:"queryOrder,omitempty"`
 }
 
+type LogQueryConditionByName struct {
+	Service                    *ServiceCondition    `json:"service,omitempty"`
+	Instance                   *InstanceCondition   `json:"instance,omitempty"`
+	Endpoint                   *EndpointCondition   `json:"endpoint,omitempty"`
+	RelatedTrace               *TraceScopeCondition `json:"relatedTrace,omitempty"`
+	QueryDuration              *Duration            `json:"queryDuration,omitempty"`
+	Paging                     *Pagination          `json:"paging"`
+	Tags                       []*LogTag            `json:"tags,omitempty"`
+	KeywordsOfContent          []string             `json:"keywordsOfContent,omitempty"`
+	ExcludingKeywordsOfContent []string             `json:"excludingKeywordsOfContent,omitempty"`
+	QueryOrder                 *Order               `json:"queryOrder,omitempty"`
+}
+
 type LogTag struct {
 	Key   string  `json:"key"`
 	Value *string `json:"value,omitempty"`
@@ -843,10 +868,16 @@ type RecordCondition struct {
 }
 
 type RecordsTTL struct {
-	Value            int `json:"value"`
-	SuperDataset     int `json:"superDataset"`
-	ColdValue        int `json:"coldValue"`
-	ColdSuperDataset int `json:"coldSuperDataset"`
+	Normal              int `json:"normal"`
+	Trace               int `json:"trace"`
+	ZipkinTrace         int `json:"zipkinTrace"`
+	Log                 int `json:"log"`
+	BrowserErrorLog     int `json:"browserErrorLog"`
+	ColdNormal          int `json:"coldNormal"`
+	ColdTrace           int `json:"coldTrace"`
+	ColdZipkinTrace     int `json:"coldZipkinTrace"`
+	ColdLog             int `json:"coldLog"`
+	ColdBrowserErrorLog int `json:"coldBrowserErrorLog"`
 }
 
 type Ref struct {
@@ -856,6 +887,11 @@ type Ref struct {
 	Type            RefType `json:"type"`
 }
 
+type RetrievedTimeRange struct {
+	StartTime int64 `json:"startTime"`
+	EndTime   int64 `json:"endTime"`
+}
+
 type SegmentProfileAnalyzeQuery struct {
 	SegmentID string                   `json:"segmentId"`
 	TimeRange *ProfileAnalyzeTimeRange `json:"timeRange"`
@@ -877,6 +913,11 @@ type Service struct {
 	Normal    *bool    `json:"normal,omitempty"`
 }
 
+type ServiceCondition struct {
+	ServiceName string  `json:"serviceName"`
+	Layer       *string `json:"layer,omitempty"`
+}
+
 type ServiceHierarchy struct {
 	Relations []*HierarchyServiceRelation `json:"relations"`
 }
@@ -1011,6 +1052,12 @@ type TraceBrief struct {
 	DebuggingTrace *DebuggingTrace `json:"debuggingTrace,omitempty"`
 }
 
+type TraceList struct {
+	Traces             []*TraceV2          `json:"traces"`
+	RetrievedTimeRange *RetrievedTimeRange `json:"retrievedTimeRange"`
+	DebuggingTrace     *DebuggingTrace     `json:"debuggingTrace,omitempty"`
+}
+
 type TraceQueryCondition struct {
 	ServiceID         *string     `json:"serviceId,omitempty"`
 	ServiceInstanceID *string     `json:"serviceInstanceId,omitempty"`
@@ -1025,12 +1072,30 @@ type TraceQueryCondition struct {
 	Paging            *Pagination `json:"paging"`
 }
 
+type TraceQueryConditionByName struct {
+	Service          *ServiceCondition  `json:"service,omitempty"`
+	Instance         *InstanceCondition `json:"instance,omitempty"`
+	Endpoint         *EndpointCondition `json:"endpoint,omitempty"`
+	TraceID          *string            `json:"traceId,omitempty"`
+	QueryDuration    *Duration          `json:"queryDuration,omitempty"`
+	MinTraceDuration *int               `json:"minTraceDuration,omitempty"`
+	MaxTraceDuration *int               `json:"maxTraceDuration,omitempty"`
+	TraceState       TraceState         `json:"traceState"`
+	QueryOrder       QueryOrder         `json:"queryOrder"`
+	Tags             []*SpanTag         `json:"tags,omitempty"`
+	Paging           *Pagination        `json:"paging"`
+}
+
 type TraceScopeCondition struct {
 	TraceID   string  `json:"traceId"`
 	SegmentID *string `json:"segmentId,omitempty"`
 	SpanID    *int    `json:"spanId,omitempty"`
 }
 
+type TraceV2 struct {
+	Spans []*Span `json:"spans"`
+}
+
 type AsyncProfilerEventType string
 
 const (