v1.5.1 增强程序稳定性

EdgeAPI/internal/clickhouse/logs_ingest_store.go

@@ -39,6 +39,7 @@ type LogsIngestRow struct {
 	RequestBody         string
 	ResponseHeaders     string
 	ResponseBody        string
+	Attrs               string
 }
 
 // ListFilter 列表查询条件（与 ListHTTPAccessLogsRequest 对齐）
@@ -178,7 +179,7 @@ func (s *LogsIngestStore) List(ctx context.Context, f ListFilter) (rows []*LogsI
 
 	// 列表查询不 SELECT 大字段（request_headers / request_body / response_headers / response_body），
 	// 避免每次翻页读取 GB 级数据。详情查看时通过 FindByTraceId 单独获取。
-	query := fmt.Sprintf("SELECT timestamp, node_id, cluster_id, server_id, host, ip, method, path, status, bytes_in, bytes_out, cost_ms, ua, referer, log_type, trace_id, firewall_policy_id, firewall_rule_group_id, firewall_rule_set_id, firewall_rule_id FROM %s WHERE %s ORDER BY %s LIMIT %d",
+	query := fmt.Sprintf("SELECT timestamp, node_id, cluster_id, server_id, host, ip, method, path, status, bytes_in, bytes_out, cost_ms, ua, referer, log_type, trace_id, firewall_policy_id, firewall_rule_group_id, firewall_rule_set_id, firewall_rule_id, attrs FROM %s WHERE %s ORDER BY %s LIMIT %d",
 		table, where, orderBy, limit+1)
 
 	var rawRows []map[string]interface{}
@@ -225,7 +226,7 @@ func (s *LogsIngestStore) FindByTraceId(ctx context.Context, traceId string) (*L
 	}
 
 	table := quoteIdent("logs_ingest")
-	query := fmt.Sprintf("SELECT timestamp, node_id, cluster_id, server_id, host, ip, method, path, status, bytes_in, bytes_out, cost_ms, ua, referer, log_type, trace_id, firewall_policy_id, firewall_rule_group_id, firewall_rule_set_id, firewall_rule_id, request_headers, request_body, response_headers, response_body FROM %s WHERE trace_id = '%s' LIMIT 1",
+	query := fmt.Sprintf("SELECT timestamp, node_id, cluster_id, server_id, host, ip, method, path, status, bytes_in, bytes_out, cost_ms, ua, referer, log_type, trace_id, firewall_policy_id, firewall_rule_group_id, firewall_rule_set_id, firewall_rule_id, request_headers, request_body, response_headers, response_body, attrs FROM %s WHERE trace_id = '%s' LIMIT 1",
 		table, escapeString(traceId))
 
 	var rawRows []map[string]interface{}
@@ -333,6 +334,7 @@ func mapToLogsIngestRow(m map[string]interface{}) *LogsIngestRow {
 	r.RequestBody = str("request_body")
 	r.ResponseHeaders = str("response_headers")
 	r.ResponseBody = str("response_body")
+	r.Attrs = str("attrs")
 	return r
 }
 
@@ -401,6 +403,14 @@ func RowToPB(r *LogsIngestRow) *pb.HTTPAccessLog {
 		a.RequestBody = []byte(r.RequestBody)
 	}
 
+	// 扩展属性（cache.status 等）
+	if r.Attrs != "" {
+		var attrs map[string]string
+		if err := json.Unmarshal([]byte(r.Attrs), &attrs); err == nil && len(attrs) > 0 {
+			a.Attrs = attrs
+		}
+	}
+
 	return a
 }