From 2d4ae039aff0eacd30374e09688915639572fb70 Mon Sep 17 00:00:00 2001 From: pengshengbing Date: Fri, 17 Jan 2025 16:50:34 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feature:=201.=E6=97=A5=E5=BF=97=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0traceId=E9=93=BE=E8=B7=AF=E8=BF=BD=E8=B8=AA=202.respon?= =?UTF-8?q?se-header=E9=BB=98=E8=AE=A4=E6=B7=BB=E5=8A=A0request-id?= =?UTF-8?q?=E4=B8=8EtraceId=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-fastapi-backend/middlewares/handle.py | 4 +- .../middlewares/trace_log/__init__.py | 9 ++++ .../middlewares/trace_log/ctx.py | 24 +++++++++ .../middlewares/trace_log/middle.py | 47 ++++++++++++++++ .../middlewares/trace_log/span.py | 53 +++++++++++++++++++ .../middlewares/trace_log/trace.py | 24 +++++++++ ruoyi-fastapi-backend/utils/log_util.py | 25 ++++++++- 7 files changed, 183 insertions(+), 3 deletions(-) create mode 100644 ruoyi-fastapi-backend/middlewares/trace_log/__init__.py create mode 100644 ruoyi-fastapi-backend/middlewares/trace_log/ctx.py create mode 100644 ruoyi-fastapi-backend/middlewares/trace_log/middle.py create mode 100644 ruoyi-fastapi-backend/middlewares/trace_log/span.py create mode 100644 ruoyi-fastapi-backend/middlewares/trace_log/trace.py diff --git a/ruoyi-fastapi-backend/middlewares/handle.py b/ruoyi-fastapi-backend/middlewares/handle.py index ea447d4..158cf09 100644 --- a/ruoyi-fastapi-backend/middlewares/handle.py +++ b/ruoyi-fastapi-backend/middlewares/handle.py @@ -1,7 +1,7 @@ from fastapi import FastAPI from middlewares.cors_middleware import add_cors_middleware from middlewares.gzip_middleware import add_gzip_middleware - +from middlewares.trace_log import TraceASGIMiddleware def handle_middleware(app: FastAPI): """ @@ -11,3 +11,5 @@ def handle_middleware(app: FastAPI): add_cors_middleware(app) # 加载gzip压缩中间件 add_gzip_middleware(app) + # 注册trace中间件 + app.add_middleware(TraceASGIMiddleware) \ No newline at end of file diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/__init__.py b/ruoyi-fastapi-backend/middlewares/trace_log/__init__.py new file mode 100644 index 0000000..56c796b --- /dev/null +++ b/ruoyi-fastapi-backend/middlewares/trace_log/__init__.py @@ -0,0 +1,9 @@ +from .ctx import TraceCtx +from .middle import TraceASGIMiddleware + +__all__ = ( + "TraceASGIMiddleware", + "TraceCtx" +) + +__version__ = "0.1.0" diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/ctx.py b/ruoyi-fastapi-backend/middlewares/trace_log/ctx.py new file mode 100644 index 0000000..076c483 --- /dev/null +++ b/ruoyi-fastapi-backend/middlewares/trace_log/ctx.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +""" +@author: peng +@file: ctx.py +@time: 2025/1/17 16:57 +""" + +import contextvars +from uuid import uuid4 + +CTX_REQUEST_ID: contextvars.ContextVar[str] = contextvars.ContextVar("request-id", default="") + + +class TraceCtx: + + @staticmethod + def set_id(): + _id = uuid4().hex + CTX_REQUEST_ID.set(_id) + return _id + + @staticmethod + def get_id(): + return CTX_REQUEST_ID.get() diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/middle.py b/ruoyi-fastapi-backend/middlewares/trace_log/middle.py new file mode 100644 index 0000000..969ae1a --- /dev/null +++ b/ruoyi-fastapi-backend/middlewares/trace_log/middle.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +""" +@author: peng +@file: middle.py +@time: 2025/1/17 16:57 +""" + +from functools import wraps +from starlette.types import ASGIApp, Message, Receive, Scope, Send +from .span import get_current_span, Span + + +class TraceASGIMiddleware: + def __init__(self, app: ASGIApp) -> None: + self.app = app + + """ + fastapi-example: + app = FastAPI() + app.add_middleware(TraceASGIMiddleware) + """ + + @staticmethod + async def my_receive(receive: Receive, span: Span): + await span.request_before() + + @wraps(receive) + async def my_receive(): + message = await receive() + await span.request_after(message) + return message + + return my_receive + + async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None: + if scope['type'] != 'http': + await self.app(scope, receive, send) + return + + async with get_current_span(scope) as span: + handle_outgoing_receive = await self.my_receive(receive, span) + + async def handle_outgoing_request(message: 'Message') -> None: + await span.response(message) + await send(message) + + await self.app(scope, handle_outgoing_receive, handle_outgoing_request) diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/span.py b/ruoyi-fastapi-backend/middlewares/trace_log/span.py new file mode 100644 index 0000000..0aa538d --- /dev/null +++ b/ruoyi-fastapi-backend/middlewares/trace_log/span.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +""" +@author: peng +@file: span.py +@time: 2025/1/17 16:57 +""" + +from contextlib import asynccontextmanager +from starlette.types import Scope, Message +from .ctx import TraceCtx + + +class Span: + + """ + 整个http生命周期： + request(before) --> request(after) --> response(before) --> response(after) + """ + + def __init__(self, scope: Scope): + self.scope = scope + + async def request_before(self): + """ + request_before: 处理header信息等, 如记录请求体信息 + """ + TraceCtx.set_id() + + async def request_after(self, message: Message): + """ + request_after: 处理请求bytes， 如记录请求参数 + + example: + message: {'type': 'http.request', 'body': b'{\r\n "name": "\xe8\x8b\x8f\xe8\x8b\x8f\xe8\x8b\x8f"\r\n}', 'more_body': False} + """ + return message + + async def response(self, message: Message): + """ + if message['type'] == "http.response.start": -----> request-before + pass + if message['type'] == "http.response.body": -----> request-after + message.get('body', b'') + pass + """ + if message['type'] == "http.response.start": + message['headers'].append((b'request-id', TraceCtx.get_id().encode())) + return message + + +@asynccontextmanager +async def get_current_span(scope: Scope): + yield Span(scope) diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/trace.py b/ruoyi-fastapi-backend/middlewares/trace_log/trace.py new file mode 100644 index 0000000..65e4464 --- /dev/null +++ b/ruoyi-fastapi-backend/middlewares/trace_log/trace.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +""" +@author: peng +@file: trace.py +@time: 2025/1/17 13:55 +""" + +import contextvars +from uuid import uuid4 + +CTX_REQUEST_ID: contextvars.ContextVar[str] = contextvars.ContextVar("request-id", default="") + + +class TraceCtx: + + @staticmethod + def set_id(): + _id = uuid4().hex + CTX_REQUEST_ID.set(_id) + return _id + + @staticmethod + def get_id(): + return CTX_REQUEST_ID.get() diff --git a/ruoyi-fastapi-backend/utils/log_util.py b/ruoyi-fastapi-backend/utils/log_util.py index e42f393..4c2bd89 100644 --- a/ruoyi-fastapi-backend/utils/log_util.py +++ b/ruoyi-fastapi-backend/utils/log_util.py @@ -1,6 +1,6 @@ import os +import sys import time -from loguru import logger log_path = os.path.join(os.getcwd(), 'logs') if not os.path.exists(log_path): @@ -8,4 +8,25 @@ if not os.path.exists(log_path): log_path_error = os.path.join(log_path, f'{time.strftime("%Y-%m-%d")}_error.log') -logger.add(log_path_error, rotation='50MB', encoding='utf-8', enqueue=True, compression='zip') + +def init_log(): + from loguru import logger + from middlewares.trace_log import TraceCtx + def _filter(log): + log["trace_id"] = TraceCtx.get_id() + return log + + # 自定义日志格式 + format_str = "{time:YYYY-MM-DD HH:mm:ss.SSS} | {trace_id} | {level: <8} | {name}:{function}:{line} - {message}" + + logger.remove() + """ + 移除后重新添加sys.stderr, 目的: 控制台输出 与 文件日志 内容和结构一致 + """ + logger.add(sys.stderr, filter=_filter, format=format_str, enqueue=True) + logger.add(log_path_error, filter=_filter, format=format_str, rotation='50MB', encoding='utf-8', enqueue=True, + compression='zip') + return logger + + +logger = init_log() -- Gitee From 068e7950112b2b5f460065392e7d8e7dedba1593 Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Thu, 23 Jan 2025 16:44:27 +0800 Subject: [PATCH 2/6] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../middlewares/trace_log/__init__.py | 7 ++---- .../middlewares/trace_log/ctx.py | 3 +-- .../middlewares/trace_log/span.py | 25 +++++++++---------- .../middlewares/trace_log/trace.py | 3 +-- ruoyi-fastapi-backend/utils/log_util.py | 16 +++++++++--- 5 files changed, 28 insertions(+), 26 deletions(-) diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/__init__.py b/ruoyi-fastapi-backend/middlewares/trace_log/__init__.py index 56c796b..6a41b45 100644 --- a/ruoyi-fastapi-backend/middlewares/trace_log/__init__.py +++ b/ruoyi-fastapi-backend/middlewares/trace_log/__init__.py @@ -1,9 +1,6 @@ from .ctx import TraceCtx from .middle import TraceASGIMiddleware -__all__ = ( - "TraceASGIMiddleware", - "TraceCtx" -) +__all__ = ('TraceASGIMiddleware', 'TraceCtx') -__version__ = "0.1.0" +__version__ = '0.1.0' diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/ctx.py b/ruoyi-fastapi-backend/middlewares/trace_log/ctx.py index 076c483..558a5c9 100644 --- a/ruoyi-fastapi-backend/middlewares/trace_log/ctx.py +++ b/ruoyi-fastapi-backend/middlewares/trace_log/ctx.py @@ -8,11 +8,10 @@ import contextvars from uuid import uuid4 -CTX_REQUEST_ID: contextvars.ContextVar[str] = contextvars.ContextVar("request-id", default="") +CTX_REQUEST_ID: contextvars.ContextVar[str] = contextvars.ContextVar('request-id', default='') class TraceCtx: - @staticmethod def set_id(): _id = uuid4().hex diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/span.py b/ruoyi-fastapi-backend/middlewares/trace_log/span.py index 0aa538d..1e38eab 100644 --- a/ruoyi-fastapi-backend/middlewares/trace_log/span.py +++ b/ruoyi-fastapi-backend/middlewares/trace_log/span.py @@ -11,10 +11,9 @@ from .ctx import TraceCtx class Span: - """ - 整个http生命周期： - request(before) --> request(after) --> response(before) --> response(after) + 整个http生命周期： + request(before) --> request(after) --> response(before) --> response(after) """ def __init__(self, scope: Scope): @@ -22,28 +21,28 @@ class Span: async def request_before(self): """ - request_before: 处理header信息等, 如记录请求体信息 + request_before: 处理header信息等, 如记录请求体信息 """ TraceCtx.set_id() async def request_after(self, message: Message): """ - request_after: 处理请求bytes， 如记录请求参数 + request_after: 处理请求bytes， 如记录请求参数 - example: - message: {'type': 'http.request', 'body': b'{\r\n "name": "\xe8\x8b\x8f\xe8\x8b\x8f\xe8\x8b\x8f"\r\n}', 'more_body': False} + example: + message: {'type': 'http.request', 'body': b'{\r\n "name": "\xe8\x8b\x8f\xe8\x8b\x8f\xe8\x8b\x8f"\r\n}', 'more_body': False} """ return message async def response(self, message: Message): """ - if message['type'] == "http.response.start": -----> request-before - pass - if message['type'] == "http.response.body": -----> request-after - message.get('body', b'') - pass + if message['type'] == "http.response.start": -----> request-before + pass + if message['type'] == "http.response.body": -----> request-after + message.get('body', b'') + pass """ - if message['type'] == "http.response.start": + if message['type'] == 'http.response.start': message['headers'].append((b'request-id', TraceCtx.get_id().encode())) return message diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/trace.py b/ruoyi-fastapi-backend/middlewares/trace_log/trace.py index 65e4464..a148a1a 100644 --- a/ruoyi-fastapi-backend/middlewares/trace_log/trace.py +++ b/ruoyi-fastapi-backend/middlewares/trace_log/trace.py @@ -8,11 +8,10 @@ import contextvars from uuid import uuid4 -CTX_REQUEST_ID: contextvars.ContextVar[str] = contextvars.ContextVar("request-id", default="") +CTX_REQUEST_ID: contextvars.ContextVar[str] = contextvars.ContextVar('request-id', default='') class TraceCtx: - @staticmethod def set_id(): _id = uuid4().hex diff --git a/ruoyi-fastapi-backend/utils/log_util.py b/ruoyi-fastapi-backend/utils/log_util.py index 4c2bd89..803b762 100644 --- a/ruoyi-fastapi-backend/utils/log_util.py +++ b/ruoyi-fastapi-backend/utils/log_util.py @@ -12,20 +12,28 @@ log_path_error = os.path.join(log_path, f'{time.strftime("%Y-%m-%d")}_error.log' def init_log(): from loguru import logger from middlewares.trace_log import TraceCtx + def _filter(log): - log["trace_id"] = TraceCtx.get_id() + log['trace_id'] = TraceCtx.get_id() return log # 自定义日志格式 - format_str = "{time:YYYY-MM-DD HH:mm:ss.SSS} | {trace_id} | {level: <8} | {name}:{function}:{line} - {message}" + format_str = '{time:YYYY-MM-DD HH:mm:ss.SSS} | {trace_id} | {level: <8} | {name}:{function}:{line} - {message}' logger.remove() """ 移除后重新添加sys.stderr, 目的: 控制台输出 与 文件日志 内容和结构一致 """ logger.add(sys.stderr, filter=_filter, format=format_str, enqueue=True) - logger.add(log_path_error, filter=_filter, format=format_str, rotation='50MB', encoding='utf-8', enqueue=True, - compression='zip') + logger.add( + log_path_error, + filter=_filter, + format=format_str, + rotation='50MB', + encoding='utf-8', + enqueue=True, + compression='zip', + ) return logger -- Gitee From 89637dcf3d2678206a2522072f604ab08fcd7894 Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Fri, 24 Jan 2025 09:23:46 +0800 Subject: [PATCH 3/6] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96trace=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E4=BB=B6=E9=83=A8=E5=88=86=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-fastapi-backend/middlewares/handle.py | 7 ++++--- .../middlewares/trace_log/__init__.py | 11 +++++++++++ .../middlewares/trace_log/middle.py | 12 ++++++------ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ruoyi-fastapi-backend/middlewares/handle.py b/ruoyi-fastapi-backend/middlewares/handle.py index 158cf09..968ed1d 100644 --- a/ruoyi-fastapi-backend/middlewares/handle.py +++ b/ruoyi-fastapi-backend/middlewares/handle.py @@ -1,7 +1,8 @@ from fastapi import FastAPI from middlewares.cors_middleware import add_cors_middleware from middlewares.gzip_middleware import add_gzip_middleware -from middlewares.trace_log import TraceASGIMiddleware +from middlewares.trace_log import add_trace_middleware + def handle_middleware(app: FastAPI): """ @@ -11,5 +12,5 @@ def handle_middleware(app: FastAPI): add_cors_middleware(app) # 加载gzip压缩中间件 add_gzip_middleware(app) - # 注册trace中间件 - app.add_middleware(TraceASGIMiddleware) \ No newline at end of file + # 加载trace中间件 + add_trace_middleware(app) diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/__init__.py b/ruoyi-fastapi-backend/middlewares/trace_log/__init__.py index 6a41b45..76f8d85 100644 --- a/ruoyi-fastapi-backend/middlewares/trace_log/__init__.py +++ b/ruoyi-fastapi-backend/middlewares/trace_log/__init__.py @@ -1,6 +1,17 @@ +from fastapi import FastAPI from .ctx import TraceCtx from .middle import TraceASGIMiddleware __all__ = ('TraceASGIMiddleware', 'TraceCtx') __version__ = '0.1.0' + + +def add_trace_middleware(app: FastAPI): + """ + 添加trace中间件 + + :param app: FastAPI对象 + :return: + """ + app.add_middleware(TraceASGIMiddleware) diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/middle.py b/ruoyi-fastapi-backend/middlewares/trace_log/middle.py index 969ae1a..a071692 100644 --- a/ruoyi-fastapi-backend/middlewares/trace_log/middle.py +++ b/ruoyi-fastapi-backend/middlewares/trace_log/middle.py @@ -11,15 +11,15 @@ from .span import get_current_span, Span class TraceASGIMiddleware: + """ + fastapi-example: + app = FastAPI() + app.add_middleware(TraceASGIMiddleware) + """ + def __init__(self, app: ASGIApp) -> None: self.app = app - """ - fastapi-example: - app = FastAPI() - app.add_middleware(TraceASGIMiddleware) - """ - @staticmethod async def my_receive(receive: Receive, span: Span): await span.request_before() -- Gitee From 1417c296c15b0a7585b9f27ba486d3ff0cec30dc Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Fri, 24 Jan 2025 09:24:00 +0800 Subject: [PATCH 4/6] =?UTF-8?q?perf:=20=E7=A7=BB=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../middlewares/trace_log/trace.py | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 ruoyi-fastapi-backend/middlewares/trace_log/trace.py diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/trace.py b/ruoyi-fastapi-backend/middlewares/trace_log/trace.py deleted file mode 100644 index a148a1a..0000000 --- a/ruoyi-fastapi-backend/middlewares/trace_log/trace.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -""" -@author: peng -@file: trace.py -@time: 2025/1/17 13:55 -""" - -import contextvars -from uuid import uuid4 - -CTX_REQUEST_ID: contextvars.ContextVar[str] = contextvars.ContextVar('request-id', default='') - - -class TraceCtx: - @staticmethod - def set_id(): - _id = uuid4().hex - CTX_REQUEST_ID.set(_id) - return _id - - @staticmethod - def get_id(): - return CTX_REQUEST_ID.get() -- Gitee From 89b401eb659da7f11770658442d1545b239a699b Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Fri, 24 Jan 2025 09:24:34 +0800 Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20=E6=97=A5=E5=BF=97=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=99=A8=E9=87=8D=E6=9E=84=E4=B8=BA=E7=B1=BB=E5=BC=8F?= =?UTF-8?q?=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-fastapi-backend/utils/log_util.py | 88 +++++++++++++++---------- 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/ruoyi-fastapi-backend/utils/log_util.py b/ruoyi-fastapi-backend/utils/log_util.py index 803b762..7220b0e 100644 --- a/ruoyi-fastapi-backend/utils/log_util.py +++ b/ruoyi-fastapi-backend/utils/log_util.py @@ -1,40 +1,60 @@ import os import sys import time - -log_path = os.path.join(os.getcwd(), 'logs') -if not os.path.exists(log_path): - os.mkdir(log_path) - -log_path_error = os.path.join(log_path, f'{time.strftime("%Y-%m-%d")}_error.log') - - -def init_log(): - from loguru import logger - from middlewares.trace_log import TraceCtx - - def _filter(log): +from loguru import logger as _logger +from typing import Dict +from middlewares.trace_log import TraceCtx + + +class LoggerInitializer: + def __init__(self): + self.log_path = os.path.join(os.getcwd(), 'logs') + self.__ensure_log_directory_exists() + self.log_path_error = os.path.join(self.log_path, f'{time.strftime("%Y-%m-%d")}_error.log') + + def __ensure_log_directory_exists(self): + """ + 确保日志目录存在，如果不存在则创建 + """ + if not os.path.exists(self.log_path): + os.mkdir(self.log_path) + + @staticmethod + def __filter(log: Dict): + """ + 自定义日志过滤器，添加trace_id + """ log['trace_id'] = TraceCtx.get_id() return log - # 自定义日志格式 - format_str = '{time:YYYY-MM-DD HH:mm:ss.SSS} | {trace_id} | {level: <8} | {name}:{function}:{line} - {message}' - - logger.remove() - """ - 移除后重新添加sys.stderr, 目的: 控制台输出 与 文件日志 内容和结构一致 - """ - logger.add(sys.stderr, filter=_filter, format=format_str, enqueue=True) - logger.add( - log_path_error, - filter=_filter, - format=format_str, - rotation='50MB', - encoding='utf-8', - enqueue=True, - compression='zip', - ) - return logger - - -logger = init_log() + def init_log(self): + """ + 初始化日志配置 + """ + # 自定义日志格式 + format_str = ( + '{time:YYYY-MM-DD HH:mm:ss.SSS} | ' + '{trace_id} | ' + '{level: <8} | ' + '{name}:{function}:{line} - ' + '{message}' + ) + _logger.remove() + # 移除后重新添加sys.stderr, 目的: 控制台输出与文件日志内容和结构一致 + _logger.add(sys.stderr, filter=self.__filter, format=format_str, enqueue=True) + _logger.add( + self.log_path_error, + filter=self.__filter, + format=format_str, + rotation='50MB', + encoding='utf-8', + enqueue=True, + compression='zip', + ) + + return _logger + + +# 初始化日志处理器 +log_initializer = LoggerInitializer() +logger = log_initializer.init_log() -- Gitee From cf0b50c1604b1941514e8df7f182b50ae7cf13cf Mon Sep 17 00:00:00 2001 From: insistence <3055204202@qq.com> Date: Fri, 24 Jan 2025 09:27:04 +0800 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20trace=5Flog=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E4=B8=BAtrace=5Fmiddleware?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-fastapi-backend/middlewares/handle.py | 2 +- .../middlewares/{trace_log => trace_middleware}/__init__.py | 0 .../middlewares/{trace_log => trace_middleware}/ctx.py | 0 .../middlewares/{trace_log => trace_middleware}/middle.py | 0 .../middlewares/{trace_log => trace_middleware}/span.py | 0 ruoyi-fastapi-backend/utils/log_util.py | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) rename ruoyi-fastapi-backend/middlewares/{trace_log => trace_middleware}/__init__.py (100%) rename ruoyi-fastapi-backend/middlewares/{trace_log => trace_middleware}/ctx.py (100%) rename ruoyi-fastapi-backend/middlewares/{trace_log => trace_middleware}/middle.py (100%) rename ruoyi-fastapi-backend/middlewares/{trace_log => trace_middleware}/span.py (100%) diff --git a/ruoyi-fastapi-backend/middlewares/handle.py b/ruoyi-fastapi-backend/middlewares/handle.py index 968ed1d..abb2d0d 100644 --- a/ruoyi-fastapi-backend/middlewares/handle.py +++ b/ruoyi-fastapi-backend/middlewares/handle.py @@ -1,7 +1,7 @@ from fastapi import FastAPI from middlewares.cors_middleware import add_cors_middleware from middlewares.gzip_middleware import add_gzip_middleware -from middlewares.trace_log import add_trace_middleware +from middlewares.trace_middleware import add_trace_middleware def handle_middleware(app: FastAPI): diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/__init__.py b/ruoyi-fastapi-backend/middlewares/trace_middleware/__init__.py similarity index 100% rename from ruoyi-fastapi-backend/middlewares/trace_log/__init__.py rename to ruoyi-fastapi-backend/middlewares/trace_middleware/__init__.py diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/ctx.py b/ruoyi-fastapi-backend/middlewares/trace_middleware/ctx.py similarity index 100% rename from ruoyi-fastapi-backend/middlewares/trace_log/ctx.py rename to ruoyi-fastapi-backend/middlewares/trace_middleware/ctx.py diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/middle.py b/ruoyi-fastapi-backend/middlewares/trace_middleware/middle.py similarity index 100% rename from ruoyi-fastapi-backend/middlewares/trace_log/middle.py rename to ruoyi-fastapi-backend/middlewares/trace_middleware/middle.py diff --git a/ruoyi-fastapi-backend/middlewares/trace_log/span.py b/ruoyi-fastapi-backend/middlewares/trace_middleware/span.py similarity index 100% rename from ruoyi-fastapi-backend/middlewares/trace_log/span.py rename to ruoyi-fastapi-backend/middlewares/trace_middleware/span.py diff --git a/ruoyi-fastapi-backend/utils/log_util.py b/ruoyi-fastapi-backend/utils/log_util.py index 7220b0e..f953f55 100644 --- a/ruoyi-fastapi-backend/utils/log_util.py +++ b/ruoyi-fastapi-backend/utils/log_util.py @@ -3,7 +3,7 @@ import sys import time from loguru import logger as _logger from typing import Dict -from middlewares.trace_log import TraceCtx +from middlewares.trace_middleware import TraceCtx class LoggerInitializer: -- Gitee