Merge pull request #7 from myLocalInfluence/rfe/handler-should-not-have-to-format#6

feat: Handle Mustn't Format Values

Author: kangoo13

.idea/laravel-datadog-logger.iml

@@ -28,7 +28,8 @@
   },
   "require-dev": {
     "phpunit/phpunit": ">=7.5.0",
-    "symfony/thanks": "*"
+    "symfony/thanks": "*",
+    "php-mock/php-mock-phpunit": "^2.4"
   },
   "autoload": {
     "psr-4": {

.idea/php.xml

@@ -21,6 +21,7 @@
     </filter>
     <php>
         <server name="APP_ENV" value="testing"/>
+        <server name="APP_NAME" value="laravel-datadog-logger"/>
         <server name="BCRYPT_ROUNDS" value="4"/>
         <server name="CACHE_DRIVER" value="array"/>
         <server name="MAIL_DRIVER" value="array"/>

composer.json

@@ -3,6 +3,7 @@
 namespace Myli\DatadogLogger;
 
 use Monolog\Formatter\JsonFormatter;
+use Monolog\Logger;
 
 /**
  * Class DataDogFormatter
@@ -14,6 +15,21 @@
  */
 class DataDogFormatter extends JsonFormatter
 {
+
+    /**
+     * Set this formatter to the logger
+     *
+     * @param $logger
+     *
+     * @return void
+     */
+    public function __invoke(Logger $logger)
+    {
+        foreach ($logger->getHandlers() as $handler) {
+            $handler->setFormatter($this);
+        }
+    }
+
     /**
      * Appends every variable needed by DataDog
      *
@@ -38,6 +54,9 @@ public function format(array $record)
         if (isset($record['level_name'])) {
             $record['status'] = $record['level_name'];
         }
+        $record['ddsource'] = 'php-' . php_sapi_name();
+        $record['service']  = env('APP_NAME');
+        $record['hostname'] = gethostname();
 
         return parent::format($record);
     }

phpunit.xml

@@ -108,7 +108,7 @@ protected function send(string $data) : void
     {
         $client = $this->getHttpClient();
         try {
-            $client->request('POST', sprintf('?ddsource=%s&service=%s&hostname=%s', 'php' . php_sapi_name(), env('APP_NAME'), gethostname()), [
+            $client->request('POST', '', [
                 'headers'         => [
                     'Content-Type' => 'application/json',
                 ],

src/DataDogFormatter.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Myli\Testing;
+
 use Monolog\Handler\MissingExtensionException;
 use Myli\DatadogLogger\CreateDataDogLogger;
 use Myli\DatadogLogger\DataDogHandler;

src/DataDogHandler.php

@@ -1,6 +1,11 @@
 <?php
 
+namespace Myli\Testing;
+
 use Illuminate\Support\Carbon;
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
+use Myli\DatadogLogger\DataDogFormatter;
 
 
 /**
@@ -12,6 +17,7 @@
  */
 class DataDogFormatterTest extends \PHPUnit\Framework\TestCase
 {
+    use \phpmock\phpunit\PHPMock;
 
     /**
      * @dataProvider recordProvider
@@ -23,13 +29,31 @@ class DataDogFormatterTest extends \PHPUnit\Framework\TestCase
      */
     public function testFormatRecord(array $inputRecord, string $expectedRecord)
     {
+        $time = $this->getFunctionMock('\Myli\DatadogLogger', "gethostname");
+        $time->expects($this->any())->willReturn('foohostname');
         $dataDogFormatter = new \Myli\DatadogLogger\DataDogFormatter();
 
         $record = $dataDogFormatter->format($inputRecord);
 
         self::assertEquals($expectedRecord, $record);
     }
 
+    /**
+     * Test Invoke DataDogFormatter
+     *
+     * @return void
+     * @throws \Exception
+     */
+    public function testInvoke()
+    {
+        $loggerMock = $this->createMock(Logger::class);
+        $streamHandler = new StreamHandler('foourl');
+        $loggerMock->method('getHandlers')->willReturn([$streamHandler]);
+        $dataDogFormatter = new \Myli\DatadogLogger\DataDogFormatter();
+        $dataDogFormatter->__invoke($loggerMock);
+        self::assertEquals(DataDogFormatter::class, get_class($streamHandler->getFormatter()));
+    }
+
     public function recordProvider()
     {
         return [
@@ -43,7 +67,7 @@ public function recordProvider()
                     "datetime"   => new Carbon('2019-08-14 09:58:10.764107', 'UTC'),
                     "extra"      => []
                 ],
-                '{"message":"test","context":[],"level":200,"level_name":"INFO","channel":null,"datetime":"2019-08-14T09:58:10.764107Z","extra":[],"published_date":"2019-08-14T09:58:10+0000","status":"INFO"}' . PHP_EOL
+                '{"message":"test","context":[],"level":200,"level_name":"INFO","channel":null,"datetime":"2019-08-14T09:58:10.764107Z","extra":[],"published_date":"2019-08-14T09:58:10+0000","status":"INFO","ddsource":"php-cli","service":"laravel-datadog-logger","hostname":"foohostname"}' . PHP_EOL
             ],
             [
                 [
@@ -57,7 +81,7 @@ public function recordProvider()
                     "datetime"   => new Carbon('2019-08-14 09:58:10.764107', 'UTC'),
                     "extra"      => []
                 ],
-                '{"message":"test","context":{"toto":"tata"},"level":100,"level_name":"DEBUG","channel":null,"datetime":"2019-08-14T09:58:10.764107Z","extra":[],"published_date":"2019-08-14T09:58:10+0000","status":"DEBUG"}' . PHP_EOL
+                '{"message":"test","context":{"toto":"tata"},"level":100,"level_name":"DEBUG","channel":null,"datetime":"2019-08-14T09:58:10.764107Z","extra":[],"published_date":"2019-08-14T09:58:10+0000","status":"DEBUG","ddsource":"php-cli","service":"laravel-datadog-logger","hostname":"foohostname"}' . PHP_EOL
             ]
         ];