Updated statistics and make sure LoggingCachePool is Taggable

Author: Nyholm

src/Cache/LoggingCachePool.php

@@ -11,13 +11,14 @@
 
 namespace Cache\CacheBundle\Cache;
 
+use Cache\Taggable\TaggablePoolInterface;
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
 
 /**
  * @author Aaron Scherer <[email protected]>
  */
-class LoggingCachePool implements CacheItemPoolInterface
+class LoggingCachePool implements CacheItemPoolInterface, TaggablePoolInterface
 {
     /**
      * @type array
@@ -39,28 +40,50 @@ public function __construct(CacheItemPoolInterface $cachePool)
         $this->cachePool = $cachePool;
     }
 
-    public function getItem($key)
+    /**
+     * @param string $name
+     * @param array  $arguments
+     *
+     * @return object
+     */
+    private function timeCall($name, array $arguments = null)
     {
-        $call         = $this->timeCall(__FUNCTION__, [$key]);
+        $start  = microtime(true);
+        $result = call_user_func_array([$this->cachePool, $name], $arguments);
+        $time   = microtime(true) - $start;
+
+        $object = (object) compact('name', 'arguments', 'start', 'time', 'result');
+
+        return $object;
+    }
+
+    public function getItem($key, array $tags = [])
+    {
+        $call         = $this->timeCall(__FUNCTION__, [$key, $tags]);
         $result       = $call->result;
-        $call->result = sprintf('<DATA:%s>', gettype($result));
+
+        if ($result->isHit()) {
+            $call->result = sprintf('<DATA:%s>', gettype($result->get()));
+        } else {
+            $call->result = false;
+        }
 
         $this->calls[] = $call;
 
         return $result;
     }
 
-    public function hasItem($key)
+    public function hasItem($key, array $tags = [])
     {
-        $call          = $this->timeCall(__FUNCTION__, [$key]);
+        $call          = $this->timeCall(__FUNCTION__, [$key, $tags]);
         $this->calls[] = $call;
 
         return $call->result;
     }
 
-    public function deleteItem($key)
+    public function deleteItem($key, array $tags = [])
     {
-        $call          = $this->timeCall(__FUNCTION__, [$key]);
+        $call          = $this->timeCall(__FUNCTION__, [$key, $tags]);
         $this->calls[] = $call;
 
         return $call->result;
@@ -78,26 +101,9 @@ public function save(CacheItemInterface $item)
         return $call->result;
     }
 
-    /**
-     * @param string $name
-     * @param array  $arguments
-     *
-     * @return object
-     */
-    private function timeCall($name, array $arguments = null)
-    {
-        $start  = microtime(true);
-        $result = call_user_func_array([$this->cachePool, $name], $arguments);
-        $time   = microtime(true) - $start;
-
-        $object = (object) compact('name', 'arguments', 'start', 'time', 'result');
-
-        return $object;
-    }
-
-    public function getItems(array $keys = [])
+    public function getItems(array $keys = [], array $tags = [])
     {
-        $call         = $this->timeCall(__FUNCTION__, [$keys]);
+        $call         = $this->timeCall(__FUNCTION__, [$keys, $tags]);
         $result       = $call->result;
         $call->result = sprintf('<DATA:%s>', gettype($result));
 
@@ -106,17 +112,17 @@ public function getItems(array $keys = [])
         return $result;
     }
 
-    public function clear()
+    public function clear(array $tags = [])
     {
-        $call          = $this->timeCall(__FUNCTION__);
+        $call          = $this->timeCall(__FUNCTION__, [$tags]);
         $this->calls[] = $call;
 
         return $call->result;
     }
 
-    public function deleteItems(array $keys)
+    public function deleteItems(array $keys, array $tags = [])
     {
-        $call          = $this->timeCall(__FUNCTION__, [$keys]);
+        $call          = $this->timeCall(__FUNCTION__, [$keys, $tags]);
         $this->calls[] = $call;
 
         return $call->result;

src/DataCollector/CacheDataCollector.php

@@ -58,9 +58,9 @@ public function collect(Request $request, Response $response, \Exception $except
         $empty      = ['calls' => [], 'config' => [], 'options' => [], 'statistics' => []];
         $this->data = ['instances' => $empty, 'total' => $empty];
         foreach ($this->instances as $name => $instance) {
-            $calls                                   = $instance->getCalls();
-            $this->data['instances']['calls'][$name] = $calls;
+            $this->data['instances']['calls'][$name] = $instance->getCalls();
         }
+
         $this->data['instances']['statistics'] = $this->calculateStatistics();
         $this->data['total']['statistics']     = $this->calculateTotalStatistics();
     }
@@ -126,19 +126,21 @@ private function calculateStatistics()
             foreach ($calls as $call) {
                 $statistics[$name]['calls'] += 1;
                 $statistics[$name]['time'] += $call->time;
-                if ($call->name === 'fetch') {
+                if ($call->name === 'getItem') {
                     $statistics[$name]['reads'] += 1;
                     if ($call->result !== false) {
                         $statistics[$name]['hits'] += 1;
                     } else {
                         $statistics[$name]['misses'] += 1;
                     }
-                } elseif ($call->name === 'contains' && $call->result === false) {
+                } elseif ($call->name === 'hasItem') {
                     $statistics[$name]['reads'] += 1;
-                    $statistics[$name]['misses'] += 1;
+                    if ($call->result === false) {
+                        $statistics[$name]['misses'] += 1;
+                    }
                 } elseif ($call->name === 'save') {
                     $statistics[$name]['writes'] += 1;
-                } elseif ($call->name === 'delete') {
+                } elseif ($call->name === 'deleteItem') {
                     $statistics[$name]['deletes'] += 1;
                 }
             }

src/DependencyInjection/Compiler/DataCollectorCompilerPass.php

@@ -32,15 +32,12 @@ protected function prepare()
 
         foreach (array_keys($serviceIds) as $id) {
 
-            // Duplicating definition to $originalServiceId.logged
-            $this->container->setDefinition($id.'.logged', $this->container->findDefinition($id));
-
             // Creating a LoggingCachePool instance, and passing it the new definition from above
             $def = $this->container->register($id.'.logger', LoggingCachePool::class);
-            $def->addArgument(new Reference($id.'.logged'));
+            $def->addArgument(new Reference($id.'.logger.inner'))
+                ->setDecoratedService($id, null, 10);
 
-            // Overwrite the original service id with the new LoggingCachePool instance
-            $this->container->setAlias($id, $id.'.logger');
+            // Tell the collector to add the new logger
             $collectorDefinition->addMethodCall('addInstance', [$id, new Reference($id.'.logger')]);
         }
     }