[MonologBridge] Fixed support of elasticsearch 7.+ in ElasticsearchLogstashHandler

lyrixx · lyrixx · commit 3e158526265b · 2022-06-15T18:57:10.000+02:00
diff --git a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php
@@ -48,11 +48,12 @@ class ElasticsearchLogstashHandler extends AbstractHandler
     private $index;
     private $client;
     private $responses;
+    private $elasticversion;
 
     /**
      * @param string|int $level The minimum logging level at which this handler will be triggered
      */
-    public function __construct(string $endpoint = 'http://127.0.0.1:9200', string $index = 'monolog', HttpClientInterface $client = null, $level = Logger::DEBUG, bool $bubble = true)
+    public function __construct(string $endpoint = 'http://127.0.0.1:9200', ?string $index = 'monolog', HttpClientInterface $client = null, $level = Logger::DEBUG, bool $bubble = true, string $elasticversion = '1.0.0')
     {
         if (!interface_exists(HttpClientInterface::class)) {
             throw new \LogicException(sprintf('The "%s" handler needs an HTTP client. Try running "composer require symfony/http-client".', __CLASS__));
@@ -63,6 +64,7 @@ public function __construct(string $endpoint = 'http://127.0.0.1:9200', string $
         $this->index = $index;
         $this->client = $client ?: HttpClient::create(['timeout' => 1]);
         $this->responses = new \SplObjectStorage();
+        $this->elasticversion = $elasticversion;
     }
 
     public function handle(array $record): bool
@@ -100,18 +102,28 @@ private function sendToElasticsearch(array $records)
     {
         $formatter = $this->getFormatter();
 
+        if (version_compare($this->elasticversion, '7', '>=')) {
+            $headers = json_encode([
+                'index' => [
+                    '_index' => $this->index,
+                ],
+            ]);
+        } else {
+            $headers = json_encode([
+                'index' => [
+                    '_index' => $this->index,
+                    '_type' => '_doc',
+                ],
+            ]);
+        }
+
         $body = '';
         foreach ($records as $record) {
             foreach ($this->processors as $processor) {
                 $record = $processor($record);
             }
 
-            $body .= json_encode([
-                'index' => [
-                    '_index' => $this->index,
-                    '_type' => '_doc',
-                ],
-            ]);
+            $body .= $headers;
             $body .= "\n";
             $body .= $formatter->format($record);
             $body .= "\n";
diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/ElasticsearchLogstashHandlerTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/ElasticsearchLogstashHandlerTest.php
@@ -64,6 +64,49 @@ public function testHandle()
         $this->assertSame(1, $callCount);
     }
 
+    public function testHandleWithElasticsearch8()
+    {
+        $callCount = 0;
+        $responseFactory = function ($method, $url, $options) use (&$callCount) {
+            $body = <<<EOBODY
+{"index":{"_index":"log"}}
+{"@timestamp":"2020-01-01T00:00:00.000000+01:00","@version":1,"host":"my hostname","message":"My info message","type":"application","channel":"app","level":"INFO","monolog_level":200}
+
+
+EOBODY;
+
+            // Monolog 1X
+            if (\defined(LogstashFormatter::class.'::V1')) {
+                $body = str_replace(',"monolog_level":200', '', $body);
+                $body = str_replace(',"monolog_level":300', '', $body);
+            }
+
+            $this->assertSame('POST', $method);
+            $this->assertSame('http://es:9200/_bulk', $url);
+            $this->assertSame($body, $options['body']);
+            $this->assertSame('Content-Type: application/json', $options['normalized_headers']['content-type'][0]);
+            ++$callCount;
+
+            return new MockResponse();
+        };
+
+        $handler = new ElasticsearchLogstashHandlerWithHardCodedHostname('http://es:9200', 'log', new MockHttpClient($responseFactory), Logger::DEBUG, true, '8.0.0');
+
+        $record = [
+            'message' => 'My info message',
+            'context' => [],
+            'level' => Logger::INFO,
+            'level_name' => Logger::getLevelName(Logger::INFO),
+            'channel' => 'app',
+            'datetime' => new \DateTime('2020-01-01T00:00:00+01:00'),
+            'extra' => [],
+        ];
+
+        $handler->handle($record);
+
+        $this->assertSame(1, $callCount);
+    }
+
     public function testBandleBatch()
     {
         $callCount = 0;
