ACPT-1584

Now using NewRelicWrapper

Author: JacobBrownAustin

app/code/Magento/ApplicationPerformanceMonitorNewRelic/Profiler/Output/NewRelicOutput.php

@@ -10,6 +10,7 @@
 use Magento\ApplicationPerformanceMonitor\Profiler\Metric;
 use Magento\ApplicationPerformanceMonitor\Profiler\OutputInterface;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\NewRelicReporting\Model\NewRelicWrapper;
 
 /**
  * Outputs the performance metrics and other information to New Relic
@@ -19,10 +20,7 @@ class NewRelicOutput implements OutputInterface
     public const CONFIG_ENABLE_KEY = 'application/performance_monitor/newrelic_output_enable';
     public const CONFIG_VERBOSE_KEY = 'application/performance_monitor/newrelic_output_verbose';
 
-    /**
-     * @param DeploymentConfig $deploymentConfig
-     */
-    public function __construct(private DeploymentConfig $deploymentConfig)
+    public function __construct(private DeploymentConfig $deploymentConfig, private NewRelicWrapper $newRelicWrapper)
     {
     }
 
@@ -31,7 +29,7 @@ public function __construct(private DeploymentConfig $deploymentConfig)
      */
     public function isEnabled(): bool
     {
-        if (!extension_loaded('newrelic')) {
+        if (!$this->newRelicWrapper->isExtensionInstalled()) {
             return false;
         }
         return match ($this->deploymentConfig->get(static::CONFIG_ENABLE_KEY)) {
@@ -49,14 +47,14 @@ public function doOutput(array $metrics, array $information)
             return;
         }
         foreach ($information as $key => $value) {
-            newrelic_add_custom_parameter($key, $value);
+            $this->newRelicWrapper->addCustomParameter($key, $value);
         }
         $verbose = $this->isVerbose();
         foreach ($metrics as $metric) {
             if (!$verbose && $metric->isVerbose()) {
                 continue;
             }
-            newrelic_add_custom_parameter($metric->getName(), $metric->getValue());
+            $this->newRelicWrapper->addCustomParameter($metric->getName(), $metric->getValue());
         }
     }
 

app/code/Magento/ApplicationPerformanceMonitorNewRelic/composer.json

@@ -15,7 +15,7 @@
     "php": "~8.1.0||~8.2.0",
     "magento/framework": "*",
     "magento/module-application-performance-monitor": "*",
-    "magento/module-application-new-relic": "*"
+    "magento/module-new-relic-reporting": "*"
   },
   "suggest": {
     "ext-newrelic": "This module requires New Relic's PHP extension in order to function."