add flag management on subscriber (#3)

wizaplace · Jan 23, 2020 · 3f14891 · 3f14891
1 parent 450e4c9
commit 3f14891
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/src/ApmBundle.php b/src/ApmBundle.php
diff --git a/src/ElasticApmAbstractSubscriber.php b/src/ElasticApmAbstractSubscriber.php
@@ -37,11 +37,20 @@ public function __destruct()
 
     public function onKernelTerminate()
     {
+        if ($this->isDisabled()) {
+            return $this;
+        }
+
         if ($this->transaction instanceof Transaction) {
             $this->agentService->stopTransaction();
             $this->transaction = null;
         }
     }
 
+    public function isDisabled(): bool
+    {
+        return false === $this->agentService->getApmEnabled();
+    }
+
     abstract public static function getSubscribedEvents();
 }
diff --git a/src/ElasticApmSubscriber.php b/src/ElasticApmSubscriber.php
@@ -31,6 +31,10 @@ public static function getSubscribedEvents()
      */
     public function onKernelRequest(GetResponseEvent $kernelEvent)
     {
+        if ($this->isDisabled()) {
+            return $this;
+        }
+
         if (true === $kernelEvent->isMasterRequest() && null === $this->transaction) {
             $this->transaction = $this->agentService
                 ->startTransaction(
@@ -47,6 +51,10 @@ public function onKernelRequest(GetResponseEvent $kernelEvent)
 
     public function onKernelException(GetResponseForExceptionEvent $kernelEvent)
     {
+        if ($this->isDisabled()) {
+            return $this;
+        }
+
         $this->agentService->error($kernelEvent->getException());
     }
 }