feat: http request data

Signed-off-by: Andrii Nasinnyk <anasinnyk@macpaw.com>
MacPaw · Jun 22, 2020 · c9ca283 · c9ca283
1 parent 7645d26
commit c9ca283
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,8 @@
         }
     ],
     "require": {
-        "monolog/monolog": "^2.1"
+        "monolog/monolog": "^2.1",
+        "guzzlehttp/psr7": "^1.6"
     },
     "autoload": {
         "psr-4": {"MacPaw\\MonologGkeFormatter\\": "src"}

diff --git a/src/GkeFormatter.php b/src/GkeFormatter.php
@@ -2,20 +2,23 @@
 
 namespace MacPaw\MonologGkeFormatter;
 
+use GuzzleHttp\Psr7\ServerRequest;
 use Monolog\Formatter\JsonFormatter;
 
 class GkeFormatter extends JsonFormatter
 {
     public function format(array $record): string
     {
+        $request = ServerRequest::fromGlobals();
+
         return parent::format(
             array_merge(
                 $record['extra'],
-                isset($record['exception'])
+                isset($record['context']) && isset($record['context']['exception'])
                     ? [
                         'sourceLocation' => [
-                            'file' => str_split(':', $record['exception']['file'])[0],
-                            'line' => str_split(':', $record['exception']['file'])[1]
+                            'file' => str_split(':', $record['context']['exception']['file'])[0],
+                            'line' => str_split(':', $record['context']['exception']['file'])[1]
                         ]
                     ]
                     : [],
@@ -25,6 +28,16 @@ public function format(array $record): string
                     'severity' => $record['level_name'],
                     'serviceContext' => $record['context'],
                     'timestamp' => $record['datetime']->getTimestamp(),
+                    'httpRequest' => [
+                        'requestMethod' => $request->getMethod(),
+                        'requestUrl' => $request->getUri()->__toString(),
+                        'requestSize' => $request->getBody()->getSize(),
+                        'protocol' => $request->getProtocolVersion(),
+                        'referer' => $request->getHeader('Referer'),
+                        'userAgent' => $request->getHeader('User-Agent'),
+                        'remoteIp' => $request->getHeader('X-Forwarded-For'),
+                        'serverIp' => $_SERVER['SERVER_ADDR'],
+                    ],
                 ]
             )
         );