Merge 5724d17 into c421b1d

Author: keitakn

src/PhpJsonLogger/JsonFormatter.php

@@ -19,6 +19,7 @@ public function format(array $record)
         $formattedRecord = [
             'log_level'         => $record['level_name'],
             'message'           => $record['message'],
+            'channel'           => $record['channel'],
             'trace_id'          => $record['extra']['trace_id'],
             'file'              => $record['extra']['file'],
             'line'              => $record['extra']['line'],

src/PhpJsonLogger/Logger.php

@@ -20,6 +20,12 @@ class Logger
      */
     private $traceId;
 
+    /**
+     * @var string
+     * @see \Monolog\Logger::$name
+     */
+    private $channel;
+
     /**
      * @var int
      */
@@ -56,6 +62,7 @@ public function __construct(LoggerBuilder $builder)
     {
         $this->createdTime = microtime(true);
         $this->traceId = $builder->getTraceId();
+        $this->channel = $builder->getChannel();
         $this->generateTraceIdIfNeeded();
         $this->logFileName = $builder->getFileName();
         $this->logLevel = $builder->getLogLevel();
@@ -83,9 +90,8 @@ public function __construct(LoggerBuilder $builder)
             return $record;
         };
 
-        // TODO The channel should be configurable from outside
         $this->monologInstance = new MonoLogger(
-            'PhpJsonLogger',
+            $this->getChannel(),
             [$rotating],
             [$introspection, $extraRecords]
         );
@@ -171,6 +177,14 @@ public function getTraceId(): string
         return $this->traceId;
     }
 
+    /**
+     * @return string
+     */
+    public function getChannel(): string
+    {
+        return $this->channel;
+    }
+
     /**
      * @return int
      */

src/PhpJsonLogger/LoggerBuilder.php

@@ -58,6 +58,11 @@ class LoggerBuilder
      */
     const EMERGENCY = 600;
 
+    /**
+     * @see \Monolog\Logger::$name
+     */
+    const DEFAULT_CHANNEL = 'PhpJsonLogger';
+
     /**
      * @see \Monolog\Processor\IntrospectionProcessor::$skipClassesPartials
      */
@@ -78,6 +83,12 @@ class LoggerBuilder
      */
     private $traceId;
 
+    /**
+     * @var string
+     * @see \Monolog\Logger::$name
+     */
+    private $channel;
+
     /**
      * @var int
      */
@@ -114,8 +125,9 @@ class LoggerBuilder
     public function __construct(string $traceId = '')
     {
         $this->traceId = $traceId;
-        $this->logLevel = self::INFO;
-        $this->fileName = '/tmp/php-json-logger.log';
+        $this->setChannel(self::DEFAULT_CHANNEL);
+        $this->setLogLevel(self::INFO);
+        $this->setFileName('/tmp/php-json-logger.log');
         $this->setSkipClassesPartials(self::DEFAULT_SKIP_CLASSES_PARTIALS);
         $this->setSkipStackFramesCount(self::DEFAULT_SKIP_STACK_FRAMES_COUNT);
         $this->setMaxFiles(self::DEFAULT_MAX_FILES);
@@ -137,6 +149,22 @@ public function setTraceId(string $traceId)
         $this->traceId = $traceId;
     }
 
+    /**
+     * @return string
+     */
+    public function getChannel(): string
+    {
+        return $this->channel;
+    }
+
+    /**
+     * @param string $channel
+     */
+    public function setChannel(string $channel)
+    {
+        $this->channel = $channel;
+    }
+
     /**
      * @return int
      */

tests/ExtendedMonologTest.php

@@ -94,6 +94,7 @@ public function outputInfoLog()
         $expectedLog = [
             'log_level'         => 'INFO',
             'message'           => 'outputInfoLogTest',
+            'channel'           => 'ExtendedMonolog',
             'trace_id'          => 'ExtendedMonologTestTraceId',
             'file'              => __FILE__,
             'line'              => 85,
@@ -136,9 +137,10 @@ public function outputErrorLog()
         $expectedLog = [
             'log_level'         => 'ERROR',
             'message'           => get_class($exception),
+            'channel'           => 'ExtendedMonolog',
             'trace_id'          => 'ExtendedMonologTestTraceId',
             'file'              => __FILE__,
-            'line'              => 126,
+            'line'              => 127,
             'context'           => $context,
             'remote_ip_address' => '127.0.0.1',
             'user_agent'        => 'unknown',

tests/Logger/AlertTest.php

@@ -62,6 +62,7 @@ public function outputAlertLog()
         $expectedLog = [
             'log_level'         => 'ALERT',
             'message'           => 'ErrorException',
+            'channel'           => 'PhpJsonLogger',
             'trace_id'          => $logger->getTraceId(),
             'file'              => __FILE__,
             'line'              => 53,

tests/Logger/CriticalTest.php

@@ -62,6 +62,7 @@ public function outputCriticalLog()
         $expectedLog = [
             'log_level'         => 'CRITICAL',
             'message'           => 'ErrorException',
+            'channel'           => 'PhpJsonLogger',
             'trace_id'          => $logger->getTraceId(),
             'file'              => __FILE__,
             'line'              => 53,

tests/Logger/DebugTest.php

@@ -61,6 +61,7 @@ public function outputDebugLog()
         $expectedLog = [
             'log_level'         => 'DEBUG',
             'message'           => '🐶',
+            'channel'           => 'PhpJsonLogger',
             'trace_id'          => $logger->getTraceId(),
             'file'              => __FILE__,
             'line'              => 52,

tests/Logger/EmergencyTest.php

@@ -63,6 +63,7 @@ public function outputEmergencyLog()
         $expectedLog = [
             'log_level'         => 'EMERGENCY',
             'message'           => 'ErrorException',
+            'channel'           => 'PhpJsonLogger',
             'trace_id'          => $logger->getTraceId(),
             'file'              => __FILE__,
             'line'              => 54,

tests/Logger/ErrorTest.php

@@ -62,6 +62,7 @@ public function outputErrorLog()
         $expectedLog = [
             'log_level'         => 'ERROR',
             'message'           => 'Exception',
+            'channel'           => 'PhpJsonLogger',
             'trace_id'          => $logger->getTraceId(),
             'file'              => __FILE__,
             'line'              => 53,

tests/Logger/InfoTest.php

@@ -66,6 +66,7 @@ public function outputInfoLog()
         $expectedLog = [
             'log_level'         => 'INFO',
             'message'           => '🐱',
+            'channel'           => 'PhpJsonLogger',
             'trace_id'          => $logger->getTraceId(),
             'file'              => __FILE__,
             'line'              => 57,