debug

src/core/callcenter/esl/client.py

@@ -50,7 +50,6 @@ class InboundClient:
         self.handler_table = self.scan_esl_event_handlers()
         self.default_event_handler = DefaultEslEventHandler(self, self.bot_agent)
         self.host, self.port, self.password = SERVE_HOST, '8021', '4918257983818884358'
-        self.ESL_EVENT_LATENCY = registry.new_histogram('liuwei_esl_event_latency_seconds', 'Esl Event latency in seconds', ['eventName'])
         self.executors = {x: concurrent.futures.ThreadPoolExecutor(max_workers=1) for x in range(self.thread_num)}
         self.delay_action_executor = concurrent.futures.ThreadPoolExecutor(max_workers=5)
         self.delay_action_scheduler = BackgroundScheduler()
@@ -138,8 +137,8 @@ class InboundClient:
         except:
             traceback.print_exc()
         finally:
-            latency = time.time() - start_time
-            self.ESL_EVENT_LATENCY.labels(event_name).observe(latency)
+            latency = (time.time() - start_time) * 1000
+            registry.ESL_EVENT_LATENCY.labels(event_name).observe(latency)
 
     def do_delay_action(self, action, message):
         delay_action = DelayAction.from_json(message)

src/core/callcenter/registry.py

@@ -10,10 +10,9 @@ from prometheus_flask_exporter import PrometheusMetrics
 
 metrics = PrometheusMetrics(app)
 
-def new_histogram(name: str,
-                 documentation: str,
-                 labelnames: Iterable[str] = (), **kwargs):
-    return Histogram(name, documentation, labelnames, **kwargs)
+
+ESL_EVENT_LATENCY = Histogram('esl_event_latency_seconds', 'Esl Event latency in seconds', ['eventName'])
+
 
 def counter(name, description, labels=None, initial_value_when_only_static_labels=True, **kwargs):
     return metrics.counter(name, description, labels, initial_value_when_only_static_labels, **kwargs)

src/core/callcenter/views.py

@@ -1,18 +1,16 @@
 #!/usr/bin/env python3
 # encoding:utf-8
-import time
-from . import app
+from flask import request, render_template_string
+
 from src.core.callcenter.agent import AgentService, AgentOperService
+from src.core.callcenter.api import AgentCallRequest, AgentActionRequest, HangupCallRequest
+from src.core.callcenter.call import CallService
 from src.core.callcenter.constant import success_response
 from src.core.callcenter.enumeration import CallType
 from src.core.callcenter.esl.client import InboundClient, OutboundClient
-from flask import request, render_template_string, g
-
-from src.core.callcenter.call import CallService
-from src.core.callcenter.api import AgentCallRequest, AgentActionRequest, HangupCallRequest
 from src.core.voip.bot import BotAgent
+from . import app
 from .acd import AcdService
-from src.core.callcenter import registry
 
 agent = BotAgent(app)
 inbound_client = InboundClient(agent,app)
@@ -23,20 +21,6 @@ agent_oper_service = AgentOperService(app)
 acd_service = AcdService(inbound_client, app)
 agent.acd_service = acd_service
 
-REQUEST_LATENCY = registry.new_histogram('liuwei_request_latency_seconds', 'Request latency in seconds', ['method', 'endpoint'])
-
-@app.before_request
-def start_timer():
-    """在请求开始时记录时间"""
-    g.start_time = time.time()
-
-@app.after_request
-def record_latency(response):
-    """请求结束时计算耗时，并将其上报到 Prometheus"""
-    latency = time.time() - g.start_time
-    REQUEST_LATENCY.labels(request.method, request.path).observe(latency)
-    return response
-
 
 @app.route('/')
 def index():