Simplify logging

* Use static serviceContext as "source". What else should it be?
* Get rid of "PHP Warning" and introduce severity with "error"
* Remove "context", because every field is context.
* Drop the stacktrace, because it too very long (line gets cut off in Loki)
* Add additionalData. Our Sentry Client could then pass its EventId with it.

Author: Christoph Lehmann

Classes/Log/ThrowableStorage/ConsoleStorage.php

@@ -4,7 +4,6 @@
 
 namespace Networkteam\Util\Log\ThrowableStorage;
 
-use Neos\Flow\Configuration\ConfigurationManager;
 use Neos\Flow\Core\Bootstrap;
 use Neos\Flow\Http\HttpRequestHandlerInterface;
 use Neos\Flow\Log\Exception\CouldNotOpenResourceException;
@@ -48,30 +47,18 @@ public static function createWithOptions(array $options): ThrowableStorageInterf
 
     public function logThrowable(\Throwable $throwable, array $additionalData = [])
     {
-        if (Bootstrap::$staticObjectManager instanceof ObjectManagerInterface) {
-            $bootstrap = Bootstrap::$staticObjectManager->get(Bootstrap::class);
-            /** @var ConfigurationManager $configurationManager */
-            $configurationManager = $bootstrap->getEarlyInstance(ConfigurationManager::class);
-
-            $serviceContext = $configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS,
-                'Networkteam.Util.serviceContext');
-        } else { // @phpstan-ignore-line
-            $serviceContext = 'neos-flow';
-        }
-
         $data = [
             'eventTime' => (new \DateTime('now'))->format(DATE_RFC3339),
-            'serviceContext' => $serviceContext,
-            'message' => sprintf('PHP Warning: %s', $throwable->getMessage()),
-            'stackTrace' => $throwable->getTraceAsString(),
-            'context' => [
-                'httpRequest' => $this->getHttpRequestContext(),
-                'reportLocation' => [
-                    'filePath' => $throwable->getFile(),
-                    'lineNumber' => $throwable->getLine(),
-                    'functionName' => self::getFunctionNameForTrace($throwable->getTrace()),
-                ],
-            ]
+            'severity' => 'error',
+            'message' => $throwable->getMessage(),
+            'errorLocation' => [
+                'filePath' => $throwable->getFile(),
+                'lineNumber' => $throwable->getLine(),
+                'functionName' => self::getFunctionNameForTrace($throwable->getTrace()),
+            ],
+            'httpRequest' => $this->getHttpRequestContext(),
+            'additionalData' => $additionalData,
+            'source' => 'neos-flow'
         ];
 
         $output = json_encode($data);

Configuration/Settings.yaml

@@ -1,6 +1,5 @@
 Networkteam:
   Util:
-    serviceContext: 'neos-flow'
     OpenExchangeRateConverter:
       appId: 'b05f50cd27864a519887e3141c64cb34'
       baseUrl: 'http://openexchangerates.org/api/'