Merge pull request #22 from Mapudo/MAP-2890

MAP-2890

CHANGELOG.md

@@ -4,6 +4,10 @@ All Notable changes to `mapudo/guzzle-bundle` will be documented in this file.
 
 Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [2.2.0] - 2018-11-29
+### Changed
+- Add `duration` property to be logged in `LogMiddleware` to keep track of the request duration
+
 ## [2.1.1] - 2018-01-11
 ### Changed 
 - Changed the template include paths

src/Middleware/LogMiddleware.php

@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\MessageFormatter;
+use GuzzleHttp\TransferStats;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
@@ -56,25 +57,22 @@ public function log(): \Closure
 
         return function (callable $handler) use ($logger, $formatter) {
             return function (RequestInterface $request, array $options) use ($handler, $logger, $formatter) {
+                $duration = null;
+                $options['on_stats'] = function (TransferStats $stats) use (&$duration) {
+                    $duration = $stats->getTransferTime();
+                };
+
                 return $handler($request, $options)->then(
-                    function (ResponseInterface $response) use ($logger, $request, $formatter) {
+                    function (ResponseInterface $response) use ($logger, $request, $formatter, $duration) {
                         $message = $formatter->format($request, $response);
-                        $request->getBody()->rewind();
-                        $context = [
-                            'request' => $this->normalizer->normalize($request),
-                            'response' => $this->normalizer->normalize($response),
-                            'client' => $this->clientName,
-                        ];
-                        $logger->info($message, $context);
+                        $logger->info($message, $this->buildContext($request, $response, $duration));
 
                         return $response;
                     },
-                    function ($reason) use ($logger, $request, $formatter) {
+                    function ($reason) use ($logger, $request, $formatter, $duration) {
                         $response = $reason instanceof RequestException ? $reason->getResponse() : null;
                         $message  = $formatter->format($request, $response, $reason);
-                        $context  = compact('request', 'response');
-
-                        $logger->notice($message, $context);
+                        $logger->error($message, $this->buildContext($request, $response, $duration));
 
                         return \GuzzleHttp\Promise\rejection_for($reason);
                     }
@@ -94,4 +92,23 @@ public function setClientName(string $clientName): LogMiddleware
         $this->clientName = $clientName;
         return $this;
     }
+
+    private function buildContext(
+        RequestInterface $request,
+        ResponseInterface $response = null,
+        float $duration = null
+    ): array {
+        $request->getBody()->rewind();
+        $context = [
+            'request' => $this->normalizer->normalize($request),
+            'client' => $this->clientName,
+            'duration' => $duration,
+        ];
+
+        if ($response !== null) {
+            $context['response'] = $this->normalizer->normalize($response);
+        }
+
+        return $context;
+    }
 }