sycommon-python-lib 0.1.24__py3-none-any.whl → 0.1.25__py3-none-any.whl

sycommon/database/database_service.py

@@ -3,6 +3,7 @@ from sqlalchemy import create_engine, text
 from sycommon.config.Config import SingletonMeta
 from sycommon.config.DatabaseConfig import DatabaseConfig, convert_dict_keys
 from sycommon.logging.kafka_log import SYLogger
+from sycommon.logging.sql_logger import SQLTraceLogger
 from sycommon.synacos.nacos_service import NacosService
 
 
@@ -62,9 +63,13 @@ class DatabaseConnector(metaclass=SingletonMeta):
             max_overflow=20,  # 最大溢出连接数
             pool_timeout=30,  # 连接超时时间（秒）
             pool_recycle=3600,  # 连接回收时间（秒）
-            pool_pre_ping=True  # 每次获取连接前检查连接是否有效
+            pool_pre_ping=True,  # 每次获取连接前检查连接是否有效
+            echo=False,  # 打印 SQL 语句
         )
 
+        # 注册 SQL 日志拦截器
+        SQLTraceLogger.setup_sql_logging(self.engine)
+
         # 测试
         if not self.test_connection():
             raise Exception("Database connection test failed")

sycommon/logging/kafka_log.py

@@ -173,7 +173,7 @@ class KafkaLogger(metaclass=SingletonMeta):
                     "className": "",
                     "sqlCost": 0,
                     "size": len(str(message)),
-                    "uid": int(trace_id) if trace_id and trace_id.isdigit() else 0
+                    "uid": int(Snowflake.next_id())  # 独立新的id
                 }
 
                 # 智能队列管理

sycommon/logging/sql_logger.py

@@ -0,0 +1,59 @@
+from sqlalchemy import event
+from sqlalchemy.engine import Engine
+from sycommon.logging.kafka_log import SYLogger
+import time
+from datetime import datetime
+from decimal import Decimal
+
+
+class SQLTraceLogger:
+    @staticmethod
+    def setup_sql_logging(engine: Engine):
+        """为 SQLAlchemy 引擎注册事件监听器，绑定 trace_id 到 SQL 日志"""
+        def serialize_params(params):
+            """处理特殊类型参数的序列化"""
+            if isinstance(params, (list, tuple)):
+                return [SQLTraceLogger.serialize_params(p) for p in params]
+            elif isinstance(params, dict):
+                return {k: SQLTraceLogger.serialize_params(v) for k, v in params.items()}
+            elif isinstance(params, datetime):
+                return params.isoformat()
+            elif isinstance(params, Decimal):
+                return float(params)
+            else:
+                return params
+
+        # 监听 SQL 语句执行后事件（计算耗时并输出日志）
+        @event.listens_for(Engine, "after_cursor_execute")
+        def after_cursor_execute(
+            conn, cursor, statement, parameters, context, executemany
+        ):
+            try:
+                # 从连接的 execution_options 中获取开始时间
+                start_time = conn._execution_options.get(
+                    "_start_time", time.time())
+                execution_time = (time.time() - start_time) * 1000
+
+                # 构建 SQL 日志信息
+                sql_log = {
+                    "type": "SQL",
+                    "statement": statement,
+                    "parameters": serialize_params(parameters),
+                    "execution_time_ms": round(execution_time, 2),
+                }
+
+                SYLogger.info(f"SQL 执行: {sql_log}")
+            except Exception as e:
+                SYLogger.error(f"SQL 日志处理失败: {str(e)}")
+
+        # 监听 SQL 执行开始事件（记录开始时间到连接的 execution_options）
+        @event.listens_for(Engine, "before_cursor_execute")
+        def before_cursor_execute(
+            conn, cursor, statement, parameters, context, executemany
+        ):
+            try:
+                # 通过连接对象的 execution_options 设置开始时间
+                # 这里会创建一个新的执行选项副本，避免修改不可变对象
+                conn = conn.execution_options(_start_time=time.time())
+            except Exception as e:
+                SYLogger.error(f"SQL 开始时间记录失败: {str(e)}")

{sycommon_python_lib-0.1.24.dist-info → sycommon_python_lib-0.1.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.24
+Version: 0.1.25
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.1.24.dist-info → sycommon_python_lib-0.1.25.dist-info}/RECORD

@@ -9,14 +9,15 @@ sycommon/config/MQConfig.py,sha256=_RDcmIdyWKjmgM5ZnriOoI-DpaxgXs7CD0awdAD6z88,2
 sycommon/config/RerankerConfig.py,sha256=dohekaY_eTynmMimIuKHBYGXXQO6rJjSkm94OPLuMik,322
 sycommon/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/database/base_db_service.py,sha256=J5ELHMNeGfzA6zVcASPSPZ0XNKrRY3_gdGmVkZw3Mto,946
-sycommon/database/database_service.py,sha256=B9tCaMsKGK87XF20YQh-eGupa3dq0JXymKnAAJvS2DQ,3060
+sycommon/database/database_service.py,sha256=mun5vgM7nkuH6_UyHLHqQ2Qk_5gRgMxJu4_obIKLT6o,3253
 sycommon/health/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/health/health_check.py,sha256=EhfbhspRpQiKJaxdtE-PzpKQO_ucaFKtQxIm16F5Mpk,391
 sycommon/health/metrics.py,sha256=fHqO73JuhoZkNPR-xIlxieXiTCvttq-kG-tvxag1s1s,268
 sycommon/health/ping.py,sha256=FTlnIKk5y1mPfS1ZGOeT5IM_2udF5aqVLubEtuBp18M,250
 sycommon/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sycommon/logging/kafka_log.py,sha256=x1ZUCpSwSONugzOkSppZ6hOPFqekmjPDHdlJ8v75D-s,20764
+sycommon/logging/kafka_log.py,sha256=3HjBg3WoDd3DmjtAlpyLcAVTKI-AHKrKlKmmPerq9tU,20751
 sycommon/logging/logger_wrapper.py,sha256=TiHsrIIHiQMzXgXK12-0KIpU9GhwQJOoHslakzmq2zc,357
+sycommon/logging/sql_logger.py,sha256=sNfWnlqwKGDCSYNktBao03k_Z0o_D4xplMokBqXeh8E,2541
 sycommon/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/middleware/context.py,sha256=_5ghpv4u_yAvjkgM-XDx8OnO-YI1XtntHrXsHJHZkwo,88
 sycommon/middleware/cors.py,sha256=0B5d_ovD56wcH9TfktRs88Q09R9f8Xx5h5ALWYvE8Iw,600
@@ -47,8 +48,8 @@ sycommon/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/tools/docs.py,sha256=OPj2ETheuWjXLyaXtaZPbwmJKfJaYXV5s4XMVAUNrms,1607
 sycommon/tools/snowflake.py,sha256=DdEj3T5r5OEvikp3puxqmmmz6BrggxomoSlnsRFb5dM,1174
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.24.dist-info/METADATA,sha256=lWldyI4VazRFZVRGcN7u1otEYwuWHCA0FiUxgSp2YPY,7038
-sycommon_python_lib-0.1.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.24.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.24.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.24.dist-info/RECORD,,
+sycommon_python_lib-0.1.25.dist-info/METADATA,sha256=xNQjkWiZ4PpKIk8UqDa09HVjYyX4W0oWg_4OcMcPD3A,7038
+sycommon_python_lib-0.1.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.25.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.25.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.25.dist-info/RECORD,,