improove monitoring

Evaneos · Feb 26, 2016 · 5ca9f59 · 5ca9f59
1 parent 8ad0607
commit 5ca9f59
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/src/KernelStack/NewrelicMiddleware.php b/src/KernelStack/NewrelicMiddleware.php
@@ -24,16 +24,21 @@ class NewrelicMiddleware implements HttpKernelInterface, TerminableInterface
      */
     protected $newRelic;
 
+    /** @var array */
+    protected $extras;
+
     /**
      * NewrelicMiddleware constructor.
      *
      * @param HttpKernelInterface $app
-     * @param string              $applicationName
+     * @param                     $applicationName
+     * @param array               $extras
      */
-    public function __construct(HttpKernelInterface $app, $applicationName)
+    public function __construct(HttpKernelInterface $app, $applicationName, array $extras = array())
     {
         $this->app = $app;
         $this->applicationName = $applicationName;
+        $this->extras = $extras;
 
         $this->newRelic = new \Intouch\Newrelic\Newrelic(false);
         $this->newRelic->setAppName($applicationName);
@@ -57,6 +62,10 @@ public function handle(Request $request, $type = self::MASTER_REQUEST, $catch =
             return $this->app->handle($request, $type, $catch);
         }
 
+        foreach($this->extras as $name => $value){
+            $this->newRelic->addCustomParameter($name, $value);
+        }
+
         $this->newRelic->addCustomParameter('url', $request->getPathInfo());
         $this->newRelic->addCustomParameter('content_type', $request->getContentType());
 

diff --git a/src/Logger/LoggerFactory.php b/src/Logger/LoggerFactory.php
@@ -47,6 +47,9 @@ final class LoggerFactory
      */
     private $bufferHandler;
 
+    /** @var array */
+    private $tags;
+
     /**
      * LoggerFactory constructor.
      *
@@ -58,6 +61,7 @@ public function __construct($debug, $logDir)
         $this->debug = $debug;
         $this->logDir = $logDir;
         $this->loggers = array();
+        $this->tags = array();
 
         $webProcessor = new WebProcessor();
         $this->tagProcessor = new TagProcessor();
@@ -91,9 +95,18 @@ public function flushBuffer()
      */
     public function addTag($name, $value)
     {
+        $this->tags[$name] = $value;
         $this->tagProcessor->addTags(array($name => $value));
     }
 
+    /**
+     * @return array
+     */
+    public function getTags()
+    {
+        return $this->tags;
+    }
+
     /**
      * @param HandlerInterface $handler
      */

diff --git a/src/Utils/Logger.php b/src/Utils/Logger.php
@@ -3,6 +3,7 @@
 namespace Pyrite\Utils;
 
 use Monolog\Formatter\LineFormatter;
+use Monolog\Handler\NewRelicHandler;
 use Monolog\Handler\RavenHandler;
 use Monolog\Handler\SlackHandler;
 use Pyrite\Logger\LoggerFactory;
@@ -44,4 +45,20 @@ public static function attachSlack(LoggerFactory $factory, $token, $channel, $us
         $factory->addHandler($slackHandler);
         $factory->getLogger('app')->pushHandler($slackHandler);
     }
+
+    /**
+     * @param LoggerFactory $factory
+     * @param string              $appName
+     * @param bool              $debug
+     */
+    public static function attachNewRelic(LoggerFactory $factory, $appName, $debug)
+    {
+        if(true === $debug){
+            return;
+        }
+
+        $newRelicHandler = new NewRelicHandler(\Monolog\Logger::ERROR, true, $appName, true);
+        $factory->addHandler($newRelicHandler);
+        $factory->getLogger('app')->pushHandler($newRelicHandler);
+    }
 }