diff --git a/backend/kitex_gen/coze/loop/observability/domain/common/common.go b/backend/kitex_gen/coze/loop/observability/domain/common/common.go index 342c169931..774afc0379 100644 --- a/backend/kitex_gen/coze/loop/observability/domain/common/common.go +++ b/backend/kitex_gen/coze/loop/observability/domain/common/common.go @@ -35,6 +35,8 @@ const ( PlatformTypeInnerDoubao = "inner_doubao" + PlatformTypeInnerDoubaoUnencrypted = "inner_doubao_unencrypted" + PlatformTypeInnerPrompt = "inner_prompt" PlatformTypeInnerCozeBot = "inner_coze_bot" diff --git a/backend/kitex_gen/coze/loop/observability/domain/filter/filter.go b/backend/kitex_gen/coze/loop/observability/domain/filter/filter.go index 0134a3ae53..1ab4fea90a 100644 --- a/backend/kitex_gen/coze/loop/observability/domain/filter/filter.go +++ b/backend/kitex_gen/coze/loop/observability/domain/filter/filter.go @@ -356,6 +356,7 @@ type FilterField struct { SubFilter *FilterFields `thrift:"sub_filter,6,optional" frugal:"6,optional,FilterFields" form:"sub_filter" json:"sub_filter,omitempty" query:"sub_filter"` IsCustom *bool `thrift:"is_custom,7,optional" frugal:"7,optional,bool" form:"is_custom" json:"is_custom,omitempty" query:"is_custom"` ExtraInfo map[string]string `thrift:"extra_info,8,optional" frugal:"8,optional,map" form:"extra_info" json:"extra_info,omitempty" query:"extra_info"` + IsSystem *bool `thrift:"is_system,9,optional" frugal:"9,optional,bool" form:"is_system" json:"is_system,omitempty" query:"is_system"` } func NewFilterField() *FilterField { @@ -460,6 +461,18 @@ func (p *FilterField) GetExtraInfo() (v map[string]string) { } return p.ExtraInfo } + +var FilterField_IsSystem_DEFAULT bool + +func (p *FilterField) GetIsSystem() (v bool) { + if p == nil { + return + } + if !p.IsSetIsSystem() { + return FilterField_IsSystem_DEFAULT + } + return *p.IsSystem +} func (p *FilterField) SetFieldName(val *string) { p.FieldName = val } @@ -484,6 +497,9 @@ func (p *FilterField) SetIsCustom(val *bool) { func (p *FilterField) SetExtraInfo(val map[string]string) { p.ExtraInfo = val } +func (p *FilterField) SetIsSystem(val *bool) { + p.IsSystem = val +} var fieldIDToName_FilterField = map[int16]string{ 1: "field_name", @@ -494,6 +510,7 @@ var fieldIDToName_FilterField = map[int16]string{ 6: "sub_filter", 7: "is_custom", 8: "extra_info", + 9: "is_system", } func (p *FilterField) IsSetFieldName() bool { @@ -528,6 +545,10 @@ func (p *FilterField) IsSetExtraInfo() bool { return p.ExtraInfo != nil } +func (p *FilterField) IsSetIsSystem() bool { + return p.IsSystem != nil +} + func (p *FilterField) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 diff --git a/backend/kitex_gen/coze/loop/observability/trace/coze.loop.observability.trace.go b/backend/kitex_gen/coze/loop/observability/trace/coze.loop.observability.trace.go index d1da556daa..cdf20deba7 100644 --- a/backend/kitex_gen/coze/loop/observability/trace/coze.loop.observability.trace.go +++ b/backend/kitex_gen/coze/loop/observability/trace/coze.loop.observability.trace.go @@ -6666,6 +6666,7 @@ type FieldMeta struct { FilterTypes []filter.QueryType `thrift:"filter_types,2,required" frugal:"2,required,list" form:"filter_types,required" json:"filter_types,required" query:"filter_types,required"` FieldOptions *filter.FieldOptions `thrift:"field_options,3,optional" frugal:"3,optional,filter.FieldOptions" form:"field_options" json:"field_options,omitempty" query:"field_options"` SupportCustomizableOption *bool `thrift:"support_customizable_option,4,optional" frugal:"4,optional,bool" form:"support_customizable_option" json:"support_customizable_option,omitempty" query:"support_customizable_option"` + IsSystem *bool `thrift:"is_system,5,optional" frugal:"5,optional,bool" form:"is_system" json:"is_system,omitempty" query:"is_system"` } func NewFieldMeta() *FieldMeta { @@ -6724,12 +6725,16 @@ func (p *FieldMeta) SetFieldOptions(val *filter.FieldOptions) { func (p *FieldMeta) SetSupportCustomizableOption(val *bool) { p.SupportCustomizableOption = val } +func (p *FieldMeta) SetIsSystem(val *bool) { + p.IsSystem = val +} var fieldIDToName_FieldMeta = map[int16]string{ 1: "value_type", 2: "filter_types", 3: "field_options", 4: "support_customizable_option", + 5: "is_system", } func (p *FieldMeta) IsSetFieldOptions() bool { @@ -6740,6 +6745,22 @@ func (p *FieldMeta) IsSetSupportCustomizableOption() bool { return p.SupportCustomizableOption != nil } +func (p *FieldMeta) IsSetIsSystem() bool { + return p.IsSystem != nil +} + +var FieldMeta_IsSystem_DEFAULT bool + +func (p *FieldMeta) GetIsSystem() (v bool) { + if p == nil { + return + } + if !p.IsSetIsSystem() { + return FieldMeta_IsSystem_DEFAULT + } + return *p.IsSystem +} + func (p *FieldMeta) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 diff --git a/backend/modules/observability/application/convertor/filter.go b/backend/modules/observability/application/convertor/filter.go index db883c6eda..1d5bcffc1c 100644 --- a/backend/modules/observability/application/convertor/filter.go +++ b/backend/modules/observability/application/convertor/filter.go @@ -43,6 +43,9 @@ func FilterFieldsDTO2DO(f *filter.FilterFields) *loop_span.FilterFields { if field.IsCustom != nil { fField.IsCustom = *field.IsCustom } + if field.IsSystem != nil { + fField.IsSystem = *field.IsSystem + } if field.ExtraInfo != nil { fField.ExtraInfo = field.ExtraInfo } @@ -85,6 +88,12 @@ func FilterFieldsDO2DTO(f *loop_span.FilterFields) *filter.FilterFields { if field.SubFilter != nil { fField.SubFilter = FilterFieldsDO2DTO(field.SubFilter) } + if field.IsCustom { + fField.IsCustom = ptr.Of(field.IsCustom) + } + if field.IsSystem { + fField.IsSystem = ptr.Of(field.IsSystem) + } if field.ExtraInfo != nil { fField.ExtraInfo = field.ExtraInfo } diff --git a/backend/modules/observability/application/convertor/trace/span.go b/backend/modules/observability/application/convertor/trace/span.go index 5ed64c82cf..373272a125 100644 --- a/backend/modules/observability/application/convertor/trace/span.go +++ b/backend/modules/observability/application/convertor/trace/span.go @@ -236,6 +236,9 @@ func FilterFieldDTO2DO(field *filter.FilterField) *loop_span.FilterField { if field.IsCustom != nil { fField.IsCustom = *field.IsCustom } + if field.IsSystem != nil { + fField.IsSystem = *field.IsSystem + } return fField } @@ -343,6 +346,9 @@ func FilterFieldDO2DTO(field *loop_span.FilterField) *filter.FilterField { if field.IsCustom { fField.IsCustom = ptr.Of(field.IsCustom) } + if field.IsSystem { + fField.IsSystem = ptr.Of(field.IsSystem) + } return fField } diff --git a/backend/modules/observability/application/trace.go b/backend/modules/observability/application/trace.go index f9eb7a3799..c9c6ad593c 100644 --- a/backend/modules/observability/application/trace.go +++ b/backend/modules/observability/application/trace.go @@ -598,6 +598,7 @@ func (t *TraceApplication) GetTracesMetaInfo(ctx context.Context, req *trace.Get fMeta[k] = &trace.FieldMeta{ ValueType: filter.FieldType(v.FieldType), SupportCustomizableOption: ptr.Of(v.SupportCustom), + IsSystem: ptr.Of(v.IsSystem), } if v.FieldOptions != nil { fMeta[k].FieldOptions = &filter.FieldOptions{ diff --git a/backend/modules/observability/domain/component/config/config.go b/backend/modules/observability/domain/component/config/config.go index cbb403072a..96ac36ff88 100644 --- a/backend/modules/observability/domain/component/config/config.go +++ b/backend/modules/observability/domain/component/config/config.go @@ -77,6 +77,7 @@ type FieldMeta struct { FilterTypes []loop_span.QueryTypeEnum `mapstructure:"filter_types" json:"filter_types"` FieldOptions *loop_span.FieldOptions `mapstructure:"field_options" json:"field_options"` SupportCustom bool `mapstructure:"support_custom" json:"support_custom"` + IsSystem bool `mapstructure:"is_system" json:"is_system"` } type TraceAttrTosCfg struct { diff --git a/idl/thrift/coze/loop/observability/coze.loop.observability.trace.thrift b/idl/thrift/coze/loop/observability/coze.loop.observability.trace.thrift index 27023f5185..bb4f2257a7 100644 --- a/idl/thrift/coze/loop/observability/coze.loop.observability.trace.thrift +++ b/idl/thrift/coze/loop/observability/coze.loop.observability.trace.thrift @@ -143,6 +143,7 @@ struct FieldMeta { 2: required list filter_types 3: optional filter.FieldOptions field_options 4: optional bool support_customizable_option + 5: optional bool is_system } struct GetTracesMetaInfoRequest { diff --git a/idl/thrift/coze/loop/observability/domain/common.thrift b/idl/thrift/coze/loop/observability/domain/common.thrift index 20d93dd62b..eba4576cb1 100644 --- a/idl/thrift/coze/loop/observability/domain/common.thrift +++ b/idl/thrift/coze/loop/observability/domain/common.thrift @@ -14,6 +14,7 @@ const PlatformType PlatformType_VeAgentkit = "ve_agentkit" const PlatformType PlatformType_LoopAll = "loop_all" const PlatformType PlatformType_InnerCozeloop = "inner_cozeloop" const PlatformType PlatformType_InnerDoubao = "inner_doubao" +const PlatformType PlatformType_InnerDoubaoUnencrypted = "inner_doubao_unencrypted" const PlatformType PlatformType_InnerPrompt = "inner_prompt" const PlatformType PlatformType_InnerCozeBot = "inner_coze_bot" const PlatformType PlatformType_TraceDetail = "trace_detail" diff --git a/idl/thrift/coze/loop/observability/domain/filter.thrift b/idl/thrift/coze/loop/observability/domain/filter.thrift index 2cb564a5d3..105232df28 100644 --- a/idl/thrift/coze/loop/observability/domain/filter.thrift +++ b/idl/thrift/coze/loop/observability/domain/filter.thrift @@ -51,6 +51,7 @@ struct FilterField { 6: optional FilterFields sub_filter 7: optional bool is_custom 8: optional map extra_info + 9: optional bool is_system } struct FieldOptions {