1834: Fixed method counts

itk-dev · Aug 28, 2024 · 470e49c · 470e49c
1 parent 7022ea7
commit 470e49c
Show file tree

Hide file tree

Showing 24 changed files with 154 additions and 87 deletions.
diff --git a/src/Controller/CreateBookingWebformSubmitController.php b/src/Controller/CreateBookingWebformSubmitController.php
@@ -25,7 +25,7 @@ public function __construct(
 
     public function __invoke(Request $request): Response
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         $user = $this->getUser();
         if ($user instanceof ApiKeyUser) {
@@ -67,7 +67,7 @@ public function __invoke(Request $request): Response
             $apiKeyUserId ?? '',
         ));
 
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::COMPLETE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
 
         return new Response(null, 201);
     }

diff --git a/src/Controller/GetAllResourcesController.php b/src/Controller/GetAllResourcesController.php
@@ -21,7 +21,7 @@ public function __construct(
 
     public function __invoke(Request $request): Response
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         $userPermissionHeader = $request->headers->get('Authorization-UserPermission');
         $whitelistKey = $request->query->get('whitelistKey');
@@ -39,7 +39,7 @@ public function __invoke(Request $request): Response
             $resources = array_merge($resources, $whitelistedResources);
         }
 
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::COMPLETE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
 
         return new JsonResponse($resources, 200);
     }

diff --git a/src/Controller/GetResourceByEmailController.php b/src/Controller/GetResourceByEmailController.php
@@ -23,7 +23,7 @@ public function __construct(
 
     public function __invoke(Request $request, string $resourceMail): Response
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         $resource = $this->aakResourceRepository->findOneByEmail($resourceMail);
 
@@ -34,7 +34,7 @@ public function __invoke(Request $request, string $resourceMail): Response
 
         $data = $this->serializer->serialize($resource, 'json', ['groups' => 'resource']);
 
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::COMPLETE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
 
         return new Response($data, 200);
     }

diff --git a/src/Controller/GetStatusByIdsController.php b/src/Controller/GetStatusByIdsController.php
@@ -24,7 +24,7 @@ public function __construct(
 
     public function __invoke(Request $request): JsonResponse
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         $exchangeIds = json_decode($request->getContent())->ids;
 
@@ -65,7 +65,7 @@ public function __invoke(Request $request): JsonResponse
             }
         }
 
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::COMPLETE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
 
         return new JsonResponse($statuses);
     }

diff --git a/src/DataPersister/UserBookingDataPersister.php b/src/DataPersister/UserBookingDataPersister.php
@@ -35,7 +35,7 @@ public function supports($data, array $context = []): bool
 
     public function remove($data, array $context = []): void
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         try {
             if ($data instanceof UserBooking) {
@@ -57,11 +57,13 @@ public function remove($data, array $context = []): void
         } catch (MicrosoftGraphCommunicationException|UserBookingException $e) {
             throw new HttpException($e->getCode(), 'Booking could not be deleted.');
         }
+
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
     }
 
     public function persist($data, array $context = []): mixed
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         try {
             if ($data instanceof UserBooking) {
@@ -85,7 +87,7 @@ public function persist($data, array $context = []): mixed
                 ));
             }
 
-            $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::COMPLETE);
+            $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
 
             return $data;
         } catch (MicrosoftGraphCommunicationException|UserBookingException $e) {

diff --git a/src/DataProvider/BusyIntervalCollectionDataProvider.php b/src/DataProvider/BusyIntervalCollectionDataProvider.php
@@ -28,7 +28,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
      */
     public function getCollection(string $resourceClass, string $operationName = null, array $context = []): iterable
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         if (!isset($context['filters'])) {
             throw new BadRequestHttpException('Required filters not set.');
@@ -70,6 +70,6 @@ public function getCollection(string $resourceClass, string $operationName = nul
             }
         }
 
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::COMPLETE);
+       $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
     }
 }
diff --git a/src/DataProvider/LocationCollectionDataProvider.php b/src/DataProvider/LocationCollectionDataProvider.php
@@ -23,7 +23,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
 
     public function getCollection(string $resourceClass, string $operationName = null, array $context = []): iterable
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         $whitelistKey = $context['filters']['whitelistKey'] ?? null;
 
@@ -36,6 +36,6 @@ public function getCollection(string $resourceClass, string $operationName = nul
             yield $location;
         }
 
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::COMPLETE);
+       $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
     }
 }
diff --git a/src/DataProvider/UserBookingCollectionDataProvider.php b/src/DataProvider/UserBookingCollectionDataProvider.php
@@ -36,7 +36,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
      */
     public function getCollection(string $resourceClass, string $operationName = null, array $context = []): iterable
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         $request = $this->requestStack->getCurrentRequest();
 
@@ -83,7 +83,7 @@ public function getCollection(string $resourceClass, string $operationName = nul
         $obj = new \ArrayObject($userBookings);
         $it = $obj->getIterator();
 
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::COMPLETE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
 
         return new TraversablePaginator($it, $page, $responseData['pageSize'], $responseData['total']);
     }

diff --git a/src/DataProvider/UserBookingItemDataProvider.php b/src/DataProvider/UserBookingItemDataProvider.php
@@ -31,7 +31,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
      */
     public function getItem(string $resourceClass, $id, string $operationName = null, array $context = []): UserBooking|null
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         if (!isset($id) || !is_string($id)) {
             throw new BadRequestHttpException('Required booking id is not set');
@@ -45,7 +45,7 @@ public function getItem(string $resourceClass, $id, string $operationName = null
             throw new AccessDeniedHttpException('Access denied');
         }
 
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::COMPLETE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
 
         return $userBooking;
     }

diff --git a/src/EventListener/FailedMessageEventListener.php b/src/EventListener/FailedMessageEventListener.php
@@ -24,7 +24,7 @@ public function __construct(
 
     public function __invoke(WorkerMessageFailedEvent $event): void
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         $envelope = $event->getEnvelope();
         $message = $envelope->getMessage();
@@ -64,5 +64,7 @@ public function __invoke(WorkerMessageFailedEvent $event): void
                 $resource
             );
         }
+
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
     }
 }
diff --git a/src/MessageHandler/AddBookingToCacheHandler.php b/src/MessageHandler/AddBookingToCacheHandler.php
@@ -32,7 +32,7 @@ public function __construct(
      */
     public function __invoke(AddBookingToCacheMessage $message): void
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         $id = $this->bookingService->getBookingIdFromICalUid($message->getICalUID()) ?? null;
 
@@ -65,6 +65,6 @@ public function __invoke(AddBookingToCacheMessage $message): void
             throw new RecoverableMessageHandlingException(sprintf('Booking id could not be retrieved for booking with iCalUID: %s', $message->getICalUID()));
         }
 
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::COMPLETE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
     }
 }
diff --git a/src/MessageHandler/CreateBookingHandler.php b/src/MessageHandler/CreateBookingHandler.php
@@ -41,7 +41,7 @@ public function __construct(
      */
     public function __invoke(CreateBookingMessage $message): void
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         $booking = $message->getBooking();
 
@@ -123,13 +123,13 @@ public function __invoke(CreateBookingMessage $message): void
                     $response['iCalUId'],
                 ));
             } else {
-                $this->metric->incFunctionTotal($this, __FUNCTION__, 'icaluid_not_found');
                 $this->logger->error(sprintf('Booking iCalUID could not be retrieved for booking with subject: %s', $booking->getSubject()));
+                $this->metric->incMethodTotal(__METHOD__, 'icaluid_not_found');
             }
         } catch (BookingCreateConflictException $exception) {
             // If it is a BookingCreateConflictException the booking should be rejected.
             $this->logger->notice(sprintf('Booking conflict detected: %d %s', $exception->getCode(), $exception->getMessage()));
-            $this->metric->incFunctionTotal($this, __FUNCTION__, 'booking_conflict_detected');
+            $this->metric->incMethodTotal(__METHOD__, 'booking_conflict_detected');
 
             $this->bus->dispatch(new SendBookingNotificationMessage(
                 $booking,
@@ -143,5 +143,7 @@ public function __invoke(CreateBookingMessage $message): void
 
             throw $exception;
         }
+
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
     }
 }
diff --git a/src/MessageHandler/RemoveBookingFromCacheHandler.php b/src/MessageHandler/RemoveBookingFromCacheHandler.php
@@ -21,9 +21,10 @@ public function __construct(
      */
     public function __invoke(RemoveBookingFromCacheMessage $message): void
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         $this->userBookingCacheService->deleteCacheEntry($message->getExchangeId());
-        $this->metric->totalIncByOne('cache_entry_deleted', 'Cache entry has been deleted.', $this, ['complete']);
+
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
     }
 }
diff --git a/src/MessageHandler/SendBookingNotificationHandler.php b/src/MessageHandler/SendBookingNotificationHandler.php
@@ -30,7 +30,7 @@ public function __construct(
      */
     public function __invoke(SendBookingNotificationMessage $message): void
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         try {
             $this->logger->info('SendBookingNotificationHandler.');
@@ -54,5 +54,7 @@ public function __invoke(SendBookingNotificationMessage $message): void
 
             throw $e;
         }
+
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
     }
 }
diff --git a/src/MessageHandler/SendUserBookingNotificationHandler.php b/src/MessageHandler/SendUserBookingNotificationHandler.php
@@ -30,7 +30,7 @@ public function __construct(
      */
     public function __invoke(SendUserBookingNotificationMessage $message): void
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         try {
             $this->logger->info('SendBookingNotificationHandler.');
@@ -54,5 +54,7 @@ public function __invoke(SendUserBookingNotificationMessage $message): void
 
             throw $e;
         }
+
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
     }
 }
diff --git a/src/MessageHandler/UpdateBookingInCacheHandler.php b/src/MessageHandler/UpdateBookingInCacheHandler.php
@@ -21,10 +21,10 @@ public function __construct(
      */
     public function __invoke(UpdateBookingInCacheMessage $message): void
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         $this->userBookingCacheService->changeCacheEntry($message->getExchangeId(), $message->getChanges());
 
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::COMPLETE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
     }
 }
diff --git a/src/MessageHandler/WebformSubmitHandler.php b/src/MessageHandler/WebformSubmitHandler.php
@@ -44,13 +44,13 @@ public function __construct(
 
     public function __invoke(WebformSubmitMessage $message): void
     {
-        $this->metric->incFunctionTotal($this, __FUNCTION__, Metric::INVOKE);
+        $this->metric->incMethodTotal(__METHOD__, Metric::INVOKE);
 
         try {
             $dataSubmission = $this->webformService->getData($message);
         } catch (WebformSubmissionRetrievalException $e) {
             if (403 == $e->getCode()) {
-                $this->metric->incFunctionTotal($this, __FUNCTION__, 'forbidden');
+               $this->metric->incMethodTotal(__METHOD__, 'forbidden');
             }
 
             // TODO: Handle other request actions as a retryable exception.
@@ -110,6 +110,8 @@ public function __invoke(WebformSubmitMessage $message): void
 
             throw new UnrecoverableMessageHandlingException($e->getMessage());
         }
+
+        $this->metric->incMethodTotal(__METHOD__, Metric::COMPLETE);
     }
 
     /**

diff --git a/src/Service/Metric.php b/src/Service/Metric.php
@@ -32,18 +32,19 @@ public function totalIncByOne(string $name, ?string $description = null, $invoki
         $this->metricsService->counter($prefix.$name.'_total', $description ?? '', 1, $labels);
     }
 
-    public function incFunctionTotal($invokingInstance, string $functionName, string $action): void
+    public function incMethodTotal(string $method, string $action): void
     {
-        $classShortName = (new \ReflectionClass($invokingInstance))->getShortName();
-        $className = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $classShortName));
-        $functionName = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $functionName));
+        $metrixMethod = preg_replace('/^.*\\\s*/', '', $method);
+        $metrixMethod = str_replace('::', '__', $metrixMethod);
+        $metrixMethod = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $metrixMethod));
 
-        $this->metricsService->counter('function_total', 'Function totals.', 1, [$className.'__'.$functionName => $action]);
+        $this->metricsService->counter('method_'.$metrixMethod.'_total', 'Method '.$method.' totals.', 1, ['action' => $action]);
     }
 
     public function incExceptionTotal($exceptionClassName): void
     {
+        $exceptionClassName = preg_replace('/^.*\\\s*/', '', $exceptionClassName);
         $exceptionClassName = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $exceptionClassName));
-        $this->metricsService->counter('exception', 'Exception totals.', 1, [self::EXCEPTION => $exceptionClassName]);
+        $this->metricsService->counter('exception_total', 'Exception totals.', 1, [self::EXCEPTION => $exceptionClassName]);
     }
 }