Merge remote-tracking branch 'origin/MC-19115' into hb-combined-pr

Author: danielrenaud

app/code/Magento/AdminAnalytics/etc/config.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <admin>
+            <usage>
+                <enabled>
+                    1
+                </enabled>
+            </usage>
+        </admin>
+    </default>
+</config>

lib/internal/Magento/Framework/App/ProductMetadata.php

@@ -14,6 +14,7 @@
 
 /**
  * Class ProductMetadata
+ *
  * @package Magento\Framework\App
  */
 class ProductMetadata implements ProductMetadataInterface
@@ -28,6 +29,11 @@ class ProductMetadata implements ProductMetadataInterface
      */
     const PRODUCT_NAME  = 'Magento';
 
+    /**
+     * Magento version cache key
+     */
+    const VERSION_CACHE_KEY = 'mage-version';
+
     /**
      * Product version
      *
@@ -47,11 +53,21 @@ class ProductMetadata implements ProductMetadataInterface
     private $composerInformation;
 
     /**
+     * @var CacheInterface
+     */
+    private $cache;
+
+    /**
+     * ProductMetadata constructor.
      * @param ComposerJsonFinder $composerJsonFinder
+     * @param \Magento\Framework\App\CacheInterface $cache
      */
-    public function __construct(ComposerJsonFinder $composerJsonFinder)
-    {
+    public function __construct(
+        ComposerJsonFinder $composerJsonFinder,
+        CacheInterface $cache = null
+    ) {
         $this->composerJsonFinder = $composerJsonFinder;
+        $this->cache = $cache ?? ObjectManager::getInstance()->get(CacheInterface::class);
     }
 
     /**
@@ -61,13 +77,16 @@ public function __construct(ComposerJsonFinder $composerJsonFinder)
      */
     public function getVersion()
     {
+        $versionFromCache = $this->cache->load(self::VERSION_CACHE_KEY);
+        $this->version = $this->version ?: $versionFromCache;
         if (!$this->version) {
             if (!($this->version = $this->getSystemPackageVersion())) {
                 if ($this->getComposerInformation()->isMagentoRoot()) {
                     $this->version = $this->getComposerInformation()->getRootPackage()->getPrettyVersion();
                 } else {
                     $this->version = 'UNKNOWN';
                 }
+                $this->cache->save($this->version, self::VERSION_CACHE_KEY, [Config::CACHE_TAG]);
             }
         }
         return $this->version;