调整 日志输出格式

inventory_sync/service.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
 import logging
-import re
 from typing import Any
 
+from inventory_analytics.logging_utils import log_event as emit_log_event
+
 from .feishu import FeishuApiError, FeishuClient
 from .postgres import query_postgres
 from .settings import AppConfig
@@ -11,7 +12,6 @@ from .specs import BRAND_SYNC_TARGETS, FIELD_SPECS, PRIMARY_FIELD_NAME, PRIMARY_
 
 
 logger = logging.getLogger("inventory_sync.service")
-SENSITIVE_PATTERN = re.compile(r"(?i)(password|passwd|secret|token|authorization)\s*[:=]\s*([^\s,;]+)")
 
 LOG_FIELD_LABELS = {
     "advanced_permission_enabled": "高级权限已开启",
@@ -20,26 +20,16 @@ LOG_FIELD_LABELS = {
     "deleted_records": "删除记录数",
     "existing_records": "已有记录数",
     "rows": "行数",
-    "selected_table_id": "选中表ID",
     "source_rows": "源数据行数",
+    "stage": "阶段",
     "table_count": "表数量",
     "table_name": "表名",
     "target_count": "目标数量",
 }
 
 
-def sanitize_value(value: Any) -> Any:
-    if isinstance(value, str):
-        return SENSITIVE_PATTERN.sub(r"\1=***", value)
-    return value
-
-
 def log_event(level: int, event: str, **fields: Any) -> None:
-    safe_event = sanitize_value(event)
-    details = " ".join(
-        f"{LOG_FIELD_LABELS.get(key, key)}={sanitize_value(value)!r}" for key, value in fields.items()
-    )
-    logger.log(level, "事件=%s%s", safe_event, f" {details}" if details else "")
+    emit_log_event(logger, LOG_FIELD_LABELS, level, event, **fields)
 
 
 def build_feishu_record(row: dict[str, Any]) -> dict[str, Any]:
@@ -64,34 +54,24 @@ def build_feishu_record(row: dict[str, Any]) -> dict[str, Any]:
 
 
 def run_feishu_summary(client: FeishuClient) -> dict[str, Any]:
-    log_event(logging.INFO, "开始获取飞书租户访问令牌")
+    log_event(logging.INFO, "开始获取飞书访问令牌", stage="feishu_auth")
     access_token = client.get_tenant_access_token()
-    log_event(logging.INFO, "飞书租户访问令牌获取完成")
+    log_event(logging.INFO, "飞书访问令牌获取完成", stage="feishu_auth")
     base_info = client.parse_base_info(client.build_base_url(), access_token)
-    log_event(logging.INFO, "飞书Base信息解析完成", selected_table_id=base_info["selected_table_id"])
+    log_event(logging.INFO, "飞书Base信息解析完成", stage="feishu_base")
     advanced_permission_enabled = client.enable_advanced_permission(access_token, base_info["app_token"] or "")
     tables = client.list_tables(access_token, base_info["app_token"] or "")
     log_event(
         logging.INFO,
         "飞书Base表列表读取完成",
+        stage="feishu_tables",
         table_count=len(tables),
         advanced_permission_enabled=advanced_permission_enabled,
     )
     return {
-        "base_url": base_info["base_url"],
-        "app_token": base_info["app_token"],
         "auth_mode": "tenant_access_token",
-        "selected_table_id": base_info["selected_table_id"],
-        "selected_view_id": base_info["selected_view_id"],
         "advanced_permission_enabled": advanced_permission_enabled,
-        "folder": {
-            "name": base_info["app_token"],
-            "type": "base",
-            "tables": [
-                {"table_id": table.get("table_id"), "name": table.get("name"), "revision": table.get("revision")}
-                for table in tables
-            ],
-        },
+        "tables": [{"name": table.get("name"), "revision": table.get("revision")} for table in tables],
         "table_count": len(tables),
     }
 
@@ -107,6 +87,7 @@ def sync_brand_target(
     log_event(
         logging.INFO,
         "开始同步目标飞书表",
+        stage="sync_target",
         brand_name=target.brand_name,
         table_name=target.table_name,
         source_rows=len(postgres_rows or []),
@@ -128,6 +109,7 @@ def sync_brand_target(
     log_event(
         logging.INFO,
         "目标飞书表已有记录读取完成",
+        stage="sync_target",
         brand_name=target.brand_name,
         table_name=target.table_name,
         existing_records=len(existing_record_ids),
@@ -142,6 +124,7 @@ def sync_brand_target(
     log_event(
         logging.INFO,
         "目标飞书表同步完成",
+        stage="sync_target",
         brand_name=target.brand_name,
         table_name=target.table_name,
         deleted_records=deleted_count,
@@ -162,13 +145,13 @@ def sync_brand_target(
 
 
 def run_sync_brand(config: AppConfig, client: FeishuClient, postgres_result: dict[str, Any] | None = None) -> dict[str, Any]:
-    log_event(logging.INFO, "开始准备品牌同步", target_count=len(BRAND_SYNC_TARGETS))
+    log_event(logging.INFO, "开始准备品牌同步", stage="sync_prepare", target_count=len(BRAND_SYNC_TARGETS))
     access_token = client.get_tenant_access_token()
     base_info = client.parse_base_info(client.build_base_url(), access_token)
     app_token = base_info["app_token"] or ""
     client.enable_advanced_permission(access_token, app_token)
     tables = client.list_tables(access_token, app_token)
-    log_event(logging.INFO, "品牌同步准备完成", table_count=len(tables))
+    log_event(logging.INFO, "品牌同步准备完成", stage="sync_prepare", table_count=len(tables))
 
     results = []
     source_row_count = 0
@@ -181,6 +164,7 @@ def run_sync_brand(config: AppConfig, client: FeishuClient, postgres_result: dic
         log_event(
             logging.INFO,
             "目标品牌PostgreSQL数据已准备",
+            stage="sync_prepare",
             brand_name=target.brand_name,
             table_name=target.table_name,
             rows=len(postgres_rows or []),