From 3dc2eaffdb0ae8c90f2e8baf8b9af3a0503942fb Mon Sep 17 00:00:00 2001 From: "ChangLong.Xu" Date: Sun, 26 Jul 2020 18:19:25 +0800 Subject: [PATCH] combine the get --- src/Log/EagleEye.php | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/Log/EagleEye.php b/src/Log/EagleEye.php index e42e4fe..744961d 100644 --- a/src/Log/EagleEye.php +++ b/src/Log/EagleEye.php @@ -192,19 +192,28 @@ public static function requestStart($trace_id = "", $rpc_id = "") */ public static function requestFinished() { + $requestInfo = RequestContext::getMulti([ + self::FIELD_VERSION => ["key" => "x_version", "default" => "fend-1.2"], + self::FIELD_TRACE_ID => ["key" => "x_trace_id"], + self::FIELD_DEPARTMENT => ["key" => "x_department", "default" => "tal_wx"], + self::FIELD_START_TIMESTAMP => ["key" => "x_timestamp"], + self::FIELD_PID => ["key" => "x_pid"], + self::FIELD_EXTRA_CONTEXT => ["key" => "x_extra", "default" => []], + ]); + //set at first $log = array( "x_name" => "request.info", - "x_version" => RequestContext::get(self::FIELD_VERSION, "fend-1.2"), - "x_trace_id" => RequestContext::get(self::FIELD_TRACE_ID), + "x_version" => $requestInfo["x_version"], + "x_trace_id" => $requestInfo["x_trace_id"], "x_rpc_id" => self::getReciveRpcId() . ".1", - "x_department" => RequestContext::get(self::FIELD_DEPARTMENT, "tal_wx"), + "x_department" => $requestInfo["x_department"], "x_server_ip" => self::getServerIp(), - "x_timestamp" => (int)RequestContext::get(self::FIELD_START_TIMESTAMP), - "x_duration" => round(microtime(true) - RequestContext::get(self::FIELD_START_TIMESTAMP), 4), - "x_pid" => RequestContext::get(self::FIELD_PID), + "x_timestamp" => (int)$requestInfo["x_timestamp"], + "x_duration" => round(microtime(true) - $requestInfo["x_timestamp"], 4), + "x_pid" => $requestInfo["x_pid"], "x_module" => "php_request_end", - "x_extra" => RequestContext::get(self::FIELD_EXTRA_CONTEXT, []) + "x_extra" => $requestInfo["x_extra"] ); //option value added