Merge remote-tracking branch 'origin/MAGETWO-39576-Profiler-JSON' into PR_Branch

Author: Olga Kopylova

app/bootstrap.php

@@ -31,8 +31,15 @@
 require_once __DIR__ . '/autoload.php';
 require_once BP . '/app/functions.php';
 
-if (!empty($_SERVER['MAGE_PROFILER'])) {
-    \Magento\Framework\Profiler::applyConfig($_SERVER['MAGE_PROFILER'], BP, !empty($_REQUEST['isAjax']));
+if (!empty($_SERVER['MAGE_PROFILER'])
+    && isset($_SERVER['HTTP_ACCEPT'])
+    && strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
+) {
+    \Magento\Framework\Profiler::applyConfig(
+        $_SERVER['MAGE_PROFILER'],
+        BP,
+        !empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
+    );
 }
 if (ini_get('date.timezone') == '') {
     date_default_timezone_set('UTC');

app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php

@@ -76,11 +76,6 @@ public function aroundDispatch(
                 $this->kernel->process($result);
             }
         } else {
-            json_decode($result->getContent());
-            if (json_last_error() == JSON_ERROR_NONE) {
-                // reset profiler to avoid appending profiling stat to JSON response
-                \Magento\Framework\Profiler::reset();
-            }
             $this->addDebugHeader($result, 'X-Magento-Cache-Debug', 'HIT', true);
         }
         return $result;

app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/BuiltinPluginTest.php

@@ -200,7 +200,6 @@ public function testAroundDispatchReturnsCache($state)
             $this->responseMock->expects($this->never())
                 ->method('setHeader');
         }
-        $this->responseMock->expects($this->once())->method('getContent');
         $this->assertSame(
             $this->responseMock,
             $this->plugin->aroundDispatch($this->frontControllerMock, $this->closure, $this->requestMock)

lib/internal/Magento/Framework/Controller/Result/Json.php

@@ -63,8 +63,6 @@ public function setJsonData($jsonData)
      */
     protected function render(ResponseInterface $response)
     {
-        // reset profiler to avoid appending profiling stat to JSON response
-        \Magento\Framework\Profiler::reset();
         $this->translateInline->processResponseBody($this->json, true);
         $response->representJson($this->json);
         return $this;