Merge pull request #131 from F21/timetaken

frankmayer · frankmayer · commit eeb39f713d6b · 2013-05-16T09:48:07.000-07:00
Added time taken to the tracer.
diff --git a/lib/triagens/ArangoDb/Connection.php b/lib/triagens/ArangoDb/Connection.php
@@ -350,8 +350,9 @@ private function executeRequest($method, $url, $data)
         $handle = $this->getHandle();
         if ($handle) {
             // send data and get response back
+            $startTime = microtime(true);
             $result = HttpHelper::transfer($handle, $request);
-
+            $timeTaken = microtime(true) - $startTime;
             $status = socket_get_status($handle);
 
             if (!$this->_useKeepAlive) {
@@ -371,7 +372,7 @@ private function executeRequest($method, $url, $data)
                 // call tracer func
                 if ($this->_options[ConnectionOptions::OPTION_ENHANCED_TRACE]) {
                     $traceFunc(
-                        new TraceResponse($response->getHeaders(), $response->getHttpCode(), $response->getBody())
+                        new TraceResponse($response->getHeaders(), $response->getHttpCode(), $response->getBody(), $timeTaken)
                     );
                 } else {
                     $traceFunc('receive', $result);
diff --git a/lib/triagens/ArangoDb/TraceResponse.php b/lib/triagens/ArangoDb/TraceResponse.php
@@ -46,6 +46,12 @@ class TraceResponse
      */
     private $_type = "response";
 
+    /**
+     * The time taken to send and receive a response in seconds
+     * @var float
+     */
+    private $_timeTaken;
+
     /**
      * Used to look up the definition for an http code
      *
@@ -102,11 +108,12 @@ class TraceResponse
      * @param int    $httpCode - the http code
      * @param string $body     - the string of http body
      */
-    public function __construct($headers, $httpCode, $body)
+    public function __construct($headers, $httpCode, $body, $timeTaken)
     {
         $this->_headers  = $headers;
         $this->_httpCode = $httpCode;
         $this->_body     = $body;
+        $this->_timeTaken = $timeTaken;
     }
 
     /**
@@ -163,4 +170,12 @@ public function getType()
     {
         return $this->_type;
     }
+
+    /**
+     * Get the time taken for this request
+     */
+    public function getTimeTaken()
+    {
+        return $this->_timeTaken;
+    }
 }
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -145,6 +145,7 @@ public function testEnhancedTracer()
                     'Http code definition must be a string!'
                 );
                 $self->assertEquals('response', $data->getType());
+                $self->assertInternalType('float', $data->getTimeTaken());
             }
         };
 

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@ public function testEnhancedTracer()`
`145`	`145`	`'Http code definition must be a string!'`
`146`	`146`	`);`
`147`	`147`	`$self->assertEquals('response', $data->getType());`
	`148`	`+ $self->assertInternalType('float', $data->getTimeTaken());`
`148`	`149`	`}`
`149`	`150`	`};`
`150`	`151`