Restore the speed of Visitor Log (#12009)

* render template only if needed

* reuse same Twig instance

* cache CacheBuster to prevent recalculation when needed multiple times

core/AssetManager/UIAssetCacheBuster.php

@@ -27,20 +27,32 @@ class UIAssetCacheBuster extends Singleton
      */
     public function piwikVersionBasedCacheBuster($pluginNames = false)
     {
-        $masterFile = PIWIK_INCLUDE_PATH . '/.git/refs/heads/master';
-        $currentGitHash = file_exists($masterFile) ? @file_get_contents($masterFile) : null;
+        static $cachedCacheBuster = null;
 
-        $pluginNames = !$pluginNames ? Manager::getInstance()->getLoadedPluginsName() : $pluginNames;
-        sort($pluginNames);
+        if (empty($cachedCacheBuster) || $pluginNames !== false) {
 
-        $pluginsInfo = '';
-        foreach ($pluginNames as $pluginName) {
-            $plugin       = Manager::getInstance()->getLoadedPlugin($pluginName);
-            $pluginsInfo .= $plugin->getPluginName() . $plugin->getVersion() . ',';
+            $masterFile     = PIWIK_INCLUDE_PATH . '/.git/refs/heads/master';
+            $currentGitHash = file_exists($masterFile) ? @file_get_contents($masterFile) : null;
+
+            $plugins = !$pluginNames ? Manager::getInstance()->getLoadedPluginsName() : $pluginNames;
+            sort($plugins);
+
+            $pluginsInfo = '';
+            foreach ($plugins as $pluginName) {
+                $plugin      = Manager::getInstance()->getLoadedPlugin($pluginName);
+                $pluginsInfo .= $plugin->getPluginName() . $plugin->getVersion() . ',';
+            }
+
+            $cacheBuster = md5($pluginsInfo . PHP_VERSION . Version::VERSION . trim($currentGitHash));
+
+            if ($pluginNames !== false) {
+                return $cacheBuster;
+            }
+
+            $cachedCacheBuster = $cacheBuster;
         }
 
-        $cacheBuster = md5($pluginsInfo . PHP_VERSION . Version::VERSION . trim($currentGitHash));
-        return $cacheBuster;
+        return $cachedCacheBuster;
     }
 
     /**

core/View.php

@@ -212,10 +212,15 @@ class View implements ViewInterface
         return isset($this->templateVars[$name]);
     }
 
+    /** @var Twig */
+    static $twigCached = null;
+
     private function initializeTwig()
     {
-        $piwikTwig = new Twig();
-        $this->twig = $piwikTwig->getTwigEnvironment();
+        if (empty(static::$twigCached)) {
+            static::$twigCached = new Twig();
+        }
+        $this->twig = static::$twigCached->getTwigEnvironment();
     }
 
     /**

plugins/CustomVariables/VisitorDetails.php

@@ -68,6 +68,10 @@ class VisitorDetails extends VisitorDetailsAbstract
 
     public function renderVisitorDetails($visitInfo)
     {
+        if (empty($visitInfo['customVariables'])) {
+            return [];
+        }
+
         $view            = new View('@CustomVariables/_visitorDetails');
         $view->visitInfo = $visitInfo;
         return [[ 50, $view->render() ]];

plugins/CustomVariables/templates/_visitorDetails.twig

-{% if visitInfo.getColumn('customVariables') %}
-    <div class="visitorCustomVariables">
+<div class="visitorCustomVariables">
     {% for id,customVariable in visitInfo.getColumn('customVariables') %}
         {% set name='customVariableName' ~ id %}
         {% set value='customVariableValue' ~ id %}
@@ -9,5 +8,4 @@
         </abbr>
         {% if customVariable[value]|length > 0 %}: {{ customVariable[value]|truncate(50) }}{% endif %}
     {% endfor %}
-    </div>
-{% endif %}
+</div>
\ No newline at end of file
\ No newline at end of file