Merge branch 'dev_20241205' of ssh://gitlab.fuxicarbon.com:1111/client_service/voice-gateway-service into dev_20241205

src/core/callcenter/esl/handler/channel_hangup_handler.py

@@ -71,7 +71,7 @@ class ChannelHangupHandler(EslEventHandler):
 
             device_info.hangup_cause = cause
             device_info.sip_protocol = sip_protocol
-            device_info.sip_status = sip_status
+            device_info.sip_status = sip_status if sip_status else "EMPTY"
             device_info.channel_name = channel_name
             device_info.end_time = timestamp
 
@@ -111,11 +111,12 @@ class ChannelHangupHandler(EslEventHandler):
                 # self.inbound_client.hangup_call(call_id, device_id, CallCause.HANGUP_EVENT)
 
             if CallType.BOT_CALL.code == call_info.call_type and device_info.device_type == DeviceType.ROBOT.code:
-                registry.CALL_BOT_HANGUP_REQUESTS.labels(f"{call_info.bucket_type}").inc()
+                registry.CALL_BOT_HANGUP_REQUESTS.labels(f"{call_info.bucket_type}", f"{device_info.sip_status}").inc()
 
             # 全部挂机以后推送挂机状态
             # self.logger.info('yushanghui::call_info.device_list %s', call_info.device_list)
             if len(call_info.device_list) == 0:
+                self.release(event)
                 self.get_call_info_record(call_info)
 
             # 判断挂机方向 && 更新缓存

src/core/callcenter/registry.py

@@ -14,7 +14,7 @@ metrics = PrometheusMetrics(app)
 CALL_INCOMING_REQUESTS = Counter('call_incoming_requests', '呼入总流量', ['bucket'])
 CALL_BOT_ANSWER_REQUESTS = Counter('call_bot_answer_requests', '机器人接听量', ['bucket'])
 CALL_BOT_TRANSFER_REQUESTS = Counter('call_bot_transfer_requests', '机器转人量', ['bucket'])
-CALL_BOT_HANGUP_REQUESTS = Counter('call_bot_hangup_requests', '机器挂机量', ['bucket'])
+CALL_BOT_HANGUP_REQUESTS = Counter('call_bot_hangup_requests', '机器挂机量', ['bucket','sip_status'])
 
 BOT_INTERACTION_ROUNDS = Counter('bot_interaction_rounds',  '机器人交互轮次',['taskId'] )
 BOT_REQUEST_COUNT = Counter('bot_request_count',  'Total number of bot requests')

src/core/voip/bot.py

@@ -546,6 +546,7 @@ class BotAgent:
             self.accounts[user_part] = acc
 
         while not self.is_stopping:
+            registry.BOT_AGENT_LIVES.set(self.user_part_pool.qsize())
             self.ep.libHandleEvents(100)
 
     def transfer(self, user_part, call_id, device_id, service_id='00000000000000000'):
@@ -582,7 +583,7 @@ class BotAgent:
             self.release(user_part)
 
     def register(self, **kwargs):
-        registry.BOT_AGENT_LIVES.set(self.user_part_pool.qsize())
+        self.logger.info('register,come in, pool.size :%d', self.user_part_pool.qsize())
         user_part = self.user_part_pool.get()
         acc = self.accounts.get(user_part)
         self.logger.info('register, user_part :%d, pool.size :%d', user_part, self.user_part_pool.qsize())