merge in fifo demo

Author: clegginabox

Dockerfile

@@ -28,9 +28,11 @@ COPY . /app
 
 WORKDIR /app/examples
 
-RUN composer install --no-interaction --prefer-dist --ignore-platform-reqs
+#RUN composer install --no-interaction --prefer-dist --ignore-platform-reqs
 
 COPY --from=node-build /app/examples/public/build ./public/build
 COPY --from=roadrunner /usr/bin/rr /usr/local/bin/rr
 
+COPY docker-entrypoint.sh /usr/local/bin/
+ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["rr", "serve"]

compose.yaml

@@ -1,6 +1,7 @@
 services:
   gateway:
     image: caddy:2-alpine
+    restart: unless-stopped
     volumes:
       - ./examples/Caddyfile:/etc/caddy/Caddyfile:ro
     ports:
@@ -14,13 +15,16 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
+    restart: unless-stopped
     environment:
       REDIS_HOST: redis
       REDIS_PORT: 6379
       MERCURE_HUB_URL: http://mercure/.well-known/mercure
       MERCURE_JWT_SECRET: ${MERCURE_JWT_SECRET:-airlock-mercure-secret-32chars-minimum}
       MERCURE_PUBLIC_URL: ${MERCURE_PUBLIC_URL:-http://localhost/.well-known/mercure}
       VITE_DEV: ${VITE_DEV:-false}
+    ports:
+      - "2112:2112"
     volumes:
       - ./examples:/app/examples
       - ./src:/app/src
@@ -35,6 +39,7 @@ services:
       context: .
       dockerfile: Dockerfile
     command: supervisord -n -c /app/examples/supervisord.conf
+    restart: unless-stopped
     environment:
       REDIS_HOST: redis
       REDIS_PORT: 6379
@@ -51,6 +56,7 @@ services:
 
   mercure:
     image: dunglas/mercure
+    restart: unless-stopped
     environment:
       SERVER_NAME: :80
       MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_JWT_SECRET:-airlock-mercure-secret-32chars-minimum}
@@ -62,15 +68,32 @@ services:
 
   centrifugo:
     image: centrifugo/centrifugo:v5
+    restart: unless-stopped
     volumes:
       - ./examples/config.json:/centrifugo/config.json:ro
     command: centrifugo --config config.json
 
   redis:
     image: redis:8.4.0
+    restart: unless-stopped
     ports:
       - "6379:6379"
 
+  prometheus:
+    image: prom/prometheus:v3.5.1
+    restart: unless-stopped
+    volumes:
+      - ./prometheus/:/etc/prometheus/
+      - prometheus_data:/prometheus
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--storage.tsdb.path=/prometheus'
+      - '--web.console.libraries=/usr/share/prometheus/console_libraries'
+      - '--web.console.templates=/usr/share/prometheus/consoles'
+    ports:
+      - "9090:9090"
+
+
   e2e:
     build:
       context: e2e
@@ -86,3 +109,6 @@ services:
       - gateway
     command: >
       sh -c "npm install && npx playwright test"
+
+volumes:
+  prometheus_data:

docker-entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# Re-generate autoloader so volume-mounted source changes are picked up.
+# Without this, the classmap baked at build time goes stale when ./src or
+# ./examples are mounted over the image layer at runtime.
+composer dump-autoload --no-interaction --quiet 2>/dev/null || true
+php app.php cache:clean || true
+
+exec "$@"

examples/.rr.yaml

@@ -1,31 +1,55 @@
 version: '3'
+
 rpc:
     listen: 'tcp://127.0.0.1:6001'
+
 http:
     address: '0.0.0.0:8080'
     middleware:
         - gzip
         - static
+        - http_metrics
     static:
         dir: public
         forbid:
             - .php
             - .htaccess
     pool:
-        debug: false
+        debug: true
         num_workers: 4
         supervisor:
             max_worker_memory: 100
+
 server:
     command: 'php app.php'
     relay: pipes
+
 kv:
     local:
         driver: memory
         config:
             interval: 60
-jobs:
-    pool:
-        num_workers: 2
-        max_worker_memory: 100
-    consume: {  }
+
+metrics:
+    address: 0.0.0.0:2112
+
+    collect:
+        airlock_entries_total:
+            type: counter
+            labels: [ "airlock", "result" ]
+
+        airlock_leaves_total:
+            type: counter
+            labels: [ "airlock" ]
+
+        airlock_releases_total:
+            type: counter
+            labels: [ "airlock" ]
+
+        airlock_refreshes_total:
+            type: counter
+            labels: [ "airlock", "result" ]
+
+        airlock_entry_duration_seconds:
+            type: histogram
+            labels: [ "airlock" ]

examples/app/src/Application/Bootloader/MercureBootloader.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Application\Bootloader;
+
+use Clegginabox\Airlock\Bridge\Symfony\Mercure\SymfonyMercureHubFactory;
+use Spiral\Boot\Bootloader\Bootloader;
+use Spiral\Boot\EnvironmentInterface;
+use Symfony\Component\Mercure\HubInterface;
+
+final class MercureBootloader extends Bootloader
+{
+    protected const SINGLETONS = [
+        HubInterface::class => [self::class, 'createHub'],
+    ];
+
+    private function createHub(EnvironmentInterface $env): HubInterface
+    {
+        $hubUrl = (string) $env->get('MERCURE_HUB_URL', 'http://localhost/.well-known/mercure');
+        $jwtSecret = (string) $env->get('MERCURE_JWT_SECRET', 'airlock-mercure-secret-32chars-minimum');
+
+        return SymfonyMercureHubFactory::create($hubUrl, $jwtSecret);
+    }
+}

examples/app/src/Application/Kernel.php

@@ -11,17 +11,21 @@
 use Spiral\Cache\Bootloader\CacheBootloader;
 use Spiral\Debug\Bootloader\DumperBootloader;
 use Spiral\DotEnv\Bootloader\DotenvBootloader;
+use Spiral\Events\Bootloader\EventsBootloader;
 use Spiral\League\Event\Bootloader\EventBootloader;
 use Spiral\Monolog\Bootloader\MonologBootloader;
 use Spiral\Nyholm\Bootloader\NyholmBootloader;
 use Spiral\OpenTelemetry\Bootloader\OpenTelemetryBootloader;
 use Spiral\Prototype\Bootloader\PrototypeBootloader;
 use Spiral\Queue\Bootloader\QueueBootloader;
 use Spiral\RoadRunnerBridge\Bootloader as RoadRunnerBridge;
+use Spiral\RoadRunnerBridge\Bootloader\MetricsBootloader;
 use Spiral\Scaffolder\Bootloader\ScaffolderBootloader;
+use Spiral\Sentry\Bootloader\SentryReporterBootloader;
 use Spiral\Tokenizer\Bootloader\TokenizerListenerBootloader;
 use Spiral\Twig\Bootloader\TwigBootloader;
 use Spiral\Views\Bootloader\ViewsBootloader;
+use Spiral\YiiErrorHandler\Bootloader\YiiErrorHandlerBootloader;
 
 /**
  * @psalm-suppress ClassMustBeFinal
@@ -46,6 +50,7 @@ public function defineBootloaders(): array
         return [
             // Logging and exceptions handling
             MonologBootloader::class,
+            YiiErrorHandlerBootloader::class,
             Bootloader\ExceptionHandlerBootloader::class,
 
             // Application specific logs
@@ -81,11 +86,17 @@ public function defineBootloaders(): array
             // OTEL
             OpenTelemetryBootloader::class,
 
+            // Sentry
+            SentryReporterBootloader::class,
+
+            // Metrics
+            MetricsBootloader::class,
+
             // Queue
             QueueBootloader::class,
 
             // Events
-            //EventsBootloader::class,
+            EventsBootloader::class,
             EventBootloader::class,
 
             // Cache
@@ -115,6 +126,7 @@ public function defineAppBootloaders(): array
     {
         return [
             Bootloader\RedisBootloader::class,
+            Bootloader\MercureBootloader::class,
             Bootloader\ViteBootloader::class,
 
             // Application domain