From c8ed027e98f08a74fc107039fc14f992f8697a80 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Mon, 13 Jul 2026 14:35:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B8=B2=E6=9F=93=E5=BC=95=E6=93=8E?= =?UTF-8?q?flag=E8=A7=A3=E6=9E=90=E5=A2=9E=E5=8A=A0=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97=20+=20=E7=BB=9F=E4=B8=80fallback=E8=A1=8C?= =?UTF-8?q?=E4=B8=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 三个入口(compose_video/edit_plan/generate_video)都增加flag配置详情日志 （enabled/percentage/whitelist/default_engine），灰度期间便于排查 - 统一fallback行为：异常时全部fallback到legacy（保守策略） 之前generate_video异常时fallback到unified，与其他入口不一致 --- apps/worker/worker_app/tasks/compose_video.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/worker/worker_app/tasks/compose_video.py b/apps/worker/worker_app/tasks/compose_video.py index c9307d2da..ec36a6118 100755 --- a/apps/worker/worker_app/tasks/compose_video.py +++ b/apps/worker/worker_app/tasks/compose_video.py @@ -59,6 +59,7 @@ def compose_video(self, job_id: str, **kwargs): # 判断使用哪个渲染引擎 # 优先级：Redis Feature Flag（白名单 > 百分比） > 环境变量默认 from video_processing.render_engine_resolver import get_render_engine_resolver + from video_processing.render_metrics import render_task_metrics resolver = get_render_engine_resolver() user_id = job.created_by_user_id or None @@ -76,10 +77,12 @@ def compose_video(self, job_id: str, **kwargs): config.get("default_engine"), ) - if engine == "unified": - return _compose_with_unified_engine(self, job_service, job, plan_id, db) - else: - return _compose_with_legacy_engine(self, job_service, job, plan_id, db) + # 灰度观测指标埋点 + with render_task_metrics(engine=engine, task_type="compose_video"): + if engine == "unified": + return _compose_with_unified_engine(self, job_service, job, plan_id, db) + else: + return _compose_with_legacy_engine(self, job_service, job, plan_id, db) except self.retry_exc as exc: logger.warning("视频合成重试中: job_id=%s, exc=%s", job_id, exc) -- 2.54.0 From 04d48d624abb10cb8e1a0014a4912f062a66e416 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Wed, 15 Jul 2026 08:25:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4render=5Fmetrics?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=EF=BC=88=E8=AF=A5=E6=A8=A1=E5=9D=97=E5=9C=A8?= =?UTF-8?q?develop=E4=B8=8A=E4=B8=8D=E5=AD=98=E5=9C=A8=EF=BC=89=EF=BC=8C?= =?UTF-8?q?=E4=BF=9D=E6=8C=81PR=E7=8B=AC=E7=AB=8B=E5=8F=AF=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR #248 核心是flag调试日志 + fallback统一，埋点应由专门的灰度观测指标PR负责。 移除compose_video中对render_metrics的引用，确保PR可独立合并、不引入运行时错误。 --- apps/worker/worker_app/tasks/compose_video.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/apps/worker/worker_app/tasks/compose_video.py b/apps/worker/worker_app/tasks/compose_video.py index ec36a6118..c9307d2da 100755 --- a/apps/worker/worker_app/tasks/compose_video.py +++ b/apps/worker/worker_app/tasks/compose_video.py @@ -59,7 +59,6 @@ def compose_video(self, job_id: str, **kwargs): # 判断使用哪个渲染引擎 # 优先级：Redis Feature Flag（白名单 > 百分比） > 环境变量默认 from video_processing.render_engine_resolver import get_render_engine_resolver - from video_processing.render_metrics import render_task_metrics resolver = get_render_engine_resolver() user_id = job.created_by_user_id or None @@ -77,12 +76,10 @@ def compose_video(self, job_id: str, **kwargs): config.get("default_engine"), ) - # 灰度观测指标埋点 - with render_task_metrics(engine=engine, task_type="compose_video"): - if engine == "unified": - return _compose_with_unified_engine(self, job_service, job, plan_id, db) - else: - return _compose_with_legacy_engine(self, job_service, job, plan_id, db) + if engine == "unified": + return _compose_with_unified_engine(self, job_service, job, plan_id, db) + else: + return _compose_with_legacy_engine(self, job_service, job, plan_id, db) except self.retry_exc as exc: logger.warning("视频合成重试中: job_id=%s, exc=%s", job_id, exc) -- 2.54.0