Remove application metrics

This just served as an initial example. Real application metrics will be added in another pull request.
marein · Oct 5, 2022 · abc9f5b · abc9f5b
1 parent 3005e28
commit abc9f5b
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 207 deletions.
diff --git a/config/connect-four/routing.yml b/config/connect-four/routing.yml
diff --git a/config/connect-four/services/metrics.yml b/config/connect-four/services/metrics.yml
diff --git a/config/routing.yml b/config/routing.yml
@@ -1,2 +1,2 @@
-Gaming:
-    resource: '*/routing.yml'
+WebInterface:
+    resource: web-interface/routing.yml
diff --git a/config/web-interface/services/event_listener.yml b/config/web-interface/services/event_listener.yml
@@ -5,6 +5,5 @@ services:
         public: false
         arguments:
             - '@web-interface.identity-service'
-            - '/^\/metrics\//'
         tags:
             - { name: kernel.event_listener, event: kernel.request }
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
@@ -105,8 +105,6 @@ services:
             - "traefik.http.routers.php-fpm.priority=10"
             - "traefik.http.routers.php-fpm.rule=PathPrefix(`/`)"
             - "traefik.http.services.php-fpm.loadbalancer.server.port=80"
-            - "prometheus-job=php-fpm"
-            - "prometheus-path=/metrics/connect-four"
 
     ##############################
     #   Long running processes   #

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -136,8 +136,6 @@ services:
             - "traefik.http.routers.php-fpm.priority=10"
             - "traefik.http.routers.php-fpm.rule=PathPrefix(`/`)"
             - "traefik.http.services.php-fpm.loadbalancer.server.port=80"
-            - "prometheus-job=php-fpm"
-            - "prometheus-path=/metrics/connect-four"
 
     ##############################
     #   Long running processes   #

diff --git a/docker/grafana/dashboards/connect-four/application-metrics.json b/docker/grafana/dashboards/connect-four/application-metrics.json
diff --git a/src/ConnectFour/Port/Adapter/Http/MetricsController.php b/src/ConnectFour/Port/Adapter/Http/MetricsController.php
diff --git a/src/WebInterface/Infrastructure/EventListener/AssignUserIdOnKernelRequest.php b/src/WebInterface/Infrastructure/EventListener/AssignUserIdOnKernelRequest.php
@@ -9,19 +9,21 @@
 
 final class AssignUserIdOnKernelRequest
 {
-    public function __construct(
-        private readonly IdentityService $identityService,
-        private readonly string $ignoredPathExpression
-    ) {
+    private IdentityService $identityService;
+
+    public function __construct(IdentityService $identityService)
+    {
+        $this->identityService = $identityService;
     }
 
     public function onKernelRequest(RequestEvent $event): void
     {
-        if ($this->shouldIgnoreRequest($event)) {
+        if (!$event->isMainRequest()) {
             return;
         }
 
-        $session = $event->getRequest()->getSession();
+        $request = $event->getRequest();
+        $session = $request->getSession();
 
         if (!$session->has('user')) {
             // todo Create user only when it's really needed.
@@ -31,10 +33,4 @@ public function onKernelRequest(RequestEvent $event): void
             $session->set('user', $this->identityService->arrive()['userId']);
         }
     }
-
-    private function shouldIgnoreRequest(RequestEvent $event): bool
-    {
-        return !$event->isMainRequest()
-            || preg_match($this->ignoredPathExpression, $event->getRequest()->getRequestUri()) === 1;
-    }
 }