Synchronized the query protocol for the eBPF network profiling (#44)
diff --git a/dependencies.sh b/dependencies.sh
index 4bd3ab1..ab81697 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -18,7 +18,7 @@
# under the License.
export COLLECT_PROTOCOL_SHA=e89af18cc7be7dc04ec4a7c4ff75f0ae19fa929b
-export QUERY_PROTOCOL_SHA=3adb9f68649b1a03fa3fa664192ff4bd7523f18b
+export QUERY_PROTOCOL_SHA=aba0de18fc934f6a20fd075ffe1a3df01ad1c80f
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 0f6d95a..516a901 100644
--- a/query/schema.go
+++ b/query/schema.go
@@ -113,6 +113,11 @@
Step Step `json:"step"`
}
+type EBPFNetworkKeepProfilingResult struct {
+ Status bool `json:"status"`
+ ErrorReason *string `json:"errorReason"`
+}
+
type EBPFProfilingAnalyzation struct {
Tip *string `json:"tip"`
Trees []*EBPFProfilingTree `json:"trees"`
@@ -123,6 +128,10 @@
End int64 `json:"end"`
}
+type EBPFProfilingNetworkTaskRequest struct {
+ InstanceID string `json:"instanceId"`
+}
+
type EBPFProfilingSchedule struct {
ScheduleID string `json:"scheduleId"`
TaskID string `json:"taskId"`
@@ -143,6 +152,8 @@
TaskID string `json:"taskId"`
ServiceID string `json:"serviceId"`
ServiceName string `json:"serviceName"`
+ ServiceInstanceID *string `json:"serviceInstanceId"`
+ ServiceInstanceName *string `json:"serviceInstanceName"`
ProcessLabels []string `json:"processLabels"`
TaskStartTime int64 `json:"taskStartTime"`
TriggerType EBPFProfilingTriggerType `json:"triggerType"`
@@ -206,10 +217,12 @@
Normal *bool `json:"normal"`
ServiceInstanceName *string `json:"serviceInstanceName"`
EndpointName *string `json:"endpointName"`
+ ProcessName *string `json:"processName"`
DestServiceName *string `json:"destServiceName"`
DestNormal *bool `json:"destNormal"`
DestServiceInstanceName *string `json:"destServiceInstanceName"`
DestEndpointName *string `json:"destEndpointName"`
+ DestProcessName *string `json:"destProcessName"`
}
type Event struct {
@@ -323,7 +336,8 @@
}
type Logs struct {
- Logs []*Log `json:"logs"`
+ ErrorReason *string `json:"errorReason"`
+ Logs []*Log `json:"logs"`
}
type MetricCondition struct {
@@ -358,11 +372,28 @@
IsReal bool `json:"isReal"`
}
+type OndemandContainergQueryCondition struct {
+ ServiceInstanceID *string `json:"serviceInstanceId"`
+}
+
+type OndemandLogQueryCondition struct {
+ ServiceInstanceID *string `json:"serviceInstanceId"`
+ Container string `json:"container"`
+ Duration *Duration `json:"duration"`
+ KeywordsOfContent []string `json:"keywordsOfContent"`
+ ExcludingKeywordsOfContent []string `json:"excludingKeywordsOfContent"`
+}
+
type Pagination struct {
PageNum *int `json:"pageNum"`
PageSize int `json:"pageSize"`
}
+type PodContainers struct {
+ ErrorReason *string `json:"errorReason"`
+ Containers []string `json:"containers"`
+}
+
type Process struct {
ID string `json:"id"`
Name string `json:"name"`
@@ -376,6 +407,21 @@
Labels []string `json:"labels"`
}
+type ProcessNode struct {
+ ID string `json:"id"`
+ ServiceID string `json:"serviceId"`
+ ServiceName string `json:"serviceName"`
+ ServiceInstanceID string `json:"serviceInstanceId"`
+ ServiceInstanceName string `json:"serviceInstanceName"`
+ Name string `json:"name"`
+ IsReal bool `json:"isReal"`
+}
+
+type ProcessTopology struct {
+ Nodes []*ProcessNode `json:"nodes"`
+ Calls []*Call `json:"calls"`
+}
+
type ProfileAnalyzation struct {
Tip *string `json:"tip"`
Trees []*ProfileStackTree `json:"trees"`
@@ -787,18 +833,20 @@
type EBPFProfilingTargetType string
const (
- EBPFProfilingTargetTypeOnCPU EBPFProfilingTargetType = "ON_CPU"
- EBPFProfilingTargetTypeOffCPU EBPFProfilingTargetType = "OFF_CPU"
+ EBPFProfilingTargetTypeOnCPU EBPFProfilingTargetType = "ON_CPU"
+ EBPFProfilingTargetTypeOffCPU EBPFProfilingTargetType = "OFF_CPU"
+ EBPFProfilingTargetTypeNetwork EBPFProfilingTargetType = "NETWORK"
)
var AllEBPFProfilingTargetType = []EBPFProfilingTargetType{
EBPFProfilingTargetTypeOnCPU,
EBPFProfilingTargetTypeOffCPU,
+ EBPFProfilingTargetTypeNetwork,
}
func (e EBPFProfilingTargetType) IsValid() bool {
switch e {
- case EBPFProfilingTargetTypeOnCPU, EBPFProfilingTargetTypeOffCPU:
+ case EBPFProfilingTargetTypeOnCPU, EBPFProfilingTargetTypeOffCPU, EBPFProfilingTargetTypeNetwork:
return true
}
return false
@@ -1232,6 +1280,7 @@
ScopeServiceRelation Scope = "ServiceRelation"
ScopeServiceInstanceRelation Scope = "ServiceInstanceRelation"
ScopeEndpointRelation Scope = "EndpointRelation"
+ ScopeProcessRelation Scope = "ProcessRelation"
)
var AllScope = []Scope{
@@ -1242,11 +1291,12 @@
ScopeServiceRelation,
ScopeServiceInstanceRelation,
ScopeEndpointRelation,
+ ScopeProcessRelation,
}
func (e Scope) IsValid() bool {
switch e {
- case ScopeAll, ScopeService, ScopeServiceInstance, ScopeEndpoint, ScopeServiceRelation, ScopeServiceInstanceRelation, ScopeEndpointRelation:
+ case ScopeAll, ScopeService, ScopeServiceInstance, ScopeEndpoint, ScopeServiceRelation, ScopeServiceInstanceRelation, ScopeEndpointRelation, ScopeProcessRelation:
return true
}
return false
