metrics调整

This commit is contained in:
2025-03-23 18:36:26 +08:00
parent 6dc7e86e8e
commit b8db0d2b95
5 changed files with 71 additions and 17 deletions

View File

@ -3,6 +3,7 @@ import logging
import os
import requests
from opentelemetry.trace import Status, StatusCode
import util.system
from telemetry import get_tracer
@ -25,7 +26,7 @@ def sync_center():
from template import TEMPLATES, download_template
tracer = get_tracer(__name__)
with tracer.start_as_current_span("sync_center"):
with get_tracer("api").start_as_current_span("sync_center.request") as req_span:
with tracer.start_as_current_span("sync_center.request") as req_span:
try:
req_span.set_attribute("http.method", "POST")
req_span.set_attribute("http.url", os.getenv('API_ENDPOINT') + "/sync")
@ -69,7 +70,7 @@ def get_template_info(template_id):
"""
tracer = get_tracer(__name__)
with tracer.start_as_current_span("get_template_info"):
with get_tracer("api").start_as_current_span("get_template_info.request") as req_span:
with tracer.start_as_current_span("get_template_info.request") as req_span:
try:
req_span.set_attribute("http.method", "POST")
req_span.set_attribute("http.url", '{0}/template/{1}'.format(os.getenv('API_ENDPOINT'), template_id))
@ -146,7 +147,7 @@ def get_template_info(template_id):
def report_task_success(task_info, **kwargs):
tracer = get_tracer(__name__)
with tracer.start_as_current_span("report_task_success"):
with get_tracer("api").start_as_current_span("report_task_success.request") as req_span:
with tracer.start_as_current_span("report_task_success.request") as req_span:
try:
req_span.set_attribute("http.method", "POST")
req_span.set_attribute("http.url",
@ -158,6 +159,7 @@ def report_task_success(task_info, **kwargs):
req_span.set_attribute("http.status_code", response.status_code)
req_span.set_attribute("http.response", response.text)
response.raise_for_status()
req_span.set_status(Status(StatusCode.OK))
except requests.RequestException as e:
req_span.set_attribute("api.error", str(e))
logger.error("请求失败!", e)
@ -167,7 +169,7 @@ def report_task_success(task_info, **kwargs):
def report_task_start(task_info):
tracer = get_tracer(__name__)
with tracer.start_as_current_span("report_task_start"):
with get_tracer("api").start_as_current_span("report_task_start.request") as req_span:
with tracer.start_as_current_span("report_task_start.request") as req_span:
try:
req_span.set_attribute("http.method", "POST")
req_span.set_attribute("http.url",
@ -178,6 +180,7 @@ def report_task_start(task_info):
req_span.set_attribute("http.status_code", response.status_code)
req_span.set_attribute("http.response", response.text)
response.raise_for_status()
req_span.set_status(Status(StatusCode.OK))
except requests.RequestException as e:
req_span.set_attribute("api.error", str(e))
logger.error("请求失败!", e)
@ -187,7 +190,7 @@ def report_task_start(task_info):
def report_task_failed(task_info, reason=''):
tracer = get_tracer(__name__)
with tracer.start_as_current_span("report_task_failed"):
with get_tracer("api").start_as_current_span("report_task_failed.request") as req_span:
with tracer.start_as_current_span("report_task_failed.request") as req_span:
try:
req_span.set_attribute("http.method", "POST")
req_span.set_attribute("http.url",
@ -199,8 +202,10 @@ def report_task_failed(task_info, reason=''):
req_span.set_attribute("http.status_code", response.status_code)
req_span.set_attribute("http.response", response.text)
response.raise_for_status()
req_span.set_status(Status(StatusCode.OK))
except requests.RequestException as e:
req_span.set_attribute("api.error", str(e))
req_span.set_status(Status(StatusCode.ERROR))
logger.error("请求失败!", e)
return None
@ -210,8 +215,8 @@ def upload_task_file(task_info, ffmpeg_task):
with get_tracer("api").start_as_current_span("upload_task_file") as span:
logger.info("开始上传文件: %s", task_info.get("id"))
span.set_attribute("file.id", task_info.get("id"))
try:
with tracer.start_as_current_span("upload_task_file.request_upload_url") as req_span:
with tracer.start_as_current_span("upload_task_file.request_upload_url") as req_span:
try:
req_span.set_attribute("http.method", "POST")
req_span.set_attribute("http.url",
'{0}/{1}/uploadUrl'.format(os.getenv('API_ENDPOINT'), task_info.get("id")))
@ -222,10 +227,12 @@ def upload_task_file(task_info, ffmpeg_task):
req_span.set_attribute("http.status_code", response.status_code)
req_span.set_attribute("http.response", response.text)
response.raise_for_status()
except requests.RequestException as e:
span.set_attribute("api.error", str(e))
logger.error("请求失败!", e)
return False
req_span.set_status(Status(StatusCode.OK))
except requests.RequestException as e:
span.set_attribute("api.error", str(e))
req_span.set_status(Status(StatusCode.ERROR))
logger.error("请求失败!", e)
return False
data = response.json()
url = data.get('data', "")
logger.info("开始上传文件: %s%s", task_info.get("id"), url)