Merge branch 'ACP2E-3067' of https://github.com/adobe-commerce-tier-4/magento2ce into T4-PR-06-14-2024

Author: chittima

app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php

@@ -14,6 +14,8 @@
  */
 class NewRelicWrapper
 {
+    private const NEWRELIC_APPNAME = 'newrelic.appname';
+
     /**
      * Wrapper for 'newrelic_add_custom_parameter' function
      *
@@ -69,6 +71,19 @@ public function setTransactionName(string $transactionName): void
         }
     }
 
+    /**
+     * Wrapper to start background transaction
+     *
+     * @return void
+     */
+    public function startBackgroundTransaction()
+    {
+        if ($this->isExtensionInstalled()) {
+            newrelic_start_transaction(ini_get(self::NEWRELIC_APPNAME));
+            newrelic_background_job();
+        }
+    }
+
     /**
      * Wrapper for 'newrelic_end_transaction'
      *

app/code/Magento/NewRelicReporting/Plugin/StatPlugin.php

@@ -64,6 +64,7 @@ public function beforeStart(Stat $schedule, ...$args): array
         $timerName = current($args);
 
         if ($this->isCronJob($timerName)) {
+            $this->newRelicWrapper->startBackgroundTransaction();
             $this->newRelicWrapper->setTransactionName(
                 sprintf('Cron %s', $timerName)
             );

app/code/Magento/NewRelicReporting/Test/Unit/Plugin/StatPluginTest.php

@@ -55,6 +55,9 @@ protected function setUp(): void
      */
     public function testNewRelicTransactionNameIsNotSetIfNotCronjobPattern()
     {
+        $this->newRelicWrapperMock
+            ->expects($this->never())
+            ->method('startBackgroundTransaction');
         $this->newRelicWrapperMock
             ->expects($this->never())
             ->method('setTransactionName');
@@ -71,6 +74,9 @@ public function testNewRelicTransactionNameIsNotSetIfNotCronjobPattern()
      */
     public function testNewRelicTransactionNameIsSetForCronjobNamePattern()
     {
+        $this->newRelicWrapperMock
+            ->expects($this->once())
+            ->method('startBackgroundTransaction');
         $this->newRelicWrapperMock
             ->expects($this->once())
             ->method('setTransactionName');
@@ -90,7 +96,7 @@ private function getNewRelicWrapperMock(): NewRelicWrapper
         if (null === $this->newRelicWrapperMock) {
             $this->newRelicWrapperMock = $this->getMockBuilder(NewRelicWrapper::class)
                 ->disableOriginalConstructor()
-                ->onlyMethods(['setTransactionName', 'endTransaction'])
+                ->onlyMethods(['setTransactionName', 'endTransaction', 'startBackgroundTransaction'])
                 ->getMock();
         }
 

app/code/Magento/NewRelicReporting/etc/di.xml

@@ -49,7 +49,6 @@
     <type name="Magento\NewRelicReporting\Plugin\CommandPlugin">
         <arguments>
             <argument name="skipCommands" xsi:type="array">
-                <item xsi:type="boolean" name="cron:run">true</item>
                 <item xsi:type="boolean" name="server:run">true</item>
             </argument>
         </arguments>