Merge remote-tracking branch 'act4/ACP2E-3187' into PR_13_OCT_2024

Author: o-dubovyk

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

@@ -1,10 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\NewRelicReporting\Model;
 
+use Magento\Framework\App\State;
+use Magento\Framework\App\ObjectManager;
 use Throwable;
 
 /**
@@ -17,6 +19,26 @@ class NewRelicWrapper
     private const NEWRELIC_APPNAME = 'newrelic.appname';
     private const NEWRELIC_AUTO_INSTRUMENT = 'newrelic.browser_monitoring.auto_instrument';
 
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var State
+     */
+    private $state;
+
+    /**
+     * @param ?Config $config
+     * @param ?State $state
+     */
+    public function __construct(?Config $config = null, ?State $state = null)
+    {
+        $this->config = $config ?? ObjectManager::getInstance()->get(Config::class);
+        $this->state = $state ?? ObjectManager::getInstance()->get(State::class);
+    }
+
     /**
      * Wrapper for 'newrelic_add_custom_parameter' function
      *
@@ -80,7 +102,8 @@ public function setTransactionName(string $transactionName): void
     public function startBackgroundTransaction()
     {
         if ($this->isExtensionInstalled()) {
-            newrelic_start_transaction(ini_get(self::NEWRELIC_APPNAME));
+            $name = $this->getCurrentAppName();
+            newrelic_start_transaction($name);
             newrelic_background_job();
         }
     }
@@ -161,4 +184,21 @@ public function getBrowserTimingFooter(bool $includeTags = true): ?string
 
         return newrelic_get_browser_timing_footer($includeTags);
     }
+
+    /**
+     * Get current App name for NR transactions
+     *
+     * @return string
+     */
+    public function getCurrentAppName()
+    {
+        if ($this->config->isSeparateApps() &&
+            $this->config->getNewRelicAppName() &&
+            $this->config->isNewRelicEnabled()) {
+            $code = $this->state->getAreaCode();
+            $current = $this->config->getNewRelicAppName();
+            return $current . ';' . $current . '_' . $code;
+        }
+        return ini_get(self::NEWRELIC_APPNAME);
+    }
 }

app/code/Magento/NewRelicReporting/Test/Unit/Model/NewRelicWrapperTest.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\NewRelicReporting\Test\Unit\Model;
+
+use Magento\NewRelicReporting\Model\NewRelicWrapper;
+use Magento\NewRelicReporting\Model\Config;
+use Magento\Framework\App\State;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class NewRelicWrapperTest extends TestCase
+{
+    /**
+     * @var Config|MockObject
+     */
+    private $config;
+
+    /**
+     * @var State|MockObject
+     */
+    private $state;
+
+    /**
+     * @var NewRelicWrapper
+     */
+    private $newRelicWrapper;
+
+    protected function setUp(): void
+    {
+        $this->config = $this->createMock(Config::class);
+        $this->state = $this->createMock(State::class);
+        $this->newRelicWrapper = new NewRelicWrapper($this->config, $this->state);
+    }
+
+    public function testGetCurrentAppName()
+    {
+        $this->config->expects($this->once())
+            ->method('isSeparateApps')
+            ->willReturn(true);
+        $this->config->expects($this->atLeastOnce())
+            ->method('getNewRelicAppName')
+            ->willReturn('Magento');
+        $this->config->expects($this->once())
+            ->method('isNewRelicEnabled')
+            ->willReturn(true);
+        $this->state->expects($this->once())
+            ->method('getAreaCode')
+            ->willReturn('cron');
+        $this->assertEquals('Magento;Magento_cron', $this->newRelicWrapper->getCurrentAppName());
+    }
+}