1 files changed, 12 insertions, 77 deletions

diff --git a/src/Monolog/Formatter/LogstashFormatter.php b/src/Monolog/Formatter/LogstashFormatter.php
index 8f83bec..3cf31dd 100644
--- a/src/Monolog/Formatter/LogstashFormatter.php
+++ b/src/Monolog/Formatter/LogstashFormatter.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 /*
  * This file is part of the Monolog package.
@@ -15,15 +15,12 @@ namespace Monolog\Formatter;
  * Serializes a log message to Logstash Event Format
  *
  * @see http://logstash.net/
- * @see https://github.com/logstash/logstash/blob/master/lib/logstash/event.rb
+ * @see https://github.com/elastic/logstash/blob/master/logstash-core-event/lib/logstash/event.rb
  *
  * @author Tim Mower <timothy.mower@gmail.com>
  */
 class LogstashFormatter extends NormalizerFormatter
 {
-    const V0 = 0;
-    const V1 = 1;
-
     /**
      * @var string the name of the system for the Logstash log message, used to fill the @source field
      */
@@ -45,18 +42,12 @@ class LogstashFormatter extends NormalizerFormatter
     protected $contextPrefix;
 
     /**
-     * @var int logstash format version to use
-     */
-    protected $version;
-
-    /**
      * @param string $applicationName the application that sends the data, used as the "type" field of logstash
      * @param string $systemName      the system/machine name, used as the "source" field of logstash, defaults to the hostname of the machine
      * @param string $extraPrefix     prefix for extra keys inside logstash "fields"
      * @param string $contextPrefix   prefix for context keys inside logstash "fields", defaults to ctxt_
-     * @param int    $version         the logstash format version to use, defaults to 0
      */
-    public function __construct($applicationName, $systemName = null, $extraPrefix = null, $contextPrefix = 'ctxt_', $version = self::V0)
+    public function __construct(string $applicationName, string $systemName = null, string $extraPrefix = null, string $contextPrefix = 'ctxt_')
     {
         // logstash requires a ISO 8601 format date with optional millisecond precision.
         parent::__construct('Y-m-d\TH:i:s.uP');
@@ -65,78 +56,23 @@ class LogstashFormatter extends NormalizerFormatter
         $this->applicationName = $applicationName;
         $this->extraPrefix = $extraPrefix;
         $this->contextPrefix = $contextPrefix;
-        $this->version = $version;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function format(array $record)
+    public function format(array $record): string
     {
         $record = parent::format($record);
 
-        if ($this->version === self::V1) {
-            $message = $this->formatV1($record);
-        } else {
-            $message = $this->formatV0($record);
-        }
-
-        return $this->toJson($message) . "\n";
-    }
-
-    protected function formatV0(array $record)
-    {
         if (empty($record['datetime'])) {
             $record['datetime'] = gmdate('c');
         }
-        $message = array(
-            '@timestamp' => $record['datetime'],
-            '@source' => $this->systemName,
-            '@fields' => array(),
-        );
-        if (isset($record['message'])) {
-            $message['@message'] = $record['message'];
-        }
-        if (isset($record['channel'])) {
-            $message['@tags'] = array($record['channel']);
-            $message['@fields']['channel'] = $record['channel'];
-        }
-        if (isset($record['level'])) {
-            $message['@fields']['level'] = $record['level'];
-        }
-        if ($this->applicationName) {
-            $message['@type'] = $this->applicationName;
-        }
-        if (isset($record['extra']['server'])) {
-            $message['@source_host'] = $record['extra']['server'];
-        }
-        if (isset($record['extra']['url'])) {
-            $message['@source_path'] = $record['extra']['url'];
-        }
-        if (!empty($record['extra'])) {
-            foreach ($record['extra'] as $key => $val) {
-                $message['@fields'][$this->extraPrefix . $key] = $val;
-            }
-        }
-        if (!empty($record['context'])) {
-            foreach ($record['context'] as $key => $val) {
-                $message['@fields'][$this->contextPrefix . $key] = $val;
-            }
-        }
-
-        return $message;
-    }
-
-    protected function formatV1(array $record)
-    {
-        if (empty($record['datetime'])) {
-            $record['datetime'] = gmdate('c');
-        }
-        $message = array(
+        $message = [
             '@timestamp' => $record['datetime'],
             '@version' => 1,
             'host' => $this->systemName,
-        );
+        ];
         if (isset($record['message'])) {
             $message['message'] = $record['message'];
         }
@@ -147,20 +83,19 @@ class LogstashFormatter extends NormalizerFormatter
         if (isset($record['level_name'])) {
             $message['level'] = $record['level_name'];
         }
+        if (isset($record['level'])) {
+            $message['monolog_level'] = $record['level'];
+        }
         if ($this->applicationName) {
             $message['type'] = $this->applicationName;
         }
         if (!empty($record['extra'])) {
-            foreach ($record['extra'] as $key => $val) {
-                $message[$this->extraPrefix . $key] = $val;
-            }
+            $message[$this->extraPrefix.'extra'] = $record['extra'];
         }
         if (!empty($record['context'])) {
-            foreach ($record['context'] as $key => $val) {
-                $message[$this->contextPrefix . $key] = $val;
-            }
+            $message[$this->contextPrefix.'context'] = $record['context'];
         }
 
-        return $message;
+        return $this->toJson($message) . "\n";
     }
 }