Fix gelf formatter keys to strip invalid characters, fixes #1927

Seldaek · Dec 5, 2024 · 5958473 · 5958473
1 parent a258e4f
commit 5958473
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/Monolog/DateTimeImmutable.php b/src/Monolog/DateTimeImmutable.php
@@ -13,6 +13,7 @@
 
 class_alias(JsonSerializableDateTimeImmutable::class, 'Monolog\DateTimeImmutable');
 
+// @phpstan-ignore-next-line
 if (false) {
     /**
      * @deprecated Use \Monolog\JsonSerializableDateTimeImmutable instead.

diff --git a/src/Monolog/Formatter/GelfMessageFormatter.php b/src/Monolog/Formatter/GelfMessageFormatter.php
@@ -115,6 +115,7 @@ public function format(LogRecord $record): Message
         }
 
         foreach ($extra as $key => $val) {
+            $key = (string) preg_replace('#[^\w\.\-]#', '-', $key);
             $val = \is_scalar($val) || null === $val ? $val : $this->toJson($val);
             $len = \strlen($this->extraPrefix . $key . $val);
             if ($len > $this->maxLength) {
@@ -126,6 +127,7 @@ public function format(LogRecord $record): Message
         }
 
         foreach ($context as $key => $val) {
+            $key = (string) preg_replace('#[^\w\.\-]#', '-', $key);
             $val = \is_scalar($val) || null === $val ? $val : $this->toJson($val);
             $len = \strlen($this->contextPrefix . $key . $val);
             if ($len > $this->maxLength) {