Merge pull request #3 from auwaerter/master

Migration to a PSR-15 Middleware for Flow 8 compatibility

Classes/HttpMetricsCollectorComponent.php

@@ -9,13 +9,15 @@
  */
 
 use Flownative\Prometheus\CollectorRegistry;
-use Neos\Flow\Http\Component\ComponentContext;
-use Neos\Flow\Http\Component\ComponentInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\MiddlewareInterface;
 
 /**
- * HTTP component which collects HTTP-related metrics for Prometheus
+ * PSR-15 Middleware that collects HTTP-related metrics for Prometheus
  */
-class HttpMetricsCollectorComponent implements ComponentInterface
+class HttpMetricsCollectorComponent implements MiddlewareInterface
 {
     /**
      * @var CollectorRegistry
@@ -32,14 +34,18 @@ public function injectCollectorRegistry(CollectorRegistry $collectorRegistry): v
         $this->collectorRegistry = $collectorRegistry;
     }
 
-    /**
-     * @param ComponentContext $componentContext
-     */
-    public function handle(ComponentContext $componentContext): void
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
+        // Handle the request and get the response from the next middleware in the chain
+        $response = $handler->handle($request);
+
+        // Collect metrics based on the HTTP response status
         $this->collectorRegistry->getCounter('neos_flow_http_requests_total')
             ->inc(1, [
-                'status' => $componentContext->getHttpResponse()->getStatusCode()
+                'status' => $response->getStatusCode()
             ]);
+
+        // Return the processed response
+        return $response;
     }
 }

Configuration/Settings.Http.yaml

@@ -1,10 +1,7 @@
 Neos:
   Flow:
     http:
-      chain:
-        'postprocess':
-          chain:
-            'Flownative.Prometheus:metricsExporter':
-              'position': 'end'
-              component: 'Flownative\Prometheus\FlowMetrics\HttpMetricsCollectorComponent'
-              componentOptions: []
+      middlewares:
+        'metrics':
+          position: 'start'
+          middleware: 'Flownative\Prometheus\FlowMetrics\HttpMetricsCollectorComponent'

composer.json

@@ -1,8 +1,8 @@
 {
     "name": "flownative/prometheus-flow-metrics",
-    "license": "MIT",
     "type": "neos-package",
     "description": "Prometheus metrics for Neos Flow applications",
+    "license": "MIT",
     "authors": [
         {
             "name": "Robert Lemke",
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "neos/flow": "5.* || 6.* || @dev",
+        "neos/flow": "7.* || 8.* || @dev",
         "flownative/prometheus": "0.* || @dev"
     },
     "suggest": {